From f4950404784072fb09fd8059718087e6cc315671 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 9 Apr 2023 18:08:27 +0200 Subject: [PATCH] removed hyprland input --- flake.lock | 176 ++++---------------- flake.nix | 4 +- nixos/hosts/thalassa/null/home/hyprland.nix | 4 - nixos/util.nix | 4 +- 4 files changed, 40 insertions(+), 148 deletions(-) diff --git a/flake.lock b/flake.lock index 13c1655..2e76ad8 100644 --- a/flake.lock +++ b/flake.lock @@ -495,51 +495,9 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_3", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1680901308, - "narHash": "sha256-XtJm2VMTx3PW5AoxR35ExvUwmt5uvYnxfS9OVgcFE/0=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "10b9e9bbe5fc71c5d7617776927c22db1167b10b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprpaper": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1680695861, @@ -656,7 +614,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -821,22 +779,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1670507980, - "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2787fc7d1e51404678614bf0fe92fc296746eec0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1680668850, @@ -870,22 +812,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1674641431, "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", @@ -901,13 +827,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1680758185, - "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", "type": "github" }, "original": { @@ -917,7 +843,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1680669251, "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", @@ -933,7 +859,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1672580127, "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", @@ -949,7 +875,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -965,7 +891,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -979,19 +905,35 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1670507980, + "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2787fc7d1e51404678614bf0fe92fc296746eec0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "beautysh": "beautysh", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1680899977, - "narHash": "sha256-7LwE/ZnVZZriDG9vi54jUimSL+F0xsA8TNrLqcYOjus=", + "lastModified": 1680988170, + "narHash": "sha256-QCl2A80m3p/lkRCO9C/PipdkV9I1mbqhnFftjoY4dQ8=", "owner": "pta2002", "repo": "nixvim", - "rev": "5d2dbc40a6fc4ad524e4f13923188ec2b420864b", + "rev": "b6706fa0ec59f37b35bd4c6f3f3be0011bf14964", "type": "github" }, "original": { @@ -1002,11 +944,11 @@ }, "nur": { "locked": { - "lastModified": 1680896721, - "narHash": "sha256-qYb1Au/XFn4vMWfVP3N9cHzja/3FHbgXl3Fnpk4KWS0=", + "lastModified": 1681055105, + "narHash": "sha256-HETUDbn1DpeeLwV5lND1j72jI9nb0S3ax61iz6IGNO4=", "owner": "nix-community", "repo": "NUR", - "rev": "55e5553c3a67720961d8be737e65b0b05e6ffab6", + "rev": "fb7b8b11eef494b17fdfdb6a298768f1be02ddcf", "type": "github" }, "original": { @@ -1115,7 +1057,7 @@ "inputs": { "fenix": "fenix", "naersk": "naersk_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1677774593, @@ -1136,12 +1078,11 @@ "colmena": "colmena", "comma": "comma", "home-manager": "home-manager", - "hyprland": "hyprland", "hyprpaper": "hyprpaper", "mailserver": "mailserver", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs_22-11": "nixpkgs_22-11", "nixvim": "nixvim", "nur": "nur", @@ -1265,7 +1206,7 @@ "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_4", "nix": "nix", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1679628347, @@ -1284,7 +1225,7 @@ "webcord": { "inputs": { "dream2nix": "dream2nix", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "webcord": "webcord_2" }, "locked": { @@ -1316,49 +1257,6 @@ "repo": "WebCord", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1680810405, - "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3da5891..99fd58c 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; riff.url = "github:DeterminateSystems/riff"; @@ -42,7 +41,7 @@ }; outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena, home-manager - , hyprpaper, hyprland, nixos-generators, nixos-hardware, nur, ... }@inputs: + , hyprpaper, nixos-generators, nixos-hardware, nur, ... }@inputs: let inherit (nixpkgs) lib; @@ -62,7 +61,6 @@ (import ./nixos/pkgs) vault-secrets.overlay hyprpaper.overlays.default - hyprland.overlays.default nur.overlay ]; }; diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix index 75e7bf8..7329a2f 100644 --- a/nixos/hosts/thalassa/null/home/hyprland.nix +++ b/nixos/hosts/thalassa/null/home/hyprland.nix @@ -5,10 +5,6 @@ wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png ''; - imports = [ - inputs.hyprland.homeManagerModules.default - ]; - wayland.windowManager.hyprland = let startup-script = pkgs.writeScriptBin "startup" '' #!${pkgs.stdenv.shell} diff --git a/nixos/util.nix b/nixos/util.nix index 19c9dfe..789976f 100644 --- a/nixos/util.nix +++ b/nixos/util.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, hyprland, mailserver, ... }: +{ nixpkgs, home-manager, mailserver, ... }: let inherit (builtins) filter attrValues concatMap mapAttrs; inherit (nixpkgs.lib.attrsets) mapAttrsToList; @@ -11,7 +11,7 @@ let ./common/generic-lxc.nix ]; "vm" = [ ./common/generic-vm.nix ]; - "local" = [ hyprland.nixosModules.default ]; + "local" = [ ]; }; in { hostname, realm, profile ? hostname, type ? "lxc", ... }: [