From 877ce570bf84cbeca398a22aaacf3d39d62b7d35 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 16 Jun 2023 12:12:34 -0400 Subject: [PATCH] meta: Move home modules up one directory This is possible since each home-manager module is now its own self-contained nix file. --- home/default.nix | 32 +++++++++---------- home/{dunst/default.nix => dunst.nix} | 0 home/{feh/default.nix => feh.nix} | 0 home/{git/default.nix => git.nix} | 2 +- home/{gpg/default.nix => gpg.nix} | 0 home/{joshuto/default.nix => joshuto.nix} | 0 home/{kitty/default.nix => kitty.nix} | 2 +- home/{mime-apps/default.nix => mime-apps.nix} | 2 +- home/{mpv/default.nix => mpv.nix} | 0 home/{ncmpcpp/default.nix => ncmpcpp.nix} | 2 +- home/{neovim/default.nix => neovim.nix} | 0 .../default.nix => qutebrowser.nix} | 0 home/{rofi/default.nix => rofi.nix} | 0 home/{waybar/default.nix => waybar.nix} | 0 home/{waycorner/default.nix => waycorner.nix} | 0 .../default.nix => xdg-user-dirs.nix} | 2 +- home/{zathura/default.nix => zathura.nix} | 0 17 files changed, 21 insertions(+), 21 deletions(-) rename home/{dunst/default.nix => dunst.nix} (100%) rename home/{feh/default.nix => feh.nix} (100%) rename home/{git/default.nix => git.nix} (95%) rename home/{gpg/default.nix => gpg.nix} (100%) rename home/{joshuto/default.nix => joshuto.nix} (100%) rename home/{kitty/default.nix => kitty.nix} (91%) rename home/{mime-apps/default.nix => mime-apps.nix} (90%) rename home/{mpv/default.nix => mpv.nix} (100%) rename home/{ncmpcpp/default.nix => ncmpcpp.nix} (98%) rename home/{neovim/default.nix => neovim.nix} (100%) rename home/{qutebrowser/default.nix => qutebrowser.nix} (100%) rename home/{rofi/default.nix => rofi.nix} (100%) rename home/{waybar/default.nix => waybar.nix} (100%) rename home/{waycorner/default.nix => waycorner.nix} (100%) rename home/{xdg-user-dirs/default.nix => xdg-user-dirs.nix} (89%) rename home/{zathura/default.nix => zathura.nix} (100%) diff --git a/home/default.nix b/home/default.nix index 162615dc..a349e05a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,20 +1,20 @@ { home-manager.sharedModules = [ - ./dunst - ./feh - ./git - ./gpg - ./joshuto - ./kitty - ./mime-apps - ./mpv - ./ncmpcpp - ./neovim - ./qutebrowser - ./rofi - ./waybar - ./waycorner - ./xdg-user-dirs - ./zathura + ./dunst.nix + ./feh.nix + ./git.nix + ./gpg.nix + ./joshuto.nix + ./kitty.nix + ./mime-apps.nix + ./mpv.nix + ./ncmpcpp.nix + ./neovim.nix + ./qutebrowser.nix + ./rofi.nix + ./waybar.nix + ./waycorner.nix + ./xdg-user-dirs.nix + ./zathura.nix ]; } diff --git a/home/dunst/default.nix b/home/dunst.nix similarity index 100% rename from home/dunst/default.nix rename to home/dunst.nix diff --git a/home/feh/default.nix b/home/feh.nix similarity index 100% rename from home/feh/default.nix rename to home/feh.nix diff --git a/home/git/default.nix b/home/git.nix similarity index 95% rename from home/git/default.nix rename to home/git.nix index 242a545a..5fca4833 100644 --- a/home/git/default.nix +++ b/home/git.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -let VARIABLES = import ../../src/variables.nix; in { +let VARIABLES = import ../src/variables.nix; in { home.packages = with pkgs; [ tig ]; xdg.configFile."tig/config".text = '' diff --git a/home/gpg/default.nix b/home/gpg.nix similarity index 100% rename from home/gpg/default.nix rename to home/gpg.nix diff --git a/home/joshuto/default.nix b/home/joshuto.nix similarity index 100% rename from home/joshuto/default.nix rename to home/joshuto.nix diff --git a/home/kitty/default.nix b/home/kitty.nix similarity index 91% rename from home/kitty/default.nix rename to home/kitty.nix index 56ddfb43..5c1e5e59 100644 --- a/home/kitty/default.nix +++ b/home/kitty.nix @@ -1,4 +1,4 @@ -let VARIABLES = import ../../src/variables.nix; in { +let VARIABLES = import ../src/variables.nix; in { programs.kitty = { enable = true; diff --git a/home/mime-apps/default.nix b/home/mime-apps.nix similarity index 90% rename from home/mime-apps/default.nix rename to home/mime-apps.nix index a9b8c611..dc74c27a 100644 --- a/home/mime-apps/default.nix +++ b/home/mime-apps.nix @@ -1,4 +1,4 @@ -let VARIABLES = import ../../src/variables.nix; in { +let VARIABLES = import ../src/variables.nix; in { xdg.mimeApps = { enable = true; diff --git a/home/mpv/default.nix b/home/mpv.nix similarity index 100% rename from home/mpv/default.nix rename to home/mpv.nix diff --git a/home/ncmpcpp/default.nix b/home/ncmpcpp.nix similarity index 98% rename from home/ncmpcpp/default.nix rename to home/ncmpcpp.nix index 8c427b54..d5fa9965 100644 --- a/home/ncmpcpp/default.nix +++ b/home/ncmpcpp.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -let VARIABLES = import ../../src/variables.nix; in { +let VARIABLES = import ../src/variables.nix; in { home.packages = with pkgs; [ mpc-cli ]; services.mpd = { diff --git a/home/neovim/default.nix b/home/neovim.nix similarity index 100% rename from home/neovim/default.nix rename to home/neovim.nix diff --git a/home/qutebrowser/default.nix b/home/qutebrowser.nix similarity index 100% rename from home/qutebrowser/default.nix rename to home/qutebrowser.nix diff --git a/home/rofi/default.nix b/home/rofi.nix similarity index 100% rename from home/rofi/default.nix rename to home/rofi.nix diff --git a/home/waybar/default.nix b/home/waybar.nix similarity index 100% rename from home/waybar/default.nix rename to home/waybar.nix diff --git a/home/waycorner/default.nix b/home/waycorner.nix similarity index 100% rename from home/waycorner/default.nix rename to home/waycorner.nix diff --git a/home/xdg-user-dirs/default.nix b/home/xdg-user-dirs.nix similarity index 89% rename from home/xdg-user-dirs/default.nix rename to home/xdg-user-dirs.nix index 86479ca8..10097079 100644 --- a/home/xdg-user-dirs/default.nix +++ b/home/xdg-user-dirs.nix @@ -1,4 +1,4 @@ -let VARIABLES = import ../../src/variables.nix; in { +let VARIABLES = import ../src/variables.nix; in { xdg.userDirs = { enable = true; diff --git a/home/zathura/default.nix b/home/zathura.nix similarity index 100% rename from home/zathura/default.nix rename to home/zathura.nix