diff --git a/configs/thilo-laptop/nixos.nix b/configs/thilo-laptop/nixos.nix index 50fb7ea..e4c9338 100644 --- a/configs/thilo-laptop/nixos.nix +++ b/configs/thilo-laptop/nixos.nix @@ -31,8 +31,10 @@ displayManager.sddm.enable = true; displayManager.defaultSession = "plasma"; desktopManager.plasma6.enable = true; - layout = "us"; - xkbVariant = ""; + xkb = { + variant = ""; + layout = "us"; + }; }; gnome = { tracker-miners.enable = false; diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix index e90ec25..720b8cc 100644 --- a/configs/thilo-pc/nixos.nix +++ b/configs/thilo-pc/nixos.nix @@ -40,15 +40,17 @@ xserver = { enable = true; displayManager.sddm.enable = true; - displayManager.defaultSession = "plasma"; - desktopManager.plasma6.enable = true; - layout = "us"; - xkbVariant = ""; + displayManager.sddm.wayland.enable = true; + xkb = { + variant = ""; + layout = "us"; + }; }; ollama = { - enable = true; + enable = false; acceleration = "rocm"; }; + desktopManager.plasma6.enable = true; }; programs.kdeconnect.enable = true; @@ -58,6 +60,13 @@ extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ]; }; + programs.steam.gamescopeSession = { + enable = true; + args = [ + "-O HDMI-A-1" + ]; + }; + nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ]; diff --git a/flake.lock b/flake.lock index 3fc8cf5..be869c5 100644 --- a/flake.lock +++ b/flake.lock @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { diff --git a/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix index 9f6d2ab..14d793e 100644 --- a/home-manager/programs/zsh.nix +++ b/home-manager/programs/zsh.nix @@ -22,7 +22,7 @@ let in { programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; enableVteIntegration = true; syntaxHighlighting.enable = true; diff --git a/nixos/common.nix b/nixos/common.nix index de50e35..f9afa40 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -92,7 +92,7 @@ flatpak.enable = true; avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; }; mullvad-vpn = { enable = true;