From 6cc4677b97738fe61cb264e6fdb0104bffd0bfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Mon, 11 Nov 2024 19:48:32 +0100 Subject: [PATCH 1/4] plasma integration --- hosts/wenar-nix/default.nix | 2 +- nixosModules/system/de/default.nix | 1 + nixosModules/system/de/plasma.nix | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 nixosModules/system/de/plasma.nix diff --git a/hosts/wenar-nix/default.nix b/hosts/wenar-nix/default.nix index bce1390..2a1b108 100644 --- a/hosts/wenar-nix/default.nix +++ b/hosts/wenar-nix/default.nix @@ -37,7 +37,7 @@ enable = true; changeDefaultNetwork = true; }; - de.gnome = { + de.plasma = { enable = true; }; }; diff --git a/nixosModules/system/de/default.nix b/nixosModules/system/de/default.nix index 8b73239..a7cdcbc 100644 --- a/nixosModules/system/de/default.nix +++ b/nixosModules/system/de/default.nix @@ -2,5 +2,6 @@ { imports = [ ./gnome.nix + ./plasma.nix ]; } diff --git a/nixosModules/system/de/plasma.nix b/nixosModules/system/de/plasma.nix new file mode 100644 index 0000000..2080cd9 --- /dev/null +++ b/nixosModules/system/de/plasma.nix @@ -0,0 +1,27 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.krop.de.plasma; +in +{ + options.krop.de.plasma = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Enable KDE plasma"; + }; + }; + config = lib.mkIf cfg.enable { + services.xserver = { + enable = true; + displayManager.sddm.enable = true; + displayManager.sddm.wayland.enable = true; + desktopManager.plasma6.enable = true; + }; + }; +} From b6f45975c7dc5558bc8860b89a532f68811fd3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Mon, 11 Nov 2024 19:56:34 +0100 Subject: [PATCH 2/4] added desktop pc --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 292b6e1..d11faf2 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ inputs@{ self, nixpkgs, ... }: let hosts = { - "work-ntb" = "x86_64-linux"; + "wenar-nix" = "x86_64-linux"; "lenar" = "x86_64-linux"; }; in From ef7291893ab5a96aa2ca80cfee647ec765bd36ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Mon, 11 Nov 2024 21:57:32 +0100 Subject: [PATCH 3/4] fixed something --- nixosModules/system/de/plasma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixosModules/system/de/plasma.nix b/nixosModules/system/de/plasma.nix index 2080cd9..c23f4de 100644 --- a/nixosModules/system/de/plasma.nix +++ b/nixosModules/system/de/plasma.nix @@ -17,8 +17,8 @@ in }; }; config = lib.mkIf cfg.enable { - services.xserver = { - enable = true; + services = { + xserver.enable = true; displayManager.sddm.enable = true; displayManager.sddm.wayland.enable = true; desktopManager.plasma6.enable = true; From 00894bdf39f42eebe9458eadace3dd884707c04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Wed, 13 Nov 2024 11:27:41 +0100 Subject: [PATCH 4/4] syncthing plasma --- homeManagerModules/desktop/plasma.nix | 22 ++++++++++++++++++++++ homeManagerModules/packages/misc.nix | 12 ++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 homeManagerModules/desktop/plasma.nix diff --git a/homeManagerModules/desktop/plasma.nix b/homeManagerModules/desktop/plasma.nix new file mode 100644 index 0000000..4415509 --- /dev/null +++ b/homeManagerModules/desktop/plasma.nix @@ -0,0 +1,22 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.krop.hm.desktop.plasma; +in +{ + options.krop.hm.desktop.plasma = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Enable my plasma configuration"; + }; + }; + config = lib.mkIf cfg.enable { + + }; +} diff --git a/homeManagerModules/packages/misc.nix b/homeManagerModules/packages/misc.nix index cb3f1d3..051d7b6 100644 --- a/homeManagerModules/packages/misc.nix +++ b/homeManagerModules/packages/misc.nix @@ -15,6 +15,12 @@ in example = false; description = "Enable my misc applications"; }; + syncthing = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = "Enable syncthing"; + }; }; config = lib.mkIf cfg.enable { home.packages = with pkgs; [ @@ -27,5 +33,11 @@ in joplin-desktop wireshark ]; + services.syncthing = { + enable = true; + tray = lib.mkIf config.krop.hm.desktop.plasma.enable { + enable = true; + }; + }; }; }