diff options
| -rw-r--r-- | flake.lock | 221 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 1 | ||||
| -rw-r--r-- | sys/desktop/hyprland/default.nix | 8 | ||||
| -rw-r--r-- | users/sils/hyprland/default.nix | 3 |
5 files changed, 7 insertions, 232 deletions
diff --git a/flake.lock b/flake.lock index 9a12766..fc98c49 100644 --- a/flake.lock +++ b/flake.lock @@ -143,7 +143,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -199,131 +199,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": "hyprlang", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1711466786, - "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs", - "systems": [ - "systems" - ], - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1711644240, - "narHash": "sha256-QhaQ/wcCk6D5YyG85Bg6hON076mpcVKIfKrL/5iwdAE=", - "owner": "hyprwm", - "repo": "hyprland", - "rev": "d8429eebc66e7091381502edc0fc7335790f62e4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland", - "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", - "hyprcursor", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -438,13 +313,13 @@ "locked": { "lastModified": 1711523803, "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", - "owner": "NixOS", + "owner": "NixOs", "repo": "nixpkgs", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "NixOs", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -484,22 +359,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", - "owner": "NixOs", - "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", - "type": "github" - }, - "original": { - "owner": "NixOs", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -639,13 +498,12 @@ "flake-utils": "flake-utils", "gitignore": "gitignore", "home-manager": "home-manager", - "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "libnbtplusplus": "libnbtplusplus", "nix-darwin": "nix-darwin", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", @@ -654,7 +512,7 @@ "ragenix": "ragenix", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", - "systems": "systems_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix", "wl-togglescreens": "wl-togglescreens" } @@ -707,21 +565,6 @@ }, "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=", "owner": "nix-systems", @@ -735,7 +578,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1700773236, "narHash": "sha256-yW1VEbKEYQwZfPKaHCORAS8JU08wQMKzPFkvXyDI/D8=", @@ -790,58 +633,6 @@ "type": "git", "url": "https://git.project-insanity.org/onny/wl-togglescreens.git" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e41fe15..1d9ae13 100644 --- a/flake.nix +++ b/flake.nix @@ -142,10 +142,6 @@ url = "git+https://git.project-insanity.org/onny/wl-togglescreens.git?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/hyprland"; - inputs.systems.follows = "systems"; - }; }; #}}} outputs = { @@ -161,7 +157,6 @@ flake-utils, agenix, ragenix, - hyprland, ... } @ attrs: flake-utils.lib.eachDefaultSystem (system: let @@ -210,7 +205,6 @@ flake-utils agenix ragenix - hyprland ; }; }; diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 81f3f1c..e31513e 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -11,7 +11,6 @@ flake-utils, agenix, ragenix, - hyprland, } @ attrs: let defaultModules = [ impermanence.nixosModules.impermanence diff --git a/sys/desktop/hyprland/default.nix b/sys/desktop/hyprland/default.nix index 35a4565..08fd0c0 100644 --- a/sys/desktop/hyprland/default.nix +++ b/sys/desktop/hyprland/default.nix @@ -1,12 +1,6 @@ -{ - hyprland, - system, - ... -}: { +{system, ...}: { programs.hyprland = { enable = true; - #Unstable package, used if features aren't available fast enough. - #package = hyprland.packages.${system}.hyprland; xwayland.enable = true; }; } diff --git a/users/sils/hyprland/default.nix b/users/sils/hyprland/default.nix index 4a359e2..03a5ce7 100644 --- a/users/sils/hyprland/default.nix +++ b/users/sils/hyprland/default.nix @@ -1,13 +1,10 @@ { pkgs, - hyprland, system, ... }: { wayland.windowManager.hyprland = { enable = true; - #Unstable package, used if features aren't available fast enough. - #package = hyprland.packages.${system}.hyprland; settings = { # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = ",preferred,auto,auto"; |