From a917cf96421207fcd1103e9cf827f56322bb259b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sun, 1 Dec 2024 16:13:29 +0100 Subject: [PATCH] Better monitor selection in AGS + install steam on Kell --- flake.lock | 56 +++++++++++++++++++-------------------- home/ags/files/app.ts | 2 +- home/hyprland/default.nix | 2 +- hosts/Common/default.nix | 5 ++-- hosts/Common/nvidia.nix | 2 +- hosts/Kell/default.nix | 6 ++++- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 9f14aa6..67794b4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,12 +7,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-bzgqyVRLSzpVlm9lthDqBoHXwPtNyyF7wVSwHqv6uts=", - "path": "/nix/store/16d9cbnr3qbbv1qn9fjvdzgq5vxs7s03-source/home/ags", + "narHash": "sha256-Dh98KL+QgJs17frZq1TMMzcnmn5Pc5NS0+d8nC6tBAY=", + "path": "/nix/store/bbjv9f31ch9yv0rc1y04wkznn5i3018h-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/16d9cbnr3qbbv1qn9fjvdzgq5vxs7s03-source/home/ags", + "path": "/nix/store/bbjv9f31ch9yv0rc1y04wkznn5i3018h-source/home/ags", "type": "path" } }, @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1731959031, + "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1733045511, + "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732808926, - "narHash": "sha256-ERmNx9ucO32GjDWh4vyLDuHKOs6ERStmlVnaBFi/+xU=", + "lastModified": 1732988560, + "narHash": "sha256-QBFoZSceBzBqf5alWSHudb/81FymlyTcRaOCdL7zPHM=", "ref": "refs/heads/main", - "rev": "22bf2853e6271932f073961f3dbeb0f9ff48493e", - "revCount": 5503, + "rev": "d26439a0fe5594fb26d5a3c01571f9490a9a2d2c", + "revCount": 5506, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -464,11 +464,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -480,11 +480,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -512,11 +512,11 @@ }, "nur": { "locked": { - "lastModified": 1732825667, - "narHash": "sha256-vgzdLgf/PbJgFd5ynAmgGn6O/6wD3+uIPofL/f9eP7s=", + "lastModified": 1733065597, + "narHash": "sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8=", "owner": "nix-community", "repo": "NUR", - "rev": "98462a96c46ee1696f17d83948ebe44112406db5", + "rev": "7d4007f69a37be43cbdd420d8d0659f8ae70fcbf", "type": "github" }, "original": { @@ -536,11 +536,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { diff --git a/home/ags/files/app.ts b/home/ags/files/app.ts index 0f7078c..ee065a1 100644 --- a/home/ags/files/app.ts +++ b/home/ags/files/app.ts @@ -22,7 +22,7 @@ App.start({ iconTheme: "Papirus", main() { let mainMonitor = find_main_monitor() - let gtkMonitor = App.get_monitors()[Number(mainMonitor.get_id())] + let gtkMonitor = App.get_monitors()[0].get_display().get_monitor_at_point(mainMonitor.get_x(), mainMonitor.get_y()) let scale = (mainMonitor.get_width() >= 3000)? 1.2: 1 Bar(gtkMonitor, scale) NotificationPopups(gtkMonitor) diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 877316c..ef62703 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -103,7 +103,7 @@ in { "$altMod" = pkgs.lib.mkDefault "ALT_L"; exec-once = [ "hyprpaper" - "${inputs.ags.packages.${pkgs.system}.default}/bin/ags-bar" + "hyprctl dispatch exec ${inputs.ags.packages.${pkgs.system}.default}/bin/ags-bar" "${wl-paste} --type text --watch cliphist store" "${wl-paste} --type image --watch cliphist store" "${pkgs.mate.mate-polkit}/bin/polkit-mate" diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix index c83c0ed..7aa5529 100644 --- a/hosts/Common/default.nix +++ b/hosts/Common/default.nix @@ -35,8 +35,9 @@ iosevka roboto font-awesome - # nerdfonts - (nerdfonts.override { fonts = [ "FiraCode" "Ubuntu" "ZedMono" ]; }) + nerd-fonts.fira-code + nerd-fonts.ubuntu + nerd-fonts.zed-mono ]; environment.systemPackages = with pkgs; [ diff --git a/hosts/Common/nvidia.nix b/hosts/Common/nvidia.nix index 3257877..7cbd832 100644 --- a/hosts/Common/nvidia.nix +++ b/hosts/Common/nvidia.nix @@ -15,7 +15,7 @@ hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.beta; modesetting.enable = true; - powerManagement.enable = false; + powerManagement.enable = true; powerManagement.finegrained = false; open = false; nvidiaSettings = true; diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 02b006f..9cc9138 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -11,7 +11,7 @@ in { ]; # Kernel - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; # AMD CPU boot.blacklistedKernelModules = [ "k10temp" ]; @@ -76,4 +76,8 @@ in { capSysAdmin = true; openFirewall = true; }; + programs.steam = { + enable = true; + gamescopeSession.enable = true; + }; }