From d5b8a1fff9e7a8285da0fb1a0208f95c0a6973bb Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 11:37:44 +0200 Subject: [PATCH 01/10] first try plasma --- hosts/default/home.nix | 5 +++-- modules/default.nix | 8 ++++++++ modules/plasma/default.nix | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 modules/default.nix create mode 100644 modules/plasma/default.nix diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 41546b8..ba31265 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -3,7 +3,7 @@ { imports = [ - ../../modules/hyprland.nix + ../../modules ../../modules/games ../../modules/applications ../../common/nvim/nvim.nix @@ -27,7 +27,8 @@ nixpkgs.config.allowUnfree = true; modules = { - hyprland.enable = true; + hyprland.enable = false; + plasma.enable = true; games.enable = true; apps = { enable = true; diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..9a8e47c --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,8 @@ +{...}: +{ + imports = [ + ./hyprland.nix + ./plasma + ./games + ]; +} diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix new file mode 100644 index 0000000..35aa358 --- /dev/null +++ b/modules/plasma/default.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, inputs, ... }: +let + cfg = config.modules.plasma; +in +{ + options.modules.plasma = { + enable = lib.mkEnableOption "enable kde plasma 6"; + }; + + imports = [ + ]; + + config = lib.mkIf cfg.enable { + services.desktopManager.plasma6.enable = true; + }; +} From c5d41aa202c6ef27deb766dc32f4f2202d19cf3c Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 11:43:00 +0200 Subject: [PATCH 02/10] compiles --- hosts/default/configuration.nix | 2 ++ hosts/default/home.nix | 1 - modules/default.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 8761f7a..c53b12e 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -10,6 +10,7 @@ ./hardware-configuration.nix ../../modules/games/steam.nix ../../modules/websites + ../../modules/plasma ]; boot = { @@ -195,6 +196,7 @@ modules = { games.steam.enable = true; + plasma.enable = true; websites = { enable = true; certMail = "acme@voorwaarts.nl"; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index ba31265..dba08d7 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -28,7 +28,6 @@ modules = { hyprland.enable = false; - plasma.enable = true; games.enable = true; apps = { enable = true; diff --git a/modules/default.nix b/modules/default.nix index 9a8e47c..d60d951 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,7 +2,5 @@ { imports = [ ./hyprland.nix - ./plasma - ./games ]; } From 1b837b7e43ba0c87cbdb7f89523153737f1acc79 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 11:44:55 +0200 Subject: [PATCH 03/10] fix portal warning --- hosts/default/home.nix | 4 ---- modules/plasma/default.nix | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index dba08d7..bee15fb 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -125,10 +125,6 @@ enable = true; createDirectories = true; }; - portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; - }; }; diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 35aa358..1a9b377 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -12,5 +12,7 @@ in config = lib.mkIf cfg.enable { services.desktopManager.plasma6.enable = true; + + xdg.portal.config.common.default = "*"; }; } From 08818ecd22f2819ea4ce458ab22321fad0acf283 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 11:53:18 +0200 Subject: [PATCH 04/10] enable applications --- modules/plasma/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 1a9b377..238d568 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -8,9 +8,12 @@ in }; imports = [ + ../applications ]; + config = lib.mkIf cfg.enable { + modules.apps.enable = true; services.desktopManager.plasma6.enable = true; xdg.portal.config.common.default = "*"; From 044d34b0300a296812c04aeff93976b3b78b86d0 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 11:55:32 +0200 Subject: [PATCH 05/10] aaaaa --- modules/plasma/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 238d568..cad526b 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -7,13 +7,8 @@ in enable = lib.mkEnableOption "enable kde plasma 6"; }; - imports = [ - ../applications - ]; - config = lib.mkIf cfg.enable { - modules.apps.enable = true; services.desktopManager.plasma6.enable = true; xdg.portal.config.common.default = "*"; From e1fda434152049967e9042658d62ffb91a0521b4 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 12:00:20 +0200 Subject: [PATCH 06/10] add sddm --- hosts/default/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index c53b12e..944da5c 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -236,7 +236,7 @@ jack.enable = true; }; greetd = { - enable = true; + enable = false; settings = rec { initial_session = { command = "${pkgs.hyprland}/bin/Hyprland"; @@ -264,6 +264,10 @@ }; videoDrivers = [ "nvidia" ]; }; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; flatpak.enable = true; }; From 0fcfd987d4ef965688617c89a1801bdc013f64c7 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 12:19:47 +0200 Subject: [PATCH 07/10] also enable hyprland --- hosts/default/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index bee15fb..56956f0 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -27,7 +27,7 @@ nixpkgs.config.allowUnfree = true; modules = { - hyprland.enable = false; + hyprland.enable = true; games.enable = true; apps = { enable = true; From 6656d0ee6204a06fa2a5a877d39384fd0280e45e Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 12:30:53 +0200 Subject: [PATCH 08/10] remove hyprland portal as explicit --- hosts/default/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 944da5c..f18bbe4 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -185,7 +185,6 @@ hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = pkgs.xdg-desktop-portal-hyprland; }; nix-ld.enable = true; From c02abc8a0051119693c988377e7110479a895e75 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 12:41:25 +0200 Subject: [PATCH 09/10] tabs --- hosts/default/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index f18bbe4..c8ca357 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -10,7 +10,7 @@ ./hardware-configuration.nix ../../modules/games/steam.nix ../../modules/websites - ../../modules/plasma + ../../modules/plasma ]; boot = { @@ -195,7 +195,7 @@ modules = { games.steam.enable = true; - plasma.enable = true; + plasma.enable = true; websites = { enable = true; certMail = "acme@voorwaarts.nl"; @@ -263,10 +263,10 @@ }; videoDrivers = [ "nvidia" ]; }; - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; flatpak.enable = true; }; From 43f999cac55e6d5bf113b6c3ee03d481965231c9 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 19 Jun 2024 12:42:11 +0200 Subject: [PATCH 10/10] more tabs --- hosts/default/home.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 56956f0..74af342 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -3,7 +3,7 @@ { imports = [ - ../../modules + ../../modules/hyprland.nix ../../modules/games ../../modules/applications ../../common/nvim/nvim.nix @@ -85,8 +85,8 @@ # # You can also set the file content immediately. # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 # ''; }; @@ -95,15 +95,15 @@ # Manager then you have to manually source 'hm-session-vars.sh' located at # either # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh # # or # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh # # or # - # /etc/profiles/per-user/noa/etc/profile.d/hm-session-vars.sh + # /etc/profiles/per-user/noa/etc/profile.d/hm-session-vars.sh # @@ -159,12 +159,12 @@ size = 32; package = pkgs.runCommand "moveUp" { } '' - mkdir -p $out/share/icons - ln -s ${pkgs.fetchzip { - url = url; - hash = hash; - }} $out/share/icons/${name} - ''; + mkdir -p $out/share/icons + ln -s ${pkgs.fetchzip { + url = url; + hash = hash; + }} $out/share/icons/${name} + ''; }; in getFrom