From 3151b79560915ba96920ecda4f6752bd6561692c Mon Sep 17 00:00:00 2001 From: liv Date: Wed, 21 Aug 2024 15:55:14 +0200 Subject: [PATCH] remake dir structure for home-manager --- home/enoko.nix | 2 +- home/{common => features}/cli/default.nix | 2 ++ home/{common => features}/cli/direnv.nix | 0 home/{common => features}/cli/fish.nix | 0 home/{common => features}/cli/lazygit.nix | 0 home/{common/universal => features/cli}/mise.nix | 0 home/{common => features}/cli/neovim.nix | 0 home/{common => features}/desktop/1password.nix | 0 home/{common => features}/desktop/alacritty.nix | 0 home/{common => features}/desktop/default.nix | 0 home/{common => features}/desktop/firefox.nix | 0 home/{common => features}/desktop/font.nix | 0 home/{ => features}/desktop/games/default.nix | 0 home/{common => features}/desktop/gtk.nix | 0 home/{ => features}/desktop/hyprland/default.nix | 4 ++-- home/{ => features}/desktop/hyprland/swayidle.nix | 0 home/{ => features}/desktop/hyprland/swaylock.nix | 0 home/{common => features}/desktop/vscode.nix | 0 home/{common => features}/desktop/wlr/default.nix | 0 home/{common => features}/desktop/wlr/mako.nix | 0 home/{common => features}/desktop/wlr/waybar.nix | 0 home/{common => features}/desktop/wlr/wofi.nix | 0 home/{common/universal => features/devel}/default.nix | 2 -- home/{common/universal => features/devel}/php.nix | 0 home/global.nix | 4 ++-- home/yukari.nix | 4 ++-- 26 files changed, 9 insertions(+), 9 deletions(-) rename home/{common => features}/cli/default.nix (81%) rename home/{common => features}/cli/direnv.nix (100%) rename home/{common => features}/cli/fish.nix (100%) rename home/{common => features}/cli/lazygit.nix (100%) rename home/{common/universal => features/cli}/mise.nix (100%) rename home/{common => features}/cli/neovim.nix (100%) rename home/{common => features}/desktop/1password.nix (100%) rename home/{common => features}/desktop/alacritty.nix (100%) rename home/{common => features}/desktop/default.nix (100%) rename home/{common => features}/desktop/firefox.nix (100%) rename home/{common => features}/desktop/font.nix (100%) rename home/{ => features}/desktop/games/default.nix (100%) rename home/{common => features}/desktop/gtk.nix (100%) rename home/{ => features}/desktop/hyprland/default.nix (99%) rename home/{ => features}/desktop/hyprland/swayidle.nix (100%) rename home/{ => features}/desktop/hyprland/swaylock.nix (100%) rename home/{common => features}/desktop/vscode.nix (100%) rename home/{common => features}/desktop/wlr/default.nix (100%) rename home/{common => features}/desktop/wlr/mako.nix (100%) rename home/{common => features}/desktop/wlr/waybar.nix (100%) rename home/{common => features}/desktop/wlr/wofi.nix (100%) rename home/{common/universal => features/devel}/default.nix (59%) rename home/{common/universal => features/devel}/php.nix (100%) diff --git a/home/enoko.nix b/home/enoko.nix index 7f7650f..90d560e 100644 --- a/home/enoko.nix +++ b/home/enoko.nix @@ -3,7 +3,7 @@ { imports = [ ./global.nix - ./common/desktop + ./features/desktop ]; config.monitors = [ diff --git a/home/common/cli/default.nix b/home/features/cli/default.nix similarity index 81% rename from home/common/cli/default.nix rename to home/features/cli/default.nix index c0981c0..621dbef 100644 --- a/home/common/cli/default.nix +++ b/home/features/cli/default.nix @@ -6,8 +6,10 @@ ./neovim.nix # neovim configuration, my "escape" editor ./lazygit.nix # my preferred git porcellain ./direnv.nix # smart cding + ./mise.nix # version management for tools ]; + # stuff that doesn't fit into any other files home.packages = with pkgs; [ comma # nix-shell a package by prefixing it with `,` ripgrep # well, it's grep diff --git a/home/common/cli/direnv.nix b/home/features/cli/direnv.nix similarity index 100% rename from home/common/cli/direnv.nix rename to home/features/cli/direnv.nix diff --git a/home/common/cli/fish.nix b/home/features/cli/fish.nix similarity index 100% rename from home/common/cli/fish.nix rename to home/features/cli/fish.nix diff --git a/home/common/cli/lazygit.nix b/home/features/cli/lazygit.nix similarity index 100% rename from home/common/cli/lazygit.nix rename to home/features/cli/lazygit.nix diff --git a/home/common/universal/mise.nix b/home/features/cli/mise.nix similarity index 100% rename from home/common/universal/mise.nix rename to home/features/cli/mise.nix diff --git a/home/common/cli/neovim.nix b/home/features/cli/neovim.nix similarity index 100% rename from home/common/cli/neovim.nix rename to home/features/cli/neovim.nix diff --git a/home/common/desktop/1password.nix b/home/features/desktop/1password.nix similarity index 100% rename from home/common/desktop/1password.nix rename to home/features/desktop/1password.nix diff --git a/home/common/desktop/alacritty.nix b/home/features/desktop/alacritty.nix similarity index 100% rename from home/common/desktop/alacritty.nix rename to home/features/desktop/alacritty.nix diff --git a/home/common/desktop/default.nix b/home/features/desktop/default.nix similarity index 100% rename from home/common/desktop/default.nix rename to home/features/desktop/default.nix diff --git a/home/common/desktop/firefox.nix b/home/features/desktop/firefox.nix similarity index 100% rename from home/common/desktop/firefox.nix rename to home/features/desktop/firefox.nix diff --git a/home/common/desktop/font.nix b/home/features/desktop/font.nix similarity index 100% rename from home/common/desktop/font.nix rename to home/features/desktop/font.nix diff --git a/home/desktop/games/default.nix b/home/features/desktop/games/default.nix similarity index 100% rename from home/desktop/games/default.nix rename to home/features/desktop/games/default.nix diff --git a/home/common/desktop/gtk.nix b/home/features/desktop/gtk.nix similarity index 100% rename from home/common/desktop/gtk.nix rename to home/features/desktop/gtk.nix diff --git a/home/desktop/hyprland/default.nix b/home/features/desktop/hyprland/default.nix similarity index 99% rename from home/desktop/hyprland/default.nix rename to home/features/desktop/hyprland/default.nix index 0d10275..639a955 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/features/desktop/hyprland/default.nix @@ -6,8 +6,8 @@ }: { imports = [ - ../../common/desktop - ../../common/desktop/wlr + ../default.nix + ../wlr ./swaylock.nix ./swayidle.nix ]; diff --git a/home/desktop/hyprland/swayidle.nix b/home/features/desktop/hyprland/swayidle.nix similarity index 100% rename from home/desktop/hyprland/swayidle.nix rename to home/features/desktop/hyprland/swayidle.nix diff --git a/home/desktop/hyprland/swaylock.nix b/home/features/desktop/hyprland/swaylock.nix similarity index 100% rename from home/desktop/hyprland/swaylock.nix rename to home/features/desktop/hyprland/swaylock.nix diff --git a/home/common/desktop/vscode.nix b/home/features/desktop/vscode.nix similarity index 100% rename from home/common/desktop/vscode.nix rename to home/features/desktop/vscode.nix diff --git a/home/common/desktop/wlr/default.nix b/home/features/desktop/wlr/default.nix similarity index 100% rename from home/common/desktop/wlr/default.nix rename to home/features/desktop/wlr/default.nix diff --git a/home/common/desktop/wlr/mako.nix b/home/features/desktop/wlr/mako.nix similarity index 100% rename from home/common/desktop/wlr/mako.nix rename to home/features/desktop/wlr/mako.nix diff --git a/home/common/desktop/wlr/waybar.nix b/home/features/desktop/wlr/waybar.nix similarity index 100% rename from home/common/desktop/wlr/waybar.nix rename to home/features/desktop/wlr/waybar.nix diff --git a/home/common/desktop/wlr/wofi.nix b/home/features/desktop/wlr/wofi.nix similarity index 100% rename from home/common/desktop/wlr/wofi.nix rename to home/features/desktop/wlr/wofi.nix diff --git a/home/common/universal/default.nix b/home/features/devel/default.nix similarity index 59% rename from home/common/universal/default.nix rename to home/features/devel/default.nix index 6d1187b..26d15a8 100644 --- a/home/common/universal/default.nix +++ b/home/features/devel/default.nix @@ -1,12 +1,10 @@ { pkgs, ... }: { imports = [ - ./mise.nix ./php.nix ]; home.packages = with pkgs; [ - # some base packages for development, without which nothing would really work gcc gnumake unzip diff --git a/home/common/universal/php.nix b/home/features/devel/php.nix similarity index 100% rename from home/common/universal/php.nix rename to home/features/devel/php.nix diff --git a/home/global.nix b/home/global.nix index 66afb75..df2aa5b 100644 --- a/home/global.nix +++ b/home/global.nix @@ -10,8 +10,8 @@ imports = [ inputs.nix-index-database.hmModules.nix-index inputs.stylix.homeManagerModules.stylix - ./common/cli - ./common/universal + ./features/cli + ./features/devel ] ++ (builtins.attrValues outputs.homeManagerModules); nixpkgs = { diff --git a/home/yukari.nix b/home/yukari.nix index a5a2898..0a92fb9 100644 --- a/home/yukari.nix +++ b/home/yukari.nix @@ -3,8 +3,8 @@ { imports = [ ./global.nix - ./desktop/hyprland - ./desktop/games + ./features/desktop/hyprland + ./features/desktop/games ]; # ---------- ------