diff --git a/class/desktop/plasma.nix b/class/desktop/plasma.nix index 90ae512..fe3c47a 100644 --- a/class/desktop/plasma.nix +++ b/class/desktop/plasma.nix @@ -16,7 +16,7 @@ services = { xserver = { enable = true; - desktopManager.plasma5.enable = true; + desktopManager.plasma6.enable = true; displayManager.sddm.enable = true; excludePackages = with pkgs; [ xterm diff --git a/common/ssh.nix b/common/ssh.nix index bf2ddf5..f853451 100644 --- a/common/ssh.nix +++ b/common/ssh.nix @@ -1,4 +1,8 @@ -{lib, ...}: { +{ + lib, + pkgs, + ... +}: { environment.persistence."/persist".files = [ "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_ed25519_key.pub" @@ -21,7 +25,10 @@ }; }; - programs.ssh.startAgent = true; + programs.ssh = { + startAgent = true; + askPassword = lib.getExe' pkgs.ksshaskpass "ksshaskpass"; + }; environment.etc."ssh/ssh_config".text = lib.mkAfter '' Compression yes diff --git a/flake.lock b/flake.lock index 33f965f..db153d2 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ }, "hardware": { "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", + "lastModified": 1708594753, + "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", + "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", "type": "github" }, "original": { @@ -212,16 +212,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", + "lastModified": 1708799930, + "narHash": "sha256-iYxdinEfweRXcMq/ijt0qS1pRMCfqqUXDqERZ+AA/cw=", + "owner": "K900", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "1e3e89f6f837ebb2650634829c3d9e8384dc0867", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "K900", + "ref": "plasma-6", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 117efb4..5933369 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:K900/nixpkgs/plasma-6"; hardware.url = "github:NixOS/nixos-hardware"; impermanence.url = "github:nix-community/impermanence"; agenix.url = "github:ryantm/agenix"; @@ -16,7 +16,7 @@ nixpkgs.lib.genAttrs supportedSystems (system: f (import nixpkgs {inherit system;})); mkSystem = name: class: - inputs.nixpkgs.lib.nixosSystem { + nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; modules = [ inputs.impermanence.nixosModules.impermanence