From 95d077f8847f3a6bd72b55264b0454cabfc6a7c8 Mon Sep 17 00:00:00 2001 From: joy Date: Sun, 15 Sep 2024 10:25:38 +0200 Subject: [PATCH] cli/gui --- modules/apps/cli/default.nix | 10 +++ modules/apps/{ => cli}/helix/default.nix | 0 modules/apps/cli/misc/default.nix | 39 +++++++++ modules/apps/cli/mutt/default.nix | 19 +++++ modules/apps/{ => cli}/newsboat/default.nix | 0 modules/apps/{ => cli}/tools/default.nix | 0 modules/apps/{ => cli}/tools/git/default.nix | 0 modules/apps/{ => cli}/tools/gpg/default.nix | 0 modules/apps/{ => cli}/tools/ssh/default.nix | 0 modules/apps/{ => cli}/zsh/default.nix | 6 +- modules/apps/{ => cli}/zsh/scripts/ip.sh | 0 modules/apps/{ => cli}/zsh/scripts/push.sh | 0 modules/apps/{ => cli}/zsh/scripts/rebuild.sh | 0 modules/apps/default.nix | 15 +--- modules/apps/{ => gui}/alacritty/default.nix | 0 modules/apps/{ => gui}/code/default.nix | 0 modules/apps/gui/default.nix | 11 +++ modules/apps/{ => gui}/firefox/default.nix | 0 modules/apps/{ => gui}/firefox/user.nix | 0 modules/apps/{ => gui}/games/default.nix | 0 modules/apps/gui/misc/default.nix | 29 +++++++ modules/apps/{ => gui}/nemo/default.nix | 0 modules/apps/{ => gui}/rofi/default.nix | 0 .../apps/{ => gui}/rofi/gruvbox-material.rasi | 0 modules/apps/{ => gui}/vm/default.nix | 0 modules/apps/packages/default.nix | 79 ------------------- modules/{apps => system}/appimage/default.nix | 0 modules/system/default.nix | 1 + 28 files changed, 114 insertions(+), 95 deletions(-) create mode 100644 modules/apps/cli/default.nix rename modules/apps/{ => cli}/helix/default.nix (100%) create mode 100644 modules/apps/cli/misc/default.nix create mode 100644 modules/apps/cli/mutt/default.nix rename modules/apps/{ => cli}/newsboat/default.nix (100%) rename modules/apps/{ => cli}/tools/default.nix (100%) rename modules/apps/{ => cli}/tools/git/default.nix (100%) rename modules/apps/{ => cli}/tools/gpg/default.nix (100%) rename modules/apps/{ => cli}/tools/ssh/default.nix (100%) rename modules/apps/{ => cli}/zsh/default.nix (80%) rename modules/apps/{ => cli}/zsh/scripts/ip.sh (100%) rename modules/apps/{ => cli}/zsh/scripts/push.sh (100%) rename modules/apps/{ => cli}/zsh/scripts/rebuild.sh (100%) rename modules/apps/{ => gui}/alacritty/default.nix (100%) rename modules/apps/{ => gui}/code/default.nix (100%) create mode 100644 modules/apps/gui/default.nix rename modules/apps/{ => gui}/firefox/default.nix (100%) rename modules/apps/{ => gui}/firefox/user.nix (100%) rename modules/apps/{ => gui}/games/default.nix (100%) create mode 100644 modules/apps/gui/misc/default.nix rename modules/apps/{ => gui}/nemo/default.nix (100%) rename modules/apps/{ => gui}/rofi/default.nix (100%) rename modules/apps/{ => gui}/rofi/gruvbox-material.rasi (100%) rename modules/apps/{ => gui}/vm/default.nix (100%) delete mode 100644 modules/apps/packages/default.nix rename modules/{apps => system}/appimage/default.nix (100%) diff --git a/modules/apps/cli/default.nix b/modules/apps/cli/default.nix new file mode 100644 index 0000000..902e7aa --- /dev/null +++ b/modules/apps/cli/default.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./helix + ./newsboat + ./tools + ./zsh + ./mutt + ./misc + ]; +} diff --git a/modules/apps/helix/default.nix b/modules/apps/cli/helix/default.nix similarity index 100% rename from modules/apps/helix/default.nix rename to modules/apps/cli/helix/default.nix diff --git a/modules/apps/cli/misc/default.nix b/modules/apps/cli/misc/default.nix new file mode 100644 index 0000000..b4e74c3 --- /dev/null +++ b/modules/apps/cli/misc/default.nix @@ -0,0 +1,39 @@ +{ + pkgs, + ... +}: { + environment.systemPackages = with pkgs; [ + htop + sent + texliveFull + alejandra + bat + screen + tree + zip + unzip + scrcpy + appimage-run + yt-dlp + distrobox + lm_sensors + brightnessctl + ncdu + git + lazygit + ffmpeg + libnotify + font-awesome + imagemagick + zoxide + fastfetch + cmatrix + cava + nitch + gotop + sl + cbonsai + pipes + pulseaudioFull + ]; +} diff --git a/modules/apps/cli/mutt/default.nix b/modules/apps/cli/mutt/default.nix new file mode 100644 index 0000000..42e074c --- /dev/null +++ b/modules/apps/cli/mutt/default.nix @@ -0,0 +1,19 @@ +{ + pkgs, + ... +}: { + environment.systemPackages = with pkgs; [ + mutt-wizard + neomutt + msmtp + curl + isync + pass + lynx + notmuch + abook + mpop + urlscan + vim + ]; +} diff --git a/modules/apps/newsboat/default.nix b/modules/apps/cli/newsboat/default.nix similarity index 100% rename from modules/apps/newsboat/default.nix rename to modules/apps/cli/newsboat/default.nix diff --git a/modules/apps/tools/default.nix b/modules/apps/cli/tools/default.nix similarity index 100% rename from modules/apps/tools/default.nix rename to modules/apps/cli/tools/default.nix diff --git a/modules/apps/tools/git/default.nix b/modules/apps/cli/tools/git/default.nix similarity index 100% rename from modules/apps/tools/git/default.nix rename to modules/apps/cli/tools/git/default.nix diff --git a/modules/apps/tools/gpg/default.nix b/modules/apps/cli/tools/gpg/default.nix similarity index 100% rename from modules/apps/tools/gpg/default.nix rename to modules/apps/cli/tools/gpg/default.nix diff --git a/modules/apps/tools/ssh/default.nix b/modules/apps/cli/tools/ssh/default.nix similarity index 100% rename from modules/apps/tools/ssh/default.nix rename to modules/apps/cli/tools/ssh/default.nix diff --git a/modules/apps/zsh/default.nix b/modules/apps/cli/zsh/default.nix similarity index 80% rename from modules/apps/zsh/default.nix rename to modules/apps/cli/zsh/default.nix index 31aed5b..515b75a 100644 --- a/modules/apps/zsh/default.nix +++ b/modules/apps/cli/zsh/default.nix @@ -13,11 +13,11 @@ cat = "bat"; cn = "cd ~/nix"; ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first"; - pu = "sh ~/nix/modules/apps/zsh/scripts/push.sh"; - ip = "sh ~/nix/modules/apps/zsh/scripts/ip.sh"; + pu = "sh ~/nix/modules/apps/cli/zsh/scripts/push.sh"; + ip = "sh ~/nix/modules/apps/cli/zsh/scripts/ip.sh"; fr = "sudo systemctl reboot --firmware"; ser = "ssh root@joygnu.org"; - rb = "sh ~/nix/modules/apps/zsh/scripts/rebuild.sh"; + rb = "sh ~/nix/modules/apps/cli/zsh/scripts/rebuild.sh"; up = "sudo nix flake update ~/nix"; del = "sudo nix-collect-garbage -d"; }; diff --git a/modules/apps/zsh/scripts/ip.sh b/modules/apps/cli/zsh/scripts/ip.sh similarity index 100% rename from modules/apps/zsh/scripts/ip.sh rename to modules/apps/cli/zsh/scripts/ip.sh diff --git a/modules/apps/zsh/scripts/push.sh b/modules/apps/cli/zsh/scripts/push.sh similarity index 100% rename from modules/apps/zsh/scripts/push.sh rename to modules/apps/cli/zsh/scripts/push.sh diff --git a/modules/apps/zsh/scripts/rebuild.sh b/modules/apps/cli/zsh/scripts/rebuild.sh similarity index 100% rename from modules/apps/zsh/scripts/rebuild.sh rename to modules/apps/cli/zsh/scripts/rebuild.sh diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 10d7e0f..e836b86 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,17 +1,6 @@ { imports = [ - ./alacritty - ./appimage - ./firefox - ./helix - ./newsboat - ./packages - ./rofi - ./vm - ./zsh - ./tools - ./code - ./nemo - ./games + ./cli + ./gui ]; } diff --git a/modules/apps/alacritty/default.nix b/modules/apps/gui/alacritty/default.nix similarity index 100% rename from modules/apps/alacritty/default.nix rename to modules/apps/gui/alacritty/default.nix diff --git a/modules/apps/code/default.nix b/modules/apps/gui/code/default.nix similarity index 100% rename from modules/apps/code/default.nix rename to modules/apps/gui/code/default.nix diff --git a/modules/apps/gui/default.nix b/modules/apps/gui/default.nix new file mode 100644 index 0000000..2246691 --- /dev/null +++ b/modules/apps/gui/default.nix @@ -0,0 +1,11 @@ +{ + imports = [ + ./alacritty + ./code + ./firefox + ./games + ./nemo + ./rofi + ./vm + ]; +} diff --git a/modules/apps/firefox/default.nix b/modules/apps/gui/firefox/default.nix similarity index 100% rename from modules/apps/firefox/default.nix rename to modules/apps/gui/firefox/default.nix diff --git a/modules/apps/firefox/user.nix b/modules/apps/gui/firefox/user.nix similarity index 100% rename from modules/apps/firefox/user.nix rename to modules/apps/gui/firefox/user.nix diff --git a/modules/apps/games/default.nix b/modules/apps/gui/games/default.nix similarity index 100% rename from modules/apps/games/default.nix rename to modules/apps/gui/games/default.nix diff --git a/modules/apps/gui/misc/default.nix b/modules/apps/gui/misc/default.nix new file mode 100644 index 0000000..65138ec --- /dev/null +++ b/modules/apps/gui/misc/default.nix @@ -0,0 +1,29 @@ +{ + pkgs, + ... +}: { + environment.systemPackages = with pkgs; [ + #gui + uget + keepassxc + vesktop + signal-desktop + upscayl + bottles + boxbuddy + waydroid + transmission_4-gtk + vscodium + networkmanagerapplet + ferdium + drawio + imv + mpv + cmus + obs-studio + gnome-calculator + gnome-disk-utility + gnome-clocks + gnome-calendar + ]; +} diff --git a/modules/apps/nemo/default.nix b/modules/apps/gui/nemo/default.nix similarity index 100% rename from modules/apps/nemo/default.nix rename to modules/apps/gui/nemo/default.nix diff --git a/modules/apps/rofi/default.nix b/modules/apps/gui/rofi/default.nix similarity index 100% rename from modules/apps/rofi/default.nix rename to modules/apps/gui/rofi/default.nix diff --git a/modules/apps/rofi/gruvbox-material.rasi b/modules/apps/gui/rofi/gruvbox-material.rasi similarity index 100% rename from modules/apps/rofi/gruvbox-material.rasi rename to modules/apps/gui/rofi/gruvbox-material.rasi diff --git a/modules/apps/vm/default.nix b/modules/apps/gui/vm/default.nix similarity index 100% rename from modules/apps/vm/default.nix rename to modules/apps/gui/vm/default.nix diff --git a/modules/apps/packages/default.nix b/modules/apps/packages/default.nix deleted file mode 100644 index e8a76fa..0000000 --- a/modules/apps/packages/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - environment.systemPackages = with pkgs; [ - fastfetch - cmatrix - cava - nitch - gotop - sl - cbonsai - pipes - #image/video/music/recording - imv - mpv - cmus - obs-studio - pulseaudioFull - #gui stuff - uget - keepassxc - vesktop - signal-desktop - upscayl - bottles - boxbuddy - waydroid - transmission_4-gtk - #gnome - gnome-calculator - gnome-disk-utility - gnome-clocks - gnome-calendar - #mutt - mutt-wizard - neomutt - msmtp - curl - isync - pass - lynx - notmuch - abook - mpop - urlscan - vim - #office - sent - texliveFull - ferdium - drawio - #random shit - htop - alejandra - bat - screen - tree - zip - unzip - scrcpy - appimage-run - yt-dlp - distrobox - lm_sensors - brightnessctl - networkmanagerapplet - ncdu - git - lazygit - ffmpeg - libnotify - font-awesome - imagemagick - vscodium - zoxide - ]; -} diff --git a/modules/apps/appimage/default.nix b/modules/system/appimage/default.nix similarity index 100% rename from modules/apps/appimage/default.nix rename to modules/system/appimage/default.nix diff --git a/modules/system/default.nix b/modules/system/default.nix index 2533123..f2c2f08 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -4,5 +4,6 @@ ./homemanger ./misc ./xdg + ./appimage ]; }