diff --git a/flake.lock b/flake.lock index cb701af1..c95bdc72 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751192975, - "narHash": "sha256-X2WQxQZX9aktyaFQW94a4eCO0BYkLm9FZr9dyjVS7Sg=", + "lastModified": 1751619699, + "narHash": "sha256-3Si+Gi0e8PDIzUrV6LYCUN21EvaQyPaOU64kF6KT824=", "owner": "Aylur", "repo": "ags", - "rev": "74cdd7eabf0884a7d5ba0b300849891a7e89697e", + "rev": "e5e2efaf2e05e077190cfddabf5b827edae5ef8b", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1750974272, - "narHash": "sha256-VaeQzSzekMvP+/OhwNZP4kzs4paWk5+20N0MFLTn+cs=", + "lastModified": 1751569683, + "narHash": "sha256-PoQcCYTiN52PanxgWBN4Tqet1x4PCk6KtjaHNjELH88=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "dd921421391e75793d0cc674dc15eca16b46a089", + "rev": "c0c56dde3e471030edb135425a82107cf0057c6f", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751379121, - "narHash": "sha256-+zpgVvwkekHExQHXOoQ/mrxfULr9ejIMANTa7SGjNzg=", + "lastModified": 1751549328, + "narHash": "sha256-Pzh9+N0palTIX+O2NygrUmMS8omB86SnYthLwE5cu5g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "42cb2652781d132e2c458207d7290e6d1bc04622", + "rev": "53209f5724858da5e3e5db3db404c325b4da5414", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1751438379, - "narHash": "sha256-0u0rFAkdUIexx8r7+TkGjUsmauK6kKQ/RtE7vCEwLLE=", + "lastModified": 1751611255, + "narHash": "sha256-OoD7QdCBKk41sjGr7UpTxXtVba2kc2gfdex2qUCO1FQ=", "owner": "nix-community", "repo": "fenix", - "rev": "9d776d59084355be7d187a047f64c36664249c4d", + "rev": "e60617a7e9ad348c2679557d01177f9d244e6e5d", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1751413371, - "narHash": "sha256-yY7K58oczWzTfKlP6K2cICioAzG4WCkppO9pZuXQWoM=", + "lastModified": 1751640477, + "narHash": "sha256-+VyTrM4AecacK1CbaabLWDj91SoSb/QUpDUTFGrRKQM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "776d25b0652068e5eeb802670a7adfbbcadf8e8b", + "rev": "908eb6d1564f480ee6028eb6b72dcd4b8839ad53", "type": "github" }, "original": { @@ -570,11 +570,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751378814, - "narHash": "sha256-pdYjEgdVYEerzxxmrM0GJAFGZ+J50NRD0rtDZ16SuTM=", + "lastModified": 1751638642, + "narHash": "sha256-lKlxSvY6Dn9yYkwAedht2O7iXX3QjJ76YFvGOLvnpfk=", "owner": "helix-editor", "repo": "helix", - "rev": "6a090471a800b1001bdfd2b6e0b710c1cd439a4e", + "rev": "9789b2746192c9501577a6a25ba15fae5b27e88b", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1751429452, - "narHash": "sha256-4s5vRtaqdNhVBnbOWOzBNKrRa0ShQTLoEPjJp3joeNI=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "df12269039dcf752600b1bcc176bacf2786ec384", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { @@ -632,11 +632,11 @@ ] }, "locked": { - "lastModified": 1751238753, - "narHash": "sha256-hJUPWfz/h+QgXKaKovPwFAdNBnALsvVMggAPgBB+Qvw=", + "lastModified": 1751513147, + "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "cab8104e9236fab1eb9a702165454ffed353c20f", + "rev": "426b405d979d893832549b95f23c13537c65d244", "type": "github" }, "original": { @@ -783,11 +783,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751404714, - "narHash": "sha256-VcaGnoW8p7PrtSCHBMJbiuSQoYGq6tTx5VhvDAdojgc=", + "lastModified": 1751633026, + "narHash": "sha256-36YOErrM/BB8J/IpqgAg7CNZfAlfU7Mng1S9Y9OFOmc=", "owner": "hyprwm", "repo": "hyprland", - "rev": "90c8609cbb5ae7b488d7b14b4dfb3ec9585ed2b7", + "rev": "9b51d73a1e22c86e8d6ec78750e622da9242e32f", "type": "github" }, "original": { @@ -1171,11 +1171,11 @@ ] }, "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -1288,11 +1288,11 @@ ] }, "locked": { - "lastModified": 1751421595, - "narHash": "sha256-6uvHT496bu8b/UhTY86NnrbU2fzuqNkgHCHi1T3LLog=", + "lastModified": 1751508010, + "narHash": "sha256-IXBLUCMTKaMzbbs5SOqH7FEI9fRwOi3ZP6LKjttnO5o=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "cb4f76b2b304c07237bc7c2f81926b645a216021", + "rev": "d00203f8630983aadb57cfde60b481cd97d06659", "type": "github" }, "original": { @@ -1521,11 +1521,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1751186226, - "narHash": "sha256-Bt7jtmCW72JUPxOIrV73qBTAUOy4qvJXsls2ERDUcGo=", + "lastModified": 1751520935, + "narHash": "sha256-jp5Mzbw0I/DEX4PVFi4C6MzwCZ/st+GUKMl/+IodX0o=", "owner": "notashelf", "repo": "nvf", - "rev": "5bad5dd94ce5ea3b40b08d9e6802e69d02198d21", + "rev": "b4850409336b770d0db4cfd8acd71793747ddfe5", "type": "github" }, "original": { @@ -1615,11 +1615,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1751377982, - "narHash": "sha256-eqf9Bxe3uBNG4xwcteIKt855wHuT+j6orPiABQ83dDw=", + "lastModified": 1751584117, + "narHash": "sha256-X+eVYBgJtR5WtFGifchtuidsl0epV3+oKXVxdd9ntuY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "aa16885e6282a540ecfbffa0d886ed9904b425bc", + "rev": "040049b79973a742bbd0eef25369b983f764dc38", "type": "github" }, "original": { @@ -1637,11 +1637,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751510438, + "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", "type": "github" }, "original": { @@ -1700,11 +1700,11 @@ ] }, "locked": { - "lastModified": 1747449297, - "narHash": "sha256-veyXchTz6eWwvuW5X49UluHkheHkFcqHJSwGuKBhrmQ=", + "lastModified": 1751251399, + "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f44db7d7cea4528288780c6347756173a8248225", + "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", "type": "github" }, "original": { @@ -1884,11 +1884,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1751352443, - "narHash": "sha256-psuDPdulVRIl2DvVCvNfl4ZkKhUlZ/9/RvHc7vWr0js=", + "lastModified": 1751522981, + "narHash": "sha256-OisqRgWHKADyoAV5wuPPUI+wryP2gznfLdGuafEnho0=", "owner": "wez", "repo": "wezterm", - "rev": "54675c9c35788466f7828f5d722832bd1f310a62", + "rev": "c7f4b081a685ab71eef6571b4050af061fff9c85", "type": "github" }, "original": { diff --git a/hosts/cnixtop/hardware-configuration.nix b/hosts/cnixtop/hardware-configuration.nix index 1360ebcf..1866d7d5 100644 --- a/hosts/cnixtop/hardware-configuration.nix +++ b/hosts/cnixtop/hardware-configuration.nix @@ -14,7 +14,7 @@ boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd" "i2c-dev"]; + boot.kernelModules = ["kvm-amd" "amdgpu" "i2c-dev"]; boot.extraModulePackages = []; fileSystems."/" = { diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index ca10594b..58adf75a 100644 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -6,7 +6,7 @@ }: let inherit (lib) mkIf mkEnableOption; cfg = config.home.programs.waybar; - uwsm = lib.getExe pkgs.uwsm; + # uwsm = lib.getExe pkgs.uwsm; waybar = lib.getExe pkgs.waybar; waybarAssets = pkgs.runCommand "waybar-config-assets" {} '' @@ -22,15 +22,14 @@ in { config = mkIf cfg.enable { systemd.user.services.waybar = { Unit = { + Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors."; After = ["graphical-session.target"]; - ConditionEnvironment = "WAYLAND_DISPLAY"; - Description = "waybar"; }; Service = { - ExecStart = "${uwsm} app -- ${waybar} -c ${waybarAssets}/config.jsonc -s ${waybarAssets}/style.css"; + Type = "exec"; + ExecStart = "${waybar} -c ${waybarAssets}/config.jsonc -s ${waybarAssets}/style.css"; + Restart = "on-failure"; Slice = "app-graphical.slice"; - Restart = "always"; - RestartSec = 30; }; Install = { WantedBy = ["graphical-session.target"]; diff --git a/modules/nixos/programs/hyprland/inputs.nix b/modules/nixos/programs/hyprland/inputs.nix index 147a380a..d5f142b9 100644 --- a/modules/nixos/programs/hyprland/inputs.nix +++ b/modules/nixos/programs/hyprland/inputs.nix @@ -65,7 +65,7 @@ in { (mkIf (host == "cnixtop") { programs.hyprland.settings = { render = { - direct_scanout = false; + direct_scanout = 1; }; cursor = { no_hardware_cursors = 2; @@ -75,6 +75,7 @@ in { }; misc = { vrr = 0; + vfr = true; }; }; }) @@ -89,7 +90,7 @@ in { }; misc = { vrr = 0; - vfr = 1; + vfr = true; }; }; }) @@ -97,7 +98,7 @@ in { (mkIf (host == "toothpc") { programs.hyprland.settings = { render = { - direct_scanout = false; + direct_scanout = 0; }; cursor = { no_hardware_cursors = true; diff --git a/modules/nixos/programs/hyprland/rules.nix b/modules/nixos/programs/hyprland/rules.nix index 4d8e7961..676b5b7b 100644 --- a/modules/nixos/programs/hyprland/rules.nix +++ b/modules/nixos/programs/hyprland/rules.nix @@ -56,8 +56,8 @@ in { "float, class:^(com.github.hluk.copyq)$" "float, class:^(blueman-manager)$" - "workspace 5 silent, class:^(discord)$" - "workspace 5 silent, class:^(vesktop)$" + # "workspace 5 silent, class:^(discord)$" + # "workspace 5 silent, class:^(vesktop)$" "workspace 4 silent, class:^(steam_app_0)$" "workspace 4 silent, title:^(World of Warcraft)$" ]; @@ -84,7 +84,7 @@ in { "name:2,monitor:DP-3" "name:3,monitor:DP-3" "name:4,monitor:DP-3" - "name:5,monitor:DP-4" + "name:5,monitor:DP-3" "name:6,monitor:DP-3" "name:7,monitor:DP-3" "name:8,monitor:DP-3" diff --git a/modules/nixos/programs/hyprland/startup.nix b/modules/nixos/programs/hyprland/startup.nix index 8d2c38b9..7bb9a166 100644 --- a/modules/nixos/programs/hyprland/startup.nix +++ b/modules/nixos/programs/hyprland/startup.nix @@ -15,7 +15,7 @@ in { { programs.hyprland.settings = { exec-once = [ - "sleep 2 && uwsm finalize" + "uwsm finalize" "hyprlock" ]; };