diff --git a/flake.lock b/flake.lock index 0e255c3..793c1af 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -276,11 +276,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1720818679, + "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "29148118cc33f08b71058e1cda7ca017f5300b51", "type": "github" }, "original": { diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index ad836f8..cd34efa 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -33,7 +33,7 @@ in { # Hardware preferences ## Mouse - services.xserver.libinput.mouse.accelProfile = "flat"; + services.libinput.mouse.accelProfile = "flat"; ## Monitors mods.monitors = { diff --git a/modules/nixos/desktop/xorg.nix b/modules/nixos/desktop/xorg.nix index f25e0cd..2caef36 100644 --- a/modules/nixos/desktop/xorg.nix +++ b/modules/nixos/desktop/xorg.nix @@ -2,7 +2,7 @@ monitorModule = lib.types.submodule { options = { name = lib.mkOption { - type = lib.types.string; + type = lib.types.str; description = "monitor name"; example = "HDMI-1"; }; @@ -34,8 +34,8 @@ in { services.xserver.xkb.options = "caps:escape"; services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = config.mods.user.name; systemd.services.display-manager.wants = startupTargets; diff --git a/modules/nixos/server/containers/steam.nix b/modules/nixos/server/containers/steam.nix index 3073528..ffb12b5 100644 --- a/modules/nixos/server/containers/steam.nix +++ b/modules/nixos/server/containers/steam.nix @@ -1,8 +1,8 @@ { pkgs, lib, config, ... }: let steam-xinit = pkgs.writeShellScriptBin "steam-xinit" '' ${lib.getExe pkgs.steam} & - exec ${lib.getExe pkgs.openbox} & - exec ${lib.getExe pkgs.xterm} + exec ${pkgs.openbox}/bin/openbox & + exec ${pkgs.xterm}/bin/xterm ''; in { @@ -92,9 +92,9 @@ in { }; }; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport32Bit = true; + enable32Bit = true; }; # programs.ssh.forwardX11 = true; diff --git a/modules/nixos/unfree/nvidia.nix b/modules/nixos/unfree/nvidia.nix index 6e90c75..aaf96a7 100644 --- a/modules/nixos/unfree/nvidia.nix +++ b/modules/nixos/unfree/nvidia.nix @@ -19,9 +19,9 @@ in { config = lib.mkIf cfg.enable { # nixos.wiki/wiki/Nvidia - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport32Bit = true; + enable32Bit = true; }; services.xserver.videoDrivers = [ "nvidia" "nvidia-dkms" ];