diff --git a/flake.lock b/flake.lock index 9e24a79..004ac77 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nur": { "locked": { - "lastModified": 1714596740, - "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=", + "lastModified": 1723580753, + "narHash": "sha256-9Zuz0QyCp+jY9vszrn4TkqpcnGKA7bM9M+da/6I0Yfs=", "owner": "nix-community", "repo": "NUR", - "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c", + "rev": "e36bc569a3652499909486b983ef97d319ee7271", "type": "github" }, "original": { diff --git a/hosts/luci/hardware-configuration.nix b/hosts/luci/hardware-configuration.nix index 16697bb..6105b16 100644 --- a/hosts/luci/hardware-configuration.nix +++ b/hosts/luci/hardware-configuration.nix @@ -51,9 +51,8 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; extraPackages = with pkgs; [ intel-media-driver vaapiVdpau @@ -61,8 +60,6 @@ ]; }; - 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 e29fc34..d2ccc01 100644 --- a/hosts/morty/hardware-configuration.nix +++ b/hosts/morty/hardware-configuration.nix @@ -43,10 +43,8 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.opengl.enable = true; - hardware.opengl.driSupport = true; - hardware.opengl.driSupport32Bit = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.enable32Bit = true; + hardware.graphics.extraPackages = with pkgs; [ intel-media-driver ]; } diff --git a/hosts/mrmeeseeks/hardware-configuration.nix b/hosts/mrmeeseeks/hardware-configuration.nix index 02b4584..2fdf861 100644 --- a/hosts/mrmeeseeks/hardware-configuration.nix +++ b/hosts/mrmeeseeks/hardware-configuration.nix @@ -24,6 +24,10 @@ "kvm-amd" "amdgpu" ]; + + boot.kernelParams = [ + "amdgpu.ppfeaturemask=0xffffffff" + ]; boot.extraModulePackages = [ ]; boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/ea7fa60d-35e5-48b8-95d7-142f37b262cd"; @@ -64,10 +68,10 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = true; - hardware.opengl = { - driSupport = true; - driSupport32Bit = true; + hardware.graphics = { + enable32Bit = true; }; hardware.bluetooth.enable = true; hardware.xpadneo.enable = true; + programs.coolercontrol.enable = true; } diff --git a/modules/home-manager/cli/neovim/files/whichkey.lua b/modules/home-manager/cli/neovim/files/whichkey.lua index 0b51321..a3cf600 100644 --- a/modules/home-manager/cli/neovim/files/whichkey.lua +++ b/modules/home-manager/cli/neovim/files/whichkey.lua @@ -1,4 +1,4 @@ -- Which-key -- local wk = require 'which-key' -wk.register() +-- wk.register() diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index aad3a3d..e45a78c 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -84,7 +84,7 @@ in home.packages = with pkgs; [ dejavu_fonts - emojione + # emojione font-awesome grim lato @@ -128,7 +128,7 @@ in home.pointerCursor = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.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 d212c4b..a0453e3 100644 --- a/modules/home-manager/desktop/sway/includes/kanshi.nix +++ b/modules/home-manager/desktop/sway/includes/kanshi.nix @@ -4,18 +4,21 @@ with lib; config = mkIf config.modules.desktop.sway.enable { services.kanshi = { enable = config.modules.desktop.sway.kanshi ; - profiles = { - standalone = { - outputs = [ + settings = [ + { + + profile.name = "standalone"; + profile.outputs = [ { criteria = "eDP-1"; scale = 1.33; status = "enable"; } ]; - }; - home = { - outputs = [ + } + { + profile.name = "home"; + profile.outputs = [ { criteria = "Iiyama North America PL2792UH 1166310803122"; mode = "3840x2160"; @@ -34,9 +37,10 @@ with lib; status = "disable"; } ]; - }; - work = { - outputs = [ + } + { + profile.name = "work"; + profile.outputs = [ { criteria = "Iiyama North America PL2480H 11183M2807013"; mode = "1920x1080"; @@ -52,8 +56,8 @@ with lib; status = "disable"; } ]; - }; - }; + } + ]; }; }; } diff --git a/modules/nixos/gaming/steam/default.nix b/modules/nixos/gaming/steam/default.nix index 158b021..5ba01dc 100644 --- a/modules/nixos/gaming/steam/default.nix +++ b/modules/nixos/gaming/steam/default.nix @@ -31,7 +31,7 @@ in gamescopeSession = { enable = cfg.gamescope; args = [ - "-O HDMI-A-1" + "-O HDMI-A-2" "-F fsr" ]; }; diff --git a/nixos/includes/system/flakes.nix b/nixos/includes/system/flakes.nix index 7f2c37b..44d4ed8 100644 --- a/nixos/includes/system/flakes.nix +++ b/nixos/includes/system/flakes.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { nix = { - package = pkgs.nixUnstable; + package = pkgs.nixVersions.latest; extraOptions = '' experimental-features = nix-command flakes '';