diff --git a/configuration.nix b/configuration.nix index a2dd9ab..5d062ba 100644 --- a/configuration.nix +++ b/configuration.nix @@ -65,9 +65,6 @@ # Thermal data thermald.enable = false; # TODO(dm) error here - # Enable the X11 windowing system. - xserver.enable = true; - # Fingerprinting fprintd.enable = false; @@ -96,6 +93,8 @@ }; }; + # Enable the X11 windowing system. + xserver.enable = true; xserver.displayManager = { sddm = { enable = true; @@ -106,6 +105,7 @@ InputMethod = ""; }; }; + wayland.enable = true; }; }; @@ -123,7 +123,7 @@ }; }; - xserver.desktopManager.plasma5.enable = true; + desktopManager.plasma6.enable = true; # Disable OpenSSH Daemon openssh.enable = false; @@ -263,7 +263,6 @@ htop.enable = true; gnupg.agent.enable = true; - kdeconnect.enable = true; zsh.enable = true; }; diff --git a/flake.lock b/flake.lock index fd91240..73f3bd2 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nur": { "locked": { - "lastModified": 1710697444, - "narHash": "sha256-urXOs+RBgBmXRwAl310Y5VK6RV5j0CKHjUhX7DBiiD8=", + "lastModified": 1712501617, + "narHash": "sha256-ipzJlgEAURIUIIDvpSDWtF4DiS0ANvkmQodB9BZ5BDA=", "owner": "nix-community", "repo": "NUR", - "rev": "38132867eedc7146cf5c40a500b1fc1d8adadb40", + "rev": "ed45405982bdd65ce2eb7341a42ea18fb5958d76", "type": "github" }, "original": { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 4f67eea..e444c6a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,7 @@ let - lyretail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtQFica1N9fXu1qEMnPh5LJOmIikWIcXOypTjK39f8s"; + crowntail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtQFica1N9fXu1qEMnPh5LJOmIikWIcXOypTjK39f8s"; in { - "restic-password.age".publicKeys = [ lyretail ]; - "restic-env.age".publicKeys = [ lyretail ]; + "restic-password.age".publicKeys = [ crowntail ]; + "restic-env.age".publicKeys = [ crowntail ]; } diff --git a/users/dm.nix b/users/dm.nix index b5dc64f..285d02c 100644 --- a/users/dm.nix +++ b/users/dm.nix @@ -64,7 +64,7 @@ in pkgs.vlc pkgs.keepassxc pkgs.yubikey-manager - pkgs.texlive.combined.scheme-full + # pkgs.texlive.combined.scheme-full ] ++ [ # Dev pkgs.gnumake