diff --git a/flake.lock b/flake.lock index 8099bf3..932b00a 100644 --- a/flake.lock +++ b/flake.lock @@ -24,14 +24,15 @@ "anyrun": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { - "lastModified": 1717432180, - "narHash": "sha256-KsBOzrPEJjeNkqbtrkTjE3uxFxbj1P8pgtF/5AdfLPU=", + "lastModified": 1717440077, + "narHash": "sha256-/lEc5GI1Y3g6qwEmPxhE0g5HHh4LPS7XNEOF530pkyo=", "owner": "kirottu", "repo": "anyrun", - "rev": "5d2610eb14db54ece2833fd8e35f520faf0723a2", + "rev": "de2b05bddbf1dcf220379018eaed4158f34e7863", "type": "github" }, "original": { @@ -247,11 +248,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -355,7 +356,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -373,7 +374,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -391,7 +392,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -409,7 +410,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -589,21 +590,23 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1717433180, - "narHash": "sha256-7REcmIOxGxHG8x/dUgW44Chxu+3h5Lp8PQXOUDyKOWw=", - "owner": "hyprwm", - "repo": "hyprland", - "rev": "3fd6c1b30e5397432c4640286efaf52a6891f71c", - "type": "github" + "lastModified": 1717447622, + "narHash": "sha256-yT+e+NxXDes75AXaoxr41uStjXQgwK1SR5ZQEl27XlU=", + "ref": "refs/heads/main", + "rev": "d0a224a4915b5a90555818ed3f9e49e1a61b7cdb", + "revCount": 4761, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { @@ -661,7 +664,7 @@ "hyprlang_2": { "inputs": { "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1713121246, @@ -681,7 +684,7 @@ "inputs": { "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs_6", - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1716658811, @@ -811,11 +814,11 @@ ] }, "locked": { - "lastModified": 1717377890, - "narHash": "sha256-qtTk68FSJicKyjmEoqV1tbpOVQG3hJI0NYRPL3uP9KI=", + "lastModified": 1717464255, + "narHash": "sha256-+RM9dpf6F9CRIpouYgD2YL5zrK0vslyRYK44NO70zkc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "7344429cb68056494da56ddb3a135ba8f5a560ef", + "rev": "6929e834c2c4eba8172eafbb7b26648319217a99", "type": "github" }, "original": { @@ -989,11 +992,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -1244,11 +1247,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1717406456, - "narHash": "sha256-voWbxOZu1DM6hLOlOkLqSrZ8BsOY6F9h/tYB9C0jOXs=", + "lastModified": 1717467480, + "narHash": "sha256-9Fbar+ycxdfZ6HbwOCgD+jWG3du/12TFisKRQm4Zhfc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "711ff40be18b09bf096930f52e1fb2fcbee9adf0", + "rev": "260ff391290a2b23958d04db0d3e7015c8417401", "type": "github" }, "original": { @@ -1284,11 +1287,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717297459, - "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { @@ -1298,6 +1301,21 @@ } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1312,7 +1330,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1327,7 +1345,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1342,7 +1360,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1357,7 +1375,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1372,7 +1390,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1387,7 +1405,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index cab5292..dfbf0b4 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,7 @@ nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; # hyprland - - hyprland.url = "github:hyprwm/hyprland"; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprpaper.url = "github:hyprwm/hyprpaper"; diff --git a/home/modules/wayland/hyprland.nix b/home/modules/wayland/hyprland.nix index 3f3431a..aa47927 100644 --- a/home/modules/wayland/hyprland.nix +++ b/home/modules/wayland/hyprland.nix @@ -125,20 +125,18 @@ in { }; }; - cursor = { - package = pkgs.catppuccin-cursors.macchiatoPink; - name = "Catppuccin-Macchiato-Pink-Cursors"; - size = 24; - }; - - config = mkIf cfg.enable { - os = { - programs.hyprland = { - enable = true; - inherit (cfg) package; - }; - xdg.portal.wlr.enable = lib.mkForce false; + config = let + cursor = { + package = pkgs.catppuccin-cursors.macchiatoPink; + name = "Catppuccin-Macchiato-Pink-Cursors"; + size = 24; + }; + in { + programs.hyprland = { + enable = true; + inherit (cfg) package; }; + xdg.portal.wlr.enable = lib.mkForce false; home.packages = with pkgs; with inputs.hyprcontrib.packages.${pkgs.system}; @@ -187,7 +185,7 @@ in { }; }; - home.xdg.configFile."hypr/hyprpaper.conf".text = '' + xdg.configFile."hypr/hyprpaper.conf".text = '' preload=${cfg.monitors.main.wallpaper} ${ if cfg.monitors.secondary.wallpaper != null diff --git a/parts/home_configs.nix b/parts/home_configs.nix index bd5971c..6a0f419 100644 --- a/parts/home_configs.nix +++ b/parts/home_configs.nix @@ -100,6 +100,7 @@ in { {systemd.user.startServices = "legacy";} inputs.sops-nix.homeManagerModules.sops inputs.catppuccin.homeManagerModules.catppuccin + inputs.hyprland.homeManagerModules.default ] ++ config.modules ++ builtins.attrValues self.homeModules