From 9866cdfb42dbfe4d997d1371e096baf28ba74fdb Mon Sep 17 00:00:00 2001 From: joy Date: Thu, 10 Oct 2024 11:20:03 +0200 Subject: [PATCH] programs --- hosts/server/default.nix | 2 +- modules/default.nix | 4 ++-- modules/{apps => programs}/default.nix | 0 modules/{apps => programs}/home/alacritty/default.nix | 0 modules/{apps => programs}/home/bat/default.nix | 0 modules/{apps => programs}/home/cmus/default.nix | 0 modules/{apps => programs}/home/default.nix | 0 modules/{apps => programs}/home/firefox/default.nix | 0 modules/{apps => programs}/home/firefox/userChrome | 0 modules/{apps => programs}/home/git/default.nix | 0 modules/{apps => programs}/home/helix/default.nix | 0 modules/{apps => programs}/home/mpv/default.nix | 0 modules/{apps => programs}/home/newsboat/default.nix | 0 modules/{apps => programs}/home/rofi/default.nix | 2 +- modules/{apps => programs}/home/rofi/gruvbox-material.rasi | 0 modules/{apps => programs}/home/zoxide/default.nix | 0 modules/{apps => programs}/home/zsh/default.nix | 4 ++-- modules/{apps => programs}/home/zsh/scripts/ip.sh | 0 modules/{apps => programs}/home/zsh/scripts/rebuild.sh | 0 modules/{apps => programs}/norm/code/default.nix | 0 modules/{apps => programs}/norm/default.nix | 0 modules/{apps => programs}/norm/gpg/default.nix | 0 modules/{apps => programs}/norm/misc/default.nix | 0 modules/{apps => programs}/norm/mutt/default.nix | 0 modules/{apps => programs}/norm/nemo/default.nix | 0 modules/{apps => programs}/norm/ssh/default.nix | 0 26 files changed, 6 insertions(+), 6 deletions(-) rename modules/{apps => programs}/default.nix (100%) rename modules/{apps => programs}/home/alacritty/default.nix (100%) rename modules/{apps => programs}/home/bat/default.nix (100%) rename modules/{apps => programs}/home/cmus/default.nix (100%) rename modules/{apps => programs}/home/default.nix (100%) rename modules/{apps => programs}/home/firefox/default.nix (100%) rename modules/{apps => programs}/home/firefox/userChrome (100%) rename modules/{apps => programs}/home/git/default.nix (100%) rename modules/{apps => programs}/home/helix/default.nix (100%) rename modules/{apps => programs}/home/mpv/default.nix (100%) rename modules/{apps => programs}/home/newsboat/default.nix (100%) rename modules/{apps => programs}/home/rofi/default.nix (72%) rename modules/{apps => programs}/home/rofi/gruvbox-material.rasi (100%) rename modules/{apps => programs}/home/zoxide/default.nix (100%) rename modules/{apps => programs}/home/zsh/default.nix (85%) rename modules/{apps => programs}/home/zsh/scripts/ip.sh (100%) rename modules/{apps => programs}/home/zsh/scripts/rebuild.sh (100%) rename modules/{apps => programs}/norm/code/default.nix (100%) rename modules/{apps => programs}/norm/default.nix (100%) rename modules/{apps => programs}/norm/gpg/default.nix (100%) rename modules/{apps => programs}/norm/misc/default.nix (100%) rename modules/{apps => programs}/norm/mutt/default.nix (100%) rename modules/{apps => programs}/norm/nemo/default.nix (100%) rename modules/{apps => programs}/norm/ssh/default.nix (100%) diff --git a/hosts/server/default.nix b/hosts/server/default.nix index dbd773f..ddcdfa2 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -6,7 +6,7 @@ boot.loader.grub.useOSProber = true; imports = [ ./hardware.nix - ../../modules/apps + ../../modules/programs ../../modules/system ]; } diff --git a/modules/default.nix b/modules/default.nix index cc9d1d3..1573c04 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,10 +1,10 @@ { imports = [ ./wm - ./apps ./games + ./system ./hardware ./services - ./system + ./programs ]; } diff --git a/modules/apps/default.nix b/modules/programs/default.nix similarity index 100% rename from modules/apps/default.nix rename to modules/programs/default.nix diff --git a/modules/apps/home/alacritty/default.nix b/modules/programs/home/alacritty/default.nix similarity index 100% rename from modules/apps/home/alacritty/default.nix rename to modules/programs/home/alacritty/default.nix diff --git a/modules/apps/home/bat/default.nix b/modules/programs/home/bat/default.nix similarity index 100% rename from modules/apps/home/bat/default.nix rename to modules/programs/home/bat/default.nix diff --git a/modules/apps/home/cmus/default.nix b/modules/programs/home/cmus/default.nix similarity index 100% rename from modules/apps/home/cmus/default.nix rename to modules/programs/home/cmus/default.nix diff --git a/modules/apps/home/default.nix b/modules/programs/home/default.nix similarity index 100% rename from modules/apps/home/default.nix rename to modules/programs/home/default.nix diff --git a/modules/apps/home/firefox/default.nix b/modules/programs/home/firefox/default.nix similarity index 100% rename from modules/apps/home/firefox/default.nix rename to modules/programs/home/firefox/default.nix diff --git a/modules/apps/home/firefox/userChrome b/modules/programs/home/firefox/userChrome similarity index 100% rename from modules/apps/home/firefox/userChrome rename to modules/programs/home/firefox/userChrome diff --git a/modules/apps/home/git/default.nix b/modules/programs/home/git/default.nix similarity index 100% rename from modules/apps/home/git/default.nix rename to modules/programs/home/git/default.nix diff --git a/modules/apps/home/helix/default.nix b/modules/programs/home/helix/default.nix similarity index 100% rename from modules/apps/home/helix/default.nix rename to modules/programs/home/helix/default.nix diff --git a/modules/apps/home/mpv/default.nix b/modules/programs/home/mpv/default.nix similarity index 100% rename from modules/apps/home/mpv/default.nix rename to modules/programs/home/mpv/default.nix diff --git a/modules/apps/home/newsboat/default.nix b/modules/programs/home/newsboat/default.nix similarity index 100% rename from modules/apps/home/newsboat/default.nix rename to modules/programs/home/newsboat/default.nix diff --git a/modules/apps/home/rofi/default.nix b/modules/programs/home/rofi/default.nix similarity index 72% rename from modules/apps/home/rofi/default.nix rename to modules/programs/home/rofi/default.nix index 738b664..f3ad414 100644 --- a/modules/apps/home/rofi/default.nix +++ b/modules/programs/home/rofi/default.nix @@ -6,7 +6,7 @@ programs.rofi = { enable = true; package = pkgs.rofi-wayland; - theme = lib.mkForce "~/nix/modules/apps/home/rofi/gruvbox-material.rasi"; + theme = lib.mkForce "~/nix/modules/programs/home/rofi/gruvbox-material.rasi"; extraConfig = { display-drun = ""; show-icons = true; diff --git a/modules/apps/home/rofi/gruvbox-material.rasi b/modules/programs/home/rofi/gruvbox-material.rasi similarity index 100% rename from modules/apps/home/rofi/gruvbox-material.rasi rename to modules/programs/home/rofi/gruvbox-material.rasi diff --git a/modules/apps/home/zoxide/default.nix b/modules/programs/home/zoxide/default.nix similarity index 100% rename from modules/apps/home/zoxide/default.nix rename to modules/programs/home/zoxide/default.nix diff --git a/modules/apps/home/zsh/default.nix b/modules/programs/home/zsh/default.nix similarity index 85% rename from modules/apps/home/zsh/default.nix rename to modules/programs/home/zsh/default.nix index 03abbbc..e3598c5 100644 --- a/modules/apps/home/zsh/default.nix +++ b/modules/programs/home/zsh/default.nix @@ -13,8 +13,8 @@ cat = "bat"; lg = "lazygit"; ser = "ssh root@joygnu.org"; - ip = "sh ~/nix/modules/apps/home/zsh/scripts/ip.sh"; - rb = "sh ~/nix/modules/apps/home/zsh/scripts/rebuild.sh"; + ip = "sh ~/nix/modules/programs/home/zsh/scripts/ip.sh"; + rb = "sh ~/nix/modules/programs/home/zsh/scripts/rebuild.sh"; fr = "sudo systemctl reboot --firmware"; up = "nix flake update ~/nix"; del = "sudo nix-collect-garbage -d"; diff --git a/modules/apps/home/zsh/scripts/ip.sh b/modules/programs/home/zsh/scripts/ip.sh similarity index 100% rename from modules/apps/home/zsh/scripts/ip.sh rename to modules/programs/home/zsh/scripts/ip.sh diff --git a/modules/apps/home/zsh/scripts/rebuild.sh b/modules/programs/home/zsh/scripts/rebuild.sh similarity index 100% rename from modules/apps/home/zsh/scripts/rebuild.sh rename to modules/programs/home/zsh/scripts/rebuild.sh diff --git a/modules/apps/norm/code/default.nix b/modules/programs/norm/code/default.nix similarity index 100% rename from modules/apps/norm/code/default.nix rename to modules/programs/norm/code/default.nix diff --git a/modules/apps/norm/default.nix b/modules/programs/norm/default.nix similarity index 100% rename from modules/apps/norm/default.nix rename to modules/programs/norm/default.nix diff --git a/modules/apps/norm/gpg/default.nix b/modules/programs/norm/gpg/default.nix similarity index 100% rename from modules/apps/norm/gpg/default.nix rename to modules/programs/norm/gpg/default.nix diff --git a/modules/apps/norm/misc/default.nix b/modules/programs/norm/misc/default.nix similarity index 100% rename from modules/apps/norm/misc/default.nix rename to modules/programs/norm/misc/default.nix diff --git a/modules/apps/norm/mutt/default.nix b/modules/programs/norm/mutt/default.nix similarity index 100% rename from modules/apps/norm/mutt/default.nix rename to modules/programs/norm/mutt/default.nix diff --git a/modules/apps/norm/nemo/default.nix b/modules/programs/norm/nemo/default.nix similarity index 100% rename from modules/apps/norm/nemo/default.nix rename to modules/programs/norm/nemo/default.nix diff --git a/modules/apps/norm/ssh/default.nix b/modules/programs/norm/ssh/default.nix similarity index 100% rename from modules/apps/norm/ssh/default.nix rename to modules/programs/norm/ssh/default.nix