diff --git a/flake.lock b/flake.lock index e0d9fe4..9e24a79 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720167120, - "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", + "lastModified": 1714515075, + "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", + "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nur": { "locked": { - "lastModified": 1720197433, - "narHash": "sha256-kC6RnEZFVMHe+fTL0V4+QvXmRnpBrEG+8q4HCi+KAmo=", + "lastModified": 1714596740, + "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6d6488e9ee482b67d1ad9aff902acd4d6b482fd3", + "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c", "type": "github" }, "original": { diff --git a/hosts/luci/hardware-configuration.nix b/hosts/luci/hardware-configuration.nix index 6105b16..16697bb 100644 --- a/hosts/luci/hardware-configuration.nix +++ b/hosts/luci/hardware-configuration.nix @@ -51,8 +51,9 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.graphics = { + hardware.opengl = { enable = true; + driSupport = true; extraPackages = with pkgs; [ intel-media-driver vaapiVdpau @@ -60,6 +61,8 @@ ]; }; + virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "ephase" ]; + hardware.opengl.driSupport32Bit = true; } diff --git a/hosts/morty/hardware-configuration.nix b/hosts/morty/hardware-configuration.nix index d2ccc01..e29fc34 100644 --- a/hosts/morty/hardware-configuration.nix +++ b/hosts/morty/hardware-configuration.nix @@ -43,8 +43,10 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.graphics.enable32Bit = true; - hardware.graphics.extraPackages = with pkgs; [ + hardware.opengl.enable = true; + hardware.opengl.driSupport = true; + hardware.opengl.driSupport32Bit = true; + hardware.opengl.extraPackages = with pkgs; [ intel-media-driver ]; } diff --git a/hosts/mrmeeseeks/hardware-configuration.nix b/hosts/mrmeeseeks/hardware-configuration.nix index e928813..02b4584 100644 --- a/hosts/mrmeeseeks/hardware-configuration.nix +++ b/hosts/mrmeeseeks/hardware-configuration.nix @@ -64,8 +64,9 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = true; - hardware.graphics = { - enable32Bit = true; + hardware.opengl = { + driSupport = true; + driSupport32Bit = true; }; hardware.bluetooth.enable = true; hardware.xpadneo.enable = true; diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index f092c4f..aad3a3d 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -128,7 +128,7 @@ in home.pointerCursor = { name = "Adwaita"; - package = pkgs.adwaita-icon-theme; + package = pkgs.gnome.adwaita-icon-theme; size = 24; x11 = { enable = true; diff --git a/modules/home-manager/desktop/sway/includes/kanshi.nix b/modules/home-manager/desktop/sway/includes/kanshi.nix index a0453e3..d212c4b 100644 --- a/modules/home-manager/desktop/sway/includes/kanshi.nix +++ b/modules/home-manager/desktop/sway/includes/kanshi.nix @@ -4,21 +4,18 @@ with lib; config = mkIf config.modules.desktop.sway.enable { services.kanshi = { enable = config.modules.desktop.sway.kanshi ; - settings = [ - { - - profile.name = "standalone"; - profile.outputs = [ + profiles = { + standalone = { + outputs = [ { criteria = "eDP-1"; scale = 1.33; status = "enable"; } ]; - } - { - profile.name = "home"; - profile.outputs = [ + }; + home = { + outputs = [ { criteria = "Iiyama North America PL2792UH 1166310803122"; mode = "3840x2160"; @@ -37,10 +34,9 @@ with lib; status = "disable"; } ]; - } - { - profile.name = "work"; - profile.outputs = [ + }; + work = { + outputs = [ { criteria = "Iiyama North America PL2480H 11183M2807013"; mode = "1920x1080"; @@ -56,8 +52,8 @@ with lib; status = "disable"; } ]; - } - ]; + }; + }; }; }; } diff --git a/nixos/includes/system/flakes.nix b/nixos/includes/system/flakes.nix index 44d4ed8..7f2c37b 100644 --- a/nixos/includes/system/flakes.nix +++ b/nixos/includes/system/flakes.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { nix = { - package = pkgs.nixVersions.latest; + package = pkgs.nixUnstable; extraOptions = '' experimental-features = nix-command flakes '';