diff --git a/configuration.nix b/configuration.nix index 6a077bf..da70df3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -14,11 +14,9 @@ cores = 6; auto-optimise-store = true; substituters = [ - "https://hyprland.cachix.org" "https://cache.thalheim.io" ]; trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "cache.thalheim.io-1:R7msbosLEZKrxk/lKxf9BTjOOH7Ax3H0Qj0/6wiHOgc=" ]; experimental-features = ["nix-command" "flakes"]; @@ -104,7 +102,6 @@ home-manager = { extraSpecialArgs = {inherit pkgs lib;}; sharedModules = [ - inputs.hyprland.homeManagerModules.default inputs.nix-colors.homeManagerModule inputs.sops-nix.homeManagerModule ]; diff --git a/flake.lock b/flake.lock index d7ba090..dc0c983 100644 --- a/flake.lock +++ b/flake.lock @@ -124,22 +124,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -193,7 +177,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -211,7 +195,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -264,200 +248,10 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems_2", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1714757880, - "narHash": "sha256-iqpS67giqeDWw4yB1XzqpT/pQ0GlN1t8bl6I1SNTc5k=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "1d2acbe19355c8640d54a4b6cba225c6f4370c85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-contrib": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713780596, - "narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=", - "owner": "hyprwm", - "repo": "contrib", - "rev": "110e6dc761d5c3d352574def3479a9c39dfc4358", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "contrib", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprpaper": { - "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1714339536, - "narHash": "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA=", - "owner": "hyprwm", - "repo": "hyprpaper", - "rev": "d50f0eda6cb9be2a8419af21792195e54b285631", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpaper", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nil": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { @@ -497,7 +291,7 @@ "inputs": { "flake-parts": "flake-parts", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1714622771, @@ -515,16 +309,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", + "lastModified": 1714314149, + "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -594,38 +388,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1714562304, "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", @@ -641,7 +403,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1714531828, "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", @@ -684,17 +446,13 @@ "alejandra": "alejandra", "distro-grub-themes": "distro-grub-themes", "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprland-contrib": "hyprland-contrib", - "hyprpaper": "hyprpaper", "nil": "nil", "nix-colors": "nix-colors", "nixd": "nixd", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "rofi-jetbrains": "rofi-jetbrains", - "sops-nix": "sops-nix", - "waybar": "waybar" + "sops-nix": "sops-nix" } }, "rust-analyzer-src": { @@ -794,51 +552,6 @@ } }, "systems_2": { - "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_3": { - "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_4": { - "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_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -853,7 +566,7 @@ "type": "github" } }, - "systems_6": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -867,77 +580,6 @@ "repo": "default", "type": "github" } - }, - "waybar": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1714718861, - "narHash": "sha256-mCQdrn0Y3oOVZP/CileWAhuBX6aARBNrfxyqJBB4NxA=", - "owner": "Alexays", - "repo": "Waybar", - "rev": "231d6972d7a023e9358ab7deda509baac49006cb", - "type": "github" - }, - "original": { - "owner": "Alexays", - "repo": "Waybar", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d23e73a..fcf7c8a 100644 --- a/flake.nix +++ b/flake.nix @@ -16,18 +16,6 @@ url = "github:kamadorueda/alejandra/3.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland-contrib = { - url = "github:hyprwm/contrib"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprpaper = { - url = "github:hyprwm/hyprpaper"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - waybar = { - url = "github:Alexays/Waybar"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; sops-nix = { url = "github:Mic92/sops-nix/yubikey-support"; inputs.nixpkgs.follows = "nixpkgs"; @@ -40,7 +28,6 @@ url = "github:zakuciael/rofi-jetbrains"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; nixd.url = "github:nix-community/nixd"; nil.url = "github:oxalica/nil"; nix-colors.url = "github:misterio77/nix-colors"; @@ -76,19 +63,12 @@ nil = flakeInputs.nil.packages.${system}; nixd = flakeInputs.nixd.packages.${system}; alejandra = flakeInputs.alejandra.packages.${system}; - hyprland-contrib = flakeInputs.hyprland-contrib.packages.${system}; - hyprpaper = flakeInputs.hyprpaper.packages.${system}; rofi-jetbrains = flakeInputs.rofi-jetbrains.packages.${system}; age-plugin-op = flakeInputs.age-plugin-op.packages.${system} // { default = flakeInputs.age-plugin-op.packages.${system}.age-plugin-op; }; - hyprland = - flakeInputs.hyprland - // { - packages = flakeInputs.hyprland.packages.${system}; - }; }; lib = nixpkgs.lib.extend (self: super: { diff --git a/modules/desktop/apps/grimblast.nix b/modules/desktop/apps/grimblast.nix index d6f1cc4..3742d0a 100644 --- a/modules/desktop/apps/grimblast.nix +++ b/modules/desktop/apps/grimblast.nix @@ -1,16 +1,14 @@ { - inputs, + pkgs, username, ... }: { # Add keybinds to Hyprland home-manager.users.${username} = { - home.packages = [ - inputs.hyprland-contrib.grimblast - ]; + home.packages = with pkgs; [grimblast]; wayland.windowManager.hyprland.settings.bind = let - grimblastExec = "${inputs.hyprland-contrib.grimblast}/bin/grimblast --notify"; + grimblastExec = "${pkgs.grimblast}/bin/grimblast --notify"; in [ # Screenshot entire monitor ", Print, exec, ${grimblastExec} copy output" # Copy to clipboard diff --git a/modules/desktop/apps/waybar.nix b/modules/desktop/apps/waybar.nix index dfd92ec..b5039d4 100644 --- a/modules/desktop/apps/waybar.nix +++ b/modules/desktop/apps/waybar.nix @@ -1,14 +1,13 @@ { lib, pkgs, - unstable, username, desktop, colorScheme, ... }: with lib; let - package = unstable.waybar; + package = pkgs.waybar; in { # TODO: Add priority for waybar, so it starts before any other app modules.desktop.wm.${desktop}.autostartPrograms = [ diff --git a/modules/desktop/wm/hyprland.nix b/modules/desktop/wm/hyprland.nix index 2801496..bc0a635 100644 --- a/modules/desktop/wm/hyprland.nix +++ b/modules/desktop/wm/hyprland.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs, username, scripts, ... @@ -35,7 +34,6 @@ in }: { programs.hyprland = { enable = true; - package = inputs.hyprland.packages.hyprland; xwayland.enable = true; }; @@ -48,6 +46,7 @@ in wayland.windowManager.hyprland = { enable = true; + xwayland.enable = true; settings = { # Autostart script diff --git a/modules/services/wallpaper.nix b/modules/services/wallpaper.nix index 1a5a119..1131074 100644 --- a/modules/services/wallpaper.nix +++ b/modules/services/wallpaper.nix @@ -1,7 +1,7 @@ { config, lib, - inputs, + pkgs, username, ... }: @@ -62,7 +62,7 @@ in { X-Restart-Triggers = ["${home.xdg.configFile."hypr/hyprpaper.conf".source}"]; }; Service = { - ExecStart = "${getExe inputs.hyprpaper.default}"; + ExecStart = "${getExe pkgs.hyprpaper}"; Restart = "always"; RestartSec = "10"; }; diff --git a/overlays/waybar.nix b/overlays/waybar.nix deleted file mode 100644 index e77fca5..0000000 --- a/overlays/waybar.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - lib, - inputs, - ... -}: -with lib; { - unstable = singleton inputs.waybar.overlays.default; -} diff --git a/scripts/rofi/powermenu.nix b/scripts/rofi/powermenu.nix index 5cad875..ca87ed5 100644 --- a/scripts/rofi/powermenu.nix +++ b/scripts/rofi/powermenu.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, username, ... }: { @@ -13,7 +12,7 @@ mpc-cli alsa-utils bspwm - inputs.hyprland + hyprland ]; text = '' # CMDs