diff --git a/configs/client.nix b/configs/client.nix index 77a7939..730791d 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -32,7 +32,7 @@ ssh = { startAgent = true; enableAskPassword = true; - askPassword = lib.mkOverride 1200 "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix + askPassword = lib.mkDefault "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix }; }; diff --git a/configs/desktop.nix b/configs/desktop.nix index fa23ee2..b84e037 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -59,9 +59,13 @@ }; }; - hardware.graphics = { - enable = true; - enable32Bit = true; + hardware = { + graphics = { + enable = true; + enable32Bit = true; + }; + + pulseaudio.enable = false; }; hm = { @@ -123,7 +127,6 @@ printing.enable = true; - pulseaudio.enable = false; pipewire = { enable = true; alsa.enable = true; diff --git a/flake.lock b/flake.lock index 016c9c3..c9b7b46 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1736151979, - "narHash": "sha256-PdQGjLkOtjkFGFOI2OW4bKszIX8/Ig6jPR6kXKBaYRU=", + "lastModified": 1735555697, + "narHash": "sha256-vAVPDhNSX0vnIshjkdSBgnWZLXnTAQ+xd1W6qHqJ4GM=", "ref": "refs/heads/main", - "rev": "fd017eee2fdbce44cbe57f3d72a34276ffad55d7", - "revCount": 40, + "rev": "bbcfc7babd9fc854e961e6422e61ea5ab7f09423", + "revCount": 38, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -72,11 +72,11 @@ }, "crane": { "locked": { - "lastModified": 1736101677, - "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1735925111, + "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1736150521, - "narHash": "sha256-BX3bAAPLKwpIl/1jvCWUKOl4q8ri9BGcRwN+XI8bTf8=", + "lastModified": 1735545722, + "narHash": "sha256-YCV7J8mo7OXgUSMhNJwvq7u2Ka8LRo7sLaQQi5RHV30=", "owner": "soopyc", "repo": "mystia", - "rev": "7380f249aa50a9676ac9b5ca8342262a2a097f5a", + "rev": "87fcf4041dcb362f3074f7675b5b5f9f2bcdc1fd", "type": "github" }, "original": { @@ -199,16 +199,19 @@ "nixos-wsl": { "inputs": { "flake-compat": [], + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1733854371, + "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", "type": "github" }, "original": { @@ -219,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -295,11 +298,11 @@ ] }, "locked": { - "lastModified": 1736115332, - "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { @@ -358,11 +361,11 @@ ] }, "locked": { - "lastModified": 1736128196, - "narHash": "sha256-wSVfnO8Hixn767LsdAE/FIHO5IemkfbTEZZ03+HUowM=", + "lastModified": 1735868868, + "narHash": "sha256-U4Oy2o/CmBg6gexAHamH++52oAgvvEwcq9fkEmcvjyw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ba2fa846fba43fb9c8cd71b1435d227a7925fae0", + "rev": "b0f7a59cee0ca77c157ab4e0c60d4a9df6bccb86", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14f1133..3289325 100644 --- a/flake.nix +++ b/flake.nix @@ -109,6 +109,7 @@ nixos-wsl = { url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; inputs.flake-compat.follows = ""; }; diff --git a/programs/kde.nix b/programs/kde.nix index 32212a5..468a3c1 100644 --- a/programs/kde.nix +++ b/programs/kde.nix @@ -17,7 +17,7 @@ environment = { systemPackages = with pkgs; [ gnome-calculator - koi + camasca.packages.${pkgs.system}.koi ]; plasma6.excludePackages = with pkgs.kdePackages; [