From e3176e185846b5dd4b53089409e24a14777e70c5 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 17:54:57 +0200 Subject: [PATCH] Move hyprland files to host specific directories --- flake.nix | 2 +- .../graphical/hyprland/Lenni/default.nix | 9 +++++++++ .../hyprland/{ => Lenni}/hypridle.nix | 0 .../hyprland/{ => Lenni}/hyprlock.nix | 0 .../graphical/hyprland/{ => Lenni}/kanshi.nix | 0 .../graphical/hyprland/common/default.nix | 16 +++++++++++++++ .../hyprland/{ => common}/hyprland.nix | 0 .../hyprland/{ => common}/hyprpaper.nix | 0 .../graphical/hyprland/{ => common}/mako.nix | 0 .../hyprland/{ => common}/pipewire.nix | 0 .../hyprland/{ => common}/polkit.nix | 0 .../graphical/hyprland/{ => common}/utils.nix | 0 .../graphical/hyprland/{ => common}/wofi.nix | 0 users/willifan/graphical/hyprland/default.nix | 20 ++++--------------- 14 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 users/willifan/graphical/hyprland/Lenni/default.nix rename users/willifan/graphical/hyprland/{ => Lenni}/hypridle.nix (100%) rename users/willifan/graphical/hyprland/{ => Lenni}/hyprlock.nix (100%) rename users/willifan/graphical/hyprland/{ => Lenni}/kanshi.nix (100%) create mode 100644 users/willifan/graphical/hyprland/common/default.nix rename users/willifan/graphical/hyprland/{ => common}/hyprland.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/hyprpaper.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/mako.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/pipewire.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/polkit.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/utils.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/wofi.nix (100%) diff --git a/flake.nix b/flake.nix index f4072b3..0f53742 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; outputs = { self, nixpkgs, home-manager, disko, ... }@inputs: - let + let inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" diff --git a/users/willifan/graphical/hyprland/Lenni/default.nix b/users/willifan/graphical/hyprland/Lenni/default.nix new file mode 100644 index 0000000..274fc73 --- /dev/null +++ b/users/willifan/graphical/hyprland/Lenni/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + imports = [ + ./hypridle.nix + ./hyprlock.nix + ./kanshi.nix + ]; +} diff --git a/users/willifan/graphical/hyprland/hypridle.nix b/users/willifan/graphical/hyprland/Lenni/hypridle.nix similarity index 100% rename from users/willifan/graphical/hyprland/hypridle.nix rename to users/willifan/graphical/hyprland/Lenni/hypridle.nix diff --git a/users/willifan/graphical/hyprland/hyprlock.nix b/users/willifan/graphical/hyprland/Lenni/hyprlock.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprlock.nix rename to users/willifan/graphical/hyprland/Lenni/hyprlock.nix diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/Lenni/kanshi.nix similarity index 100% rename from users/willifan/graphical/hyprland/kanshi.nix rename to users/willifan/graphical/hyprland/Lenni/kanshi.nix diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/graphical/hyprland/common/default.nix new file mode 100644 index 0000000..0700cdd --- /dev/null +++ b/users/willifan/graphical/hyprland/common/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +{ + programs.hyprland.enable = true; + imports = [ + ./hyprland.nix + ./hyprpaper.nix + ./mako.nix + ./pipewire.nix + ./polkit.nix + ./utils.nix + ./wofi.nix + ]; + + +} diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/common/hyprland.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprland.nix rename to users/willifan/graphical/hyprland/common/hyprland.nix diff --git a/users/willifan/graphical/hyprland/hyprpaper.nix b/users/willifan/graphical/hyprland/common/hyprpaper.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprpaper.nix rename to users/willifan/graphical/hyprland/common/hyprpaper.nix diff --git a/users/willifan/graphical/hyprland/mako.nix b/users/willifan/graphical/hyprland/common/mako.nix similarity index 100% rename from users/willifan/graphical/hyprland/mako.nix rename to users/willifan/graphical/hyprland/common/mako.nix diff --git a/users/willifan/graphical/hyprland/pipewire.nix b/users/willifan/graphical/hyprland/common/pipewire.nix similarity index 100% rename from users/willifan/graphical/hyprland/pipewire.nix rename to users/willifan/graphical/hyprland/common/pipewire.nix diff --git a/users/willifan/graphical/hyprland/polkit.nix b/users/willifan/graphical/hyprland/common/polkit.nix similarity index 100% rename from users/willifan/graphical/hyprland/polkit.nix rename to users/willifan/graphical/hyprland/common/polkit.nix diff --git a/users/willifan/graphical/hyprland/utils.nix b/users/willifan/graphical/hyprland/common/utils.nix similarity index 100% rename from users/willifan/graphical/hyprland/utils.nix rename to users/willifan/graphical/hyprland/common/utils.nix diff --git a/users/willifan/graphical/hyprland/wofi.nix b/users/willifan/graphical/hyprland/common/wofi.nix similarity index 100% rename from users/willifan/graphical/hyprland/wofi.nix rename to users/willifan/graphical/hyprland/common/wofi.nix diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix index d7b6dfe..c7f8050 100644 --- a/users/willifan/graphical/hyprland/default.nix +++ b/users/willifan/graphical/hyprland/default.nix @@ -1,19 +1,7 @@ -{ pkgs, ... }: - +{ pkgs, configVars, ... }: { - programs.hyprland.enable = true; imports = [ - ./hypridle.nix - ./hyprland.nix - ./hyprlock.nix - ./hyprpaper.nix - ./kanshi.nix - ./mako.nix - ./pipewire.nix - ./polkit.nix - ./utils.nix - ./wofi.nix + ./common + ./${configVars.hostname} ]; - - -} +} \ No newline at end of file