diff --git a/flake.lock b/flake.lock index 8901136..c17e535 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1705452289, - "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=", + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1705660020, - "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", + "lastModified": 1705879479, + "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", + "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", "type": "github" }, "original": { @@ -318,11 +318,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1705739123, - "narHash": "sha256-j9ZgSih8MIkm07ctB84Olrlp945Tx0xxJuaFsrTYNHE=", + "lastModified": 1705911882, + "narHash": "sha256-S5wqI5xX3nRSJi1ZrR4x+bA7mzuMRMOnoUNXGIvExeI=", "owner": "nix-community", "repo": "kde2nix", - "rev": "3a4ab493a8f39080688f9738a98f93e9f089c704", + "rev": "79e792034cffa8b697b6c1a4a9d7310736822fc8", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1705400161, - "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=", + "lastModified": 1705931262, + "narHash": "sha256-JU8Dn3FeLlpC2aCXDbVH+E9koZYw/r1LW+fofWq87mE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234", + "rev": "ed8ab00e8d92076a7cac1b428881b4d5304bb771", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1705641746, - "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", + "lastModified": 1705774713, + "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", + "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -463,16 +463,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", - "owner": "NixOS", + "lastModified": 1705911640, + "narHash": "sha256-auO4spQ1+4HA8NtpAcrRkKz6I9t/Yk5GBeZgQ5/6pYI=", + "owner": "K900", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "df8dfca854b41c3addcdb0f0f481c203d9728e3c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "K900", + "ref": "kdsoap-fix", "repo": "nixpkgs", "type": "github" } @@ -495,11 +495,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1705697961, + "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705229514, - "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1705805983, + "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "ae171b54e76ced88d506245249609f8c87305752", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c995594..343caf0 100644 --- a/flake.nix +++ b/flake.nix @@ -47,15 +47,15 @@ }; nixConfig = { - #extra-substituters = [ - # "https://nix-community.cachix.org" - # "https://0uptime.cachix.org" - #]; + extra-substituters = [ + "https://nix-community.cachix.org" + "https://0uptime.cachix.org" + ]; - #extra-trusted-public-keys = [ - # "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - #]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + ]; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: diff --git a/nixos/features/plasma6.nix b/nixos/features/plasma6.nix index ffa8919..e672db7 100644 --- a/nixos/features/plasma6.nix +++ b/nixos/features/plasma6.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: { +{ inputs, ... }: { + imports = [ + inputs.kde2nix.nixosModules.plasma6 + ]; services.xserver = { enable = true; diff --git a/nixos/hosts/cider/default.nix b/nixos/hosts/cider/default.nix index 47a0ff7..0944205 100644 --- a/nixos/hosts/cider/default.nix +++ b/nixos/hosts/cider/default.nix @@ -5,7 +5,7 @@ ./hardware-configuration.nix ../../client.nix - ../../features/plasma6.nix + ../../features/plasma5.nix ../../features/sound/asahi.nix ../../features/wifi.nix ../../features/tailscale.nix