From 7bcb8a58079944396dd96c515a69608f82c21de7 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 18 May 2023 15:54:15 -0400 Subject: [PATCH] Split modules based on function --- applications/default.nix | 12 ++++++++++++ {feh => applications/feh}/default.nix | 0 {kitty => applications/kitty}/default.nix | 0 {librewolf => applications/librewolf}/default.nix | 0 {mpv => applications/mpv}/default.nix | 0 {piper => applications/piper}/default.nix | 0 .../qutebrowser}/default.nix | 0 {thunar => applications/thunar}/default.nix | 0 {zathura => applications/zathura}/default.nix | 0 common/default.nix | 9 +++++++++ {home-manager => common/home-manager}/default.nix | 0 {locale => common/locale}/default.nix | 0 {nix => common/nix}/default.nix | 0 {systemd => common/systemd}/default.nix | 0 {timezone => common/timezone}/default.nix | 0 desktop/default.nix | 14 ++++++++++++++ {dunst => desktop/dunst}/default.nix | 0 {fcitx5 => desktop/fcitx5}/default.nix | 0 {hyprland => desktop/hyprland}/default.nix | 0 {hyprland => desktop/hyprland}/swapmaster.sh | 0 {hyprland => desktop/hyprland}/tags.sh | 0 {mozc => desktop/mozc}/default.nix | 0 {rofi => desktop/rofi}/default.nix | 0 {rofi => desktop/rofi}/launchpad.rasi | 0 {swaylock => desktop/swaylock}/default.nix | 0 {waybar => desktop/waybar}/default.nix | 0 {xcursor => desktop/xcursor}/default.nix | 0 {xresources => desktop/xresources}/default.nix | 0 {xserver => desktop/xserver}/default.nix | 0 dev/default.nix | 5 +++++ {npm => dev/npm}/default.nix | 0 games/default.nix | 6 ++++++ {osu => games/osu}/default.nix | 0 {srb2 => games/srb2}/default.nix | 0 {srb2 => games/srb2}/package/default.nix | 0 {bat => terminal/bat}/default.nix | 0 terminal/default.nix | 13 +++++++++++++ {fish => terminal/fish}/default.nix | 0 {git => terminal/git}/default.nix | 0 {htop => terminal/htop}/default.nix | 0 {ncmpcpp => terminal/ncmpcpp}/default.nix | 0 {neovim => terminal/neovim}/default.nix | 0 {ranger => terminal/ranger}/default.nix | 0 {starship => terminal/starship}/default.nix | 0 {tig => terminal/tig}/default.nix | 0 45 files changed, 59 insertions(+) create mode 100644 applications/default.nix rename {feh => applications/feh}/default.nix (100%) rename {kitty => applications/kitty}/default.nix (100%) rename {librewolf => applications/librewolf}/default.nix (100%) rename {mpv => applications/mpv}/default.nix (100%) rename {piper => applications/piper}/default.nix (100%) rename {qutebrowser => applications/qutebrowser}/default.nix (100%) rename {thunar => applications/thunar}/default.nix (100%) rename {zathura => applications/zathura}/default.nix (100%) create mode 100644 common/default.nix rename {home-manager => common/home-manager}/default.nix (100%) rename {locale => common/locale}/default.nix (100%) rename {nix => common/nix}/default.nix (100%) rename {systemd => common/systemd}/default.nix (100%) rename {timezone => common/timezone}/default.nix (100%) create mode 100644 desktop/default.nix rename {dunst => desktop/dunst}/default.nix (100%) rename {fcitx5 => desktop/fcitx5}/default.nix (100%) rename {hyprland => desktop/hyprland}/default.nix (100%) rename {hyprland => desktop/hyprland}/swapmaster.sh (100%) rename {hyprland => desktop/hyprland}/tags.sh (100%) rename {mozc => desktop/mozc}/default.nix (100%) rename {rofi => desktop/rofi}/default.nix (100%) rename {rofi => desktop/rofi}/launchpad.rasi (100%) rename {swaylock => desktop/swaylock}/default.nix (100%) rename {waybar => desktop/waybar}/default.nix (100%) rename {xcursor => desktop/xcursor}/default.nix (100%) rename {xresources => desktop/xresources}/default.nix (100%) rename {xserver => desktop/xserver}/default.nix (100%) create mode 100644 dev/default.nix rename {npm => dev/npm}/default.nix (100%) create mode 100644 games/default.nix rename {osu => games/osu}/default.nix (100%) rename {srb2 => games/srb2}/default.nix (100%) rename {srb2 => games/srb2}/package/default.nix (100%) rename {bat => terminal/bat}/default.nix (100%) create mode 100644 terminal/default.nix rename {fish => terminal/fish}/default.nix (100%) rename {git => terminal/git}/default.nix (100%) rename {htop => terminal/htop}/default.nix (100%) rename {ncmpcpp => terminal/ncmpcpp}/default.nix (100%) rename {neovim => terminal/neovim}/default.nix (100%) rename {ranger => terminal/ranger}/default.nix (100%) rename {starship => terminal/starship}/default.nix (100%) rename {tig => terminal/tig}/default.nix (100%) diff --git a/applications/default.nix b/applications/default.nix new file mode 100644 index 00000000..26bac468 --- /dev/null +++ b/applications/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + ./feh + ./kitty + ./librewolf + ./mpv + ./piper + ./qutebrowser + ./thunar + ./zathura + ]; +} diff --git a/feh/default.nix b/applications/feh/default.nix similarity index 100% rename from feh/default.nix rename to applications/feh/default.nix diff --git a/kitty/default.nix b/applications/kitty/default.nix similarity index 100% rename from kitty/default.nix rename to applications/kitty/default.nix diff --git a/librewolf/default.nix b/applications/librewolf/default.nix similarity index 100% rename from librewolf/default.nix rename to applications/librewolf/default.nix diff --git a/mpv/default.nix b/applications/mpv/default.nix similarity index 100% rename from mpv/default.nix rename to applications/mpv/default.nix diff --git a/piper/default.nix b/applications/piper/default.nix similarity index 100% rename from piper/default.nix rename to applications/piper/default.nix diff --git a/qutebrowser/default.nix b/applications/qutebrowser/default.nix similarity index 100% rename from qutebrowser/default.nix rename to applications/qutebrowser/default.nix diff --git a/thunar/default.nix b/applications/thunar/default.nix similarity index 100% rename from thunar/default.nix rename to applications/thunar/default.nix diff --git a/zathura/default.nix b/applications/zathura/default.nix similarity index 100% rename from zathura/default.nix rename to applications/zathura/default.nix diff --git a/common/default.nix b/common/default.nix new file mode 100644 index 00000000..247f3e21 --- /dev/null +++ b/common/default.nix @@ -0,0 +1,9 @@ +{ + imports = [ + ./home-manager + ./locale + ./nix + ./systemd + ./timezone + ]; +} diff --git a/home-manager/default.nix b/common/home-manager/default.nix similarity index 100% rename from home-manager/default.nix rename to common/home-manager/default.nix diff --git a/locale/default.nix b/common/locale/default.nix similarity index 100% rename from locale/default.nix rename to common/locale/default.nix diff --git a/nix/default.nix b/common/nix/default.nix similarity index 100% rename from nix/default.nix rename to common/nix/default.nix diff --git a/systemd/default.nix b/common/systemd/default.nix similarity index 100% rename from systemd/default.nix rename to common/systemd/default.nix diff --git a/timezone/default.nix b/common/timezone/default.nix similarity index 100% rename from timezone/default.nix rename to common/timezone/default.nix diff --git a/desktop/default.nix b/desktop/default.nix new file mode 100644 index 00000000..52103787 --- /dev/null +++ b/desktop/default.nix @@ -0,0 +1,14 @@ +{ + imports = [ + ./dunst + ./fcitx5 + ./hyprland + ./mozc + ./rofi + ./swaylock + ./waybar + ./xcursor + ./xresources + ./xserver + ]; +} diff --git a/dunst/default.nix b/desktop/dunst/default.nix similarity index 100% rename from dunst/default.nix rename to desktop/dunst/default.nix diff --git a/fcitx5/default.nix b/desktop/fcitx5/default.nix similarity index 100% rename from fcitx5/default.nix rename to desktop/fcitx5/default.nix diff --git a/hyprland/default.nix b/desktop/hyprland/default.nix similarity index 100% rename from hyprland/default.nix rename to desktop/hyprland/default.nix diff --git a/hyprland/swapmaster.sh b/desktop/hyprland/swapmaster.sh similarity index 100% rename from hyprland/swapmaster.sh rename to desktop/hyprland/swapmaster.sh diff --git a/hyprland/tags.sh b/desktop/hyprland/tags.sh similarity index 100% rename from hyprland/tags.sh rename to desktop/hyprland/tags.sh diff --git a/mozc/default.nix b/desktop/mozc/default.nix similarity index 100% rename from mozc/default.nix rename to desktop/mozc/default.nix diff --git a/rofi/default.nix b/desktop/rofi/default.nix similarity index 100% rename from rofi/default.nix rename to desktop/rofi/default.nix diff --git a/rofi/launchpad.rasi b/desktop/rofi/launchpad.rasi similarity index 100% rename from rofi/launchpad.rasi rename to desktop/rofi/launchpad.rasi diff --git a/swaylock/default.nix b/desktop/swaylock/default.nix similarity index 100% rename from swaylock/default.nix rename to desktop/swaylock/default.nix diff --git a/waybar/default.nix b/desktop/waybar/default.nix similarity index 100% rename from waybar/default.nix rename to desktop/waybar/default.nix diff --git a/xcursor/default.nix b/desktop/xcursor/default.nix similarity index 100% rename from xcursor/default.nix rename to desktop/xcursor/default.nix diff --git a/xresources/default.nix b/desktop/xresources/default.nix similarity index 100% rename from xresources/default.nix rename to desktop/xresources/default.nix diff --git a/xserver/default.nix b/desktop/xserver/default.nix similarity index 100% rename from xserver/default.nix rename to desktop/xserver/default.nix diff --git a/dev/default.nix b/dev/default.nix new file mode 100644 index 00000000..93a1b74a --- /dev/null +++ b/dev/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./npm + ]; +} diff --git a/npm/default.nix b/dev/npm/default.nix similarity index 100% rename from npm/default.nix rename to dev/npm/default.nix diff --git a/games/default.nix b/games/default.nix new file mode 100644 index 00000000..aec915ef --- /dev/null +++ b/games/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./osu + ./srb2 + ]; +} diff --git a/osu/default.nix b/games/osu/default.nix similarity index 100% rename from osu/default.nix rename to games/osu/default.nix diff --git a/srb2/default.nix b/games/srb2/default.nix similarity index 100% rename from srb2/default.nix rename to games/srb2/default.nix diff --git a/srb2/package/default.nix b/games/srb2/package/default.nix similarity index 100% rename from srb2/package/default.nix rename to games/srb2/package/default.nix diff --git a/bat/default.nix b/terminal/bat/default.nix similarity index 100% rename from bat/default.nix rename to terminal/bat/default.nix diff --git a/terminal/default.nix b/terminal/default.nix new file mode 100644 index 00000000..1d674241 --- /dev/null +++ b/terminal/default.nix @@ -0,0 +1,13 @@ +{ + imports = [ + ./bat + ./fish + ./git + ./htop + ./ncmpcpp + ./neovim + ./ranger + ./starship + ./tig + ]; +} diff --git a/fish/default.nix b/terminal/fish/default.nix similarity index 100% rename from fish/default.nix rename to terminal/fish/default.nix diff --git a/git/default.nix b/terminal/git/default.nix similarity index 100% rename from git/default.nix rename to terminal/git/default.nix diff --git a/htop/default.nix b/terminal/htop/default.nix similarity index 100% rename from htop/default.nix rename to terminal/htop/default.nix diff --git a/ncmpcpp/default.nix b/terminal/ncmpcpp/default.nix similarity index 100% rename from ncmpcpp/default.nix rename to terminal/ncmpcpp/default.nix diff --git a/neovim/default.nix b/terminal/neovim/default.nix similarity index 100% rename from neovim/default.nix rename to terminal/neovim/default.nix diff --git a/ranger/default.nix b/terminal/ranger/default.nix similarity index 100% rename from ranger/default.nix rename to terminal/ranger/default.nix diff --git a/starship/default.nix b/terminal/starship/default.nix similarity index 100% rename from starship/default.nix rename to terminal/starship/default.nix diff --git a/tig/default.nix b/terminal/tig/default.nix similarity index 100% rename from tig/default.nix rename to terminal/tig/default.nix