From cba8025da5c50a0c22829c55e2234109833922a0 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:04:24 +0200 Subject: [PATCH 1/7] chore(packages): update nipkg version --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9e24a79..e0d9fe4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1720167120, + "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nur": { "locked": { - "lastModified": 1714596740, - "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=", + "lastModified": 1720197433, + "narHash": "sha256-kC6RnEZFVMHe+fTL0V4+QvXmRnpBrEG+8q4HCi+KAmo=", "owner": "nix-community", "repo": "NUR", - "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c", + "rev": "6d6488e9ee482b67d1ad9aff902acd4d6b482fd3", "type": "github" }, "original": { From a5bd4f4c835ef42fc89047aeb6166f4d3ce8bd2b Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:05:26 +0200 Subject: [PATCH 2/7] chore(mrmeeseeks): change OpenGL parameters regarding Nix evolution --- hosts/mrmeeseeks/hardware-configuration.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/mrmeeseeks/hardware-configuration.nix b/hosts/mrmeeseeks/hardware-configuration.nix index 02b4584..e928813 100644 --- a/hosts/mrmeeseeks/hardware-configuration.nix +++ b/hosts/mrmeeseeks/hardware-configuration.nix @@ -64,9 +64,8 @@ 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; From 4a1c9bf1634e937dc22b9bd3b40de07d7a2303c6 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:14:44 +0200 Subject: [PATCH 3/7] chore(home-manager): upstream package name change --- modules/home-manager/desktop/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index aad3a3d..f092c4f 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.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = 24; x11 = { enable = true; From c09a76b349f95a089b35004e193dd55eb509fb29 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:16:00 +0200 Subject: [PATCH 4/7] chore(package): rename packages repository (upstream change) --- nixos/includes/system/flakes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ''; From 87b1cce77d4818afc3458e3f8f35996f23335b48 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:17:44 +0200 Subject: [PATCH 5/7] chore(morty): change OpenGL parameters regarding Nix evolution --- hosts/morty/hardware-configuration.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 ]; } From dce2206d6d0f3d31e2afd5d29b49bad07644e3c1 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 19:24:59 +0200 Subject: [PATCH 6/7] chore(luci): change OpenGL parameters regarding Nix evolution --- hosts/luci/hardware-configuration.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; } From 03d7dcbc244cb4e5f2131db0b41d55219b39bbc6 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 5 Jul 2024 20:34:00 +0200 Subject: [PATCH 7/7] chore(home-manager): update Kanshi configuration --- .../desktop/sway/includes/kanshi.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) 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"; } ]; - }; - }; + } + ]; }; }; }