diff --git a/flake.lock b/flake.lock index 423f3781..10233a16 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1724273991, - "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=", + "lastModified": 1725016199, + "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4", + "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -438,11 +438,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -877,11 +877,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724784150, - "narHash": "sha256-XlmFLoLppuKxSh2eGPXy27+tNIQ+w+cXoh8Ln3vBJew=", + "lastModified": 1725032272, + "narHash": "sha256-A0AiFlPoqDK/IwUiV7SGIi8uW2zOqmmiZY6j8i367LU=", "ref": "refs/heads/main", - "rev": "17ed4fc04cedbaad365bdebf6bfe0160c527f3fe", - "revCount": 5147, + "rev": "c5fd5771814958ad274ea9abb961fff621a35b9c", + "revCount": 5165, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1079,11 +1079,11 @@ ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -1258,11 +1258,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724575805, - "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -1378,11 +1378,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1410,11 +1410,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1723703277, - "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", "type": "github" }, "original": { @@ -1476,11 +1476,11 @@ }, "nur": { "locked": { - "lastModified": 1724790598, - "narHash": "sha256-H14riEUFLwhfFF7aV98H53ZCCNi0hOrtbC/Eb9dueWE=", + "lastModified": 1725029189, + "narHash": "sha256-iKjvutomaXnPFP198YFhsGJAmSS/qX0gRPEJwoco0BI=", "owner": "nix-community", "repo": "NUR", - "rev": "c170519c42e19027cc0d14a6ac8d36ba19574764", + "rev": "758483969436e4a5f202760e7f158704572df459", "type": "github" }, "original": { @@ -1546,11 +1546,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1724763886, - "narHash": "sha256-SzBtZs5z+YGM50oyt67R78qLhxG/wG5/SlVRsCF5kRc=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1cd12de659fab215624c630c37d1c62aa2b7824e", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -1595,11 +1595,11 @@ ] }, "locked": { - "lastModified": 1723774846, - "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", + "lastModified": 1724811750, + "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", + "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", "type": "github" }, "original": { @@ -1705,11 +1705,11 @@ ] }, "locked": { - "lastModified": 1724732223, - "narHash": "sha256-W+/vVPdDSf10R7YO1jI8V0HFKWKYnqtKfP+d7nw57p0=", + "lastModified": 1724991403, + "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "12c5bf55a7f5d1466b91a0f8275f0aa2b5b214cc", + "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05", "type": "github" }, "original": { @@ -2037,11 +2037,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723818372, - "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", + "lastModified": 1724858904, + "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", "owner": "dj95", "repo": "zjstatus", - "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", + "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", "type": "github" }, "original": { diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index 6410b6ef..25c51171 100644 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -145,7 +145,6 @@ in wlr-randr wlr-randr wtype - xwaylandvideobridge ydotool wlprop xorg.xprop diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix index 4caa828d..e8f2bb85 100644 --- a/modules/home/services/hyprpaper/default.nix +++ b/modules/home/services/hyprpaper/default.nix @@ -11,7 +11,6 @@ let inherit (lib.${namespace}) mkBoolOpt; cfg = config.${namespace}.services.hyprpaper; - in { @@ -24,6 +23,7 @@ in preload = ${config.stylix.image} wallpaper = , ${config.stylix.image} ''; + systemd.user.services.hyprpaper = { Unit = { Description = "Hyprland wallpaper daemon"; diff --git a/modules/home/theme/gtk/default.nix b/modules/home/theme/gtk/default.nix index 13b19e82..fb5f32ae 100644 --- a/modules/home/theme/gtk/default.nix +++ b/modules/home/theme/gtk/default.nix @@ -23,7 +23,6 @@ in config = mkIf (cfg.enable && pkgs.stdenv.isLinux) { home = { packages = with pkgs; [ - # NOTE: required explicitly with noXlibs and home-manager dconf glib # gsettings gtk3.out # for gtk-launch diff --git a/modules/nixos/displaymanager/sddm/default.nix b/modules/nixos/displaymanager/sddm/default.nix index 462bfe2d..5cd6a3cf 100644 --- a/modules/nixos/displaymanager/sddm/default.nix +++ b/modules/nixos/displaymanager/sddm/default.nix @@ -18,7 +18,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - catppuccin-sddm-corners + where-is-my-sddm-theme sddm ]; @@ -26,7 +26,7 @@ in displayManager = { sddm = { inherit (cfg) enable; - theme = "catppuccin-sddm-corners"; + theme = "where_is_my_sddm_theme"; wayland = enabled; }; }; @@ -37,7 +37,6 @@ in '' echo "Setting sddm permissions for user icon" ${getExe' pkgs.acl "setfacl"} -m u:sddm:x /home/${config.${namespace}.user.name} - ${getExe' pkgs.acl "setfacl"} -m u:sddm:r /home/${config.${namespace}.user.name}/.face.icon || true ''; }; } diff --git a/modules/nixos/programs/graphical/addons/xdg-portal/default.nix b/modules/nixos/programs/graphical/addons/xdg-portal/default.nix index aac301aa..bc33f8c9 100644 --- a/modules/nixos/programs/graphical/addons/xdg-portal/default.nix +++ b/modules/nixos/programs/graphical/addons/xdg-portal/default.nix @@ -10,7 +10,7 @@ let inherit (lib) mkIf; inherit (lib.${namespace}) mkBoolOpt; - inherit (inputs) hyprland xdg-desktop-portal-hyprland; + inherit (inputs) hyprland; cfg = config.${namespace}.programs.graphical.addons.xdg-portal; in @@ -45,16 +45,10 @@ in }; }; - extraPortals = - with pkgs; - [ xdg-desktop-portal-gtk ] - ++ (lib.optional config.${namespace}.programs.graphical.wms.hyprland.enable ( - xdg-desktop-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland.override { - debug = true; - # TODO: use same package as home-manager - inherit (hyprland.packages.${system}) hyprland; - } - )); + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + ]; # xdgOpenUsePortal = true; wlr = { diff --git a/modules/nixos/suites/wlroots/default.nix b/modules/nixos/suites/wlroots/default.nix index 57280a4c..05966461 100644 --- a/modules/nixos/suites/wlroots/default.nix +++ b/modules/nixos/suites/wlroots/default.nix @@ -25,7 +25,6 @@ in }; programs = { nm-applet.enable = true; - xwayland.enable = true; wshowkeys = { enable = true; diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix index 33a93b1e..907e3fbd 100644 --- a/modules/nixos/system/boot/default.nix +++ b/modules/nixos/system/boot/default.nix @@ -53,14 +53,20 @@ in canTouchEfiVariables = true; efiSysMountPoint = "/boot"; }; + grub = { + enable = true; + useOSProber = true; + efiSupport = true; + device = "nodev"; + }; generationsDir.copyKernels = true; - systemd-boot = { - enable = true; - configurationLimit = 20; - editor = false; - }; + # systemd-boot = { + # enable = true; + # configurationLimit = 20; + # editor = false; + # }; }; tmp = default-attrs { diff --git a/systems/x86_64-linux/grovetender/hyprlandOutput b/systems/x86_64-linux/grovetender/hyprlandOutput index da4eadf1..660929ff 100644 --- a/systems/x86_64-linux/grovetender/hyprlandOutput +++ b/systems/x86_64-linux/grovetender/hyprlandOutput @@ -1,4 +1,4 @@ -monitor=HDMI-A-1, 2440x1080@143, 0x0, 2, bitdepth, 10 +monitor=HDMI-A-1, 2440x1080@143, 0x0, 1, bitdepth, 10 workspace = name:hello, monitor:DP-1, defafult:true windowrulev2 = workspace name:hello, class:^(nwg-hello)$