cli/gui

modules/apps/cli/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./helix
+    ./newsboat
+    ./tools
+    ./zsh
+    ./mutt
+    ./misc
+  ];
+}

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
+  ];
+}

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
+  ];
+}

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";
     };

modules/apps/default.nix

@@ -1,17 +1,6 @@
 {
   imports = [
-    ./alacritty
-    ./appimage
-    ./firefox
-    ./helix
-    ./newsboat
-    ./packages
-    ./rofi
-    ./vm
-    ./zsh
-    ./tools
-    ./code
-    ./nemo
-    ./games
+    ./cli
+    ./gui
   ];
 }

modules/apps/gui/default.nix

@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./alacritty
+    ./code
+    ./firefox
+    ./games
+    ./nemo
+    ./rofi
+    ./vm
+  ];
+}

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
+  ];
+}

modules/apps/packages/default.nix

@@ -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
-  ];
-}

modules/system/default.nix

@@ -4,5 +4,6 @@
     ./homemanger
     ./misc
     ./xdg
+    ./appimage
   ];
 }