diff --git a/flake.lock b/flake.lock index c9828e7..0c91fd6 100644 --- a/flake.lock +++ b/flake.lock @@ -182,10 +182,44 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -216,6 +250,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "kde2nix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -257,11 +313,31 @@ "type": "github" } }, + "kde2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1704378678, + "narHash": "sha256-cKyRey93E9ikisnzDB/DcPC8zu1iiK5miDQ5WoGg1ek=", + "owner": "nix-community", + "repo": "kde2nix", + "rev": "b123e781c912109c41c34d7778b970c9d8e403b7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "kde2nix", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1704245029, @@ -293,6 +369,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1704367582, + "narHash": "sha256-mAm6fl0VtONvT03ia/MzXKHAxNMWLYZMTV7VpXRBiho=", + "owner": "K900", + "repo": "nixpkgs", + "rev": "e06ffa09d0041a8864bf4304674953a7cf3acaf4", + "type": "github" + }, + "original": { + "owner": "K900", + "ref": "qt6ening", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -308,7 +416,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1703961334, "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", @@ -324,7 +432,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1700856099, "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", @@ -340,28 +448,42 @@ "type": "github" } }, - "nur": { + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "kde2nix", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "kde2nix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, "locked": { - "lastModified": 1704286539, - "narHash": "sha256-sNrZrWOZt+ODRspwyiptJvFM22BMWsMYHFO/KjPV4m8=", - "owner": "nix-community", - "repo": "NUR", - "rev": "dcb7c95dddac213211a5bf1d97eed5a9f70c60d2", + "lastModified": 1703939133, + "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "type": "github" }, "original": { - "id": "nur", - "type": "indirect" + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" } }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", + "kde2nix": "kde2nix", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "nur": "nur", + "nixpkgs": "nixpkgs_3", "stylix": "stylix" } }, @@ -375,9 +497,9 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1703880383, @@ -407,6 +529,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5b53d3d..3d330e8 100644 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,12 @@ # Theming stylix.url = "github:danth/stylix"; + + #kde2nix + kde2nix.url = "github:nix-community/kde2nix"; }; outputs = inputs @ { nixpkgs, - nur, stylix, home-manager, ... @@ -47,8 +49,8 @@ # Modules modules = [ - # NUR Module - nur.nixosModules.nur + #kde2nix Module + inputs.kde2nix.nixosModules.default # Theme Modules stylix.nixosModules.stylix @@ -72,7 +74,6 @@ ./home ./home/shell ./home/desktop - ./home/desktop/gnome ]; }; } diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix index 380563c..b3bb009 100644 --- a/hosts/Equinox/default.nix +++ b/hosts/Equinox/default.nix @@ -22,7 +22,7 @@ in { ../../modules/containers-nvidia.nix ../../modules/virtualization.nix ../../modules/harden.nix - ../../modules/gnome.nix + ../../modules/kde.nix ]; # Set networking diff --git a/modules/kde.nix b/modules/kde.nix index fa3c70a..0fe918e 100644 --- a/modules/kde.nix +++ b/modules/kde.nix @@ -1,7 +1,7 @@ {...}: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasma"; + services.xserver.desktopManager.plasma6.enable = true; programs.dconf.enable = true; }