updates, reworking

hosts/darp8/configuration.nix

@@ -186,20 +186,26 @@
   };
  
   environment.systemPackages = with pkgs; [
-    vim
+    bat
+    discord
+    ghostty
+    glib
+    gnome-keyring
     fd
     file
-    ripgrep
-    wget
-    glib
-    spotify
-    discord
-    uxplay
-    wl-clipboard
-    ghostty
     libnotify
-    mesa
     libdrm
+    mesa
+    neovim
+    ripgrep
+    spotify
+    unzip
+    uxplay
+    vim
+    wget
+    wl-clipboard
+    xdg-user-dirs
+    zip
   ];
 
   zramSwap = {

hosts/darp8/file.nix

@@ -13,46 +13,49 @@ in
 {
   # Symlink dotfiles
   home.file = mkSymlinkAttrs {
-    ".config/hypr" = {
-      source = ../../modules/non-nix_configs/hypr;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
-
+    # Fonts
     ".local/share/fonts/KelmscottMono.otf" = {
         source = ../../fonts/KelmscottMono.otf;
         outOfStoreSymlink = true;
         recursive = false;
     };
 
+    # Configs
+    ".config/hypr" = {
+      source = ../../configs/hypr;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+    ".config/waybar" = {
+      source = ../../configs/waybar;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+    ".config/ghostty" = {
+      source = ../../configs/ghostty;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+    ".config/kitty" = {
+      source = ../../configs/kitty;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+    ".config/nvim" = {
+      source = ../../configs/nvim;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+    ".config/wofi" = {
+      source = ../../configs/wofi;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
     # ".config/emacs" = {
-    #   source = ../../modules/non-nix_configs/emacs;
+    #   source = ../../configs/emacs;
     #   outOfStoreSymlink = true;
     #   recursive = true;
     # };
 
-    ".config/ghostty" = {
-      source = ../../modules/non-nix_configs/ghostty;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
-
-    ".config/kitty" = {
-      source = ../../modules/non-nix_configs/kitty;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
-
-    ".config/nvim" = {
-      source = ../../modules/non-nix_configs/nvim;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
-
-    ".config/wofi" = {
-      source = ../../modules/non-nix_configs/wofi;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
   };
 }

hosts/darp8/home.nix

@@ -15,7 +15,6 @@
 
     # desktop
     ../../modules/desktop/bluetooth.nix
-    ../../modules/desktop/waybar.nix
   ];
 
   # You should not change this value, even if you update Home Manager. If you do
@@ -37,12 +36,11 @@
     floorp
     genymotion
     gimp
-    gnome-keyring
     gtk4
     gvfs
-    grim
     grimblast
     htop
+    hyprpicker
     imagemagick
     kdePackages.kdenlive
     keepassxc
@@ -57,19 +55,14 @@
     pamixer
     pavucontrol
     powertop
-    praat
     prismlauncher
     protonvpn-cli
-    protonvpn-gui
     qbittorrent
     signal-desktop
+    swww
     texliveFull
     tree
-    unzip
     wev
-    wl-clipboard
-    xdg-user-dirs
-    zip
   ];
 
   home.sessionVariables = {
@@ -119,11 +112,11 @@
   xdg.enable = true;
   xdg.configFile = {
     "emacs" = {
-      source = ../../modules/non-nix_configs/emacs;
+      source = ../../configs/emacs;
       recursive = true;
     };
-    "user-dirs.dirs".source = ../../modules/non-nix_configs/user-dirs.dirs;
-    "user-dirs.locale".source = ../../modules/non-nix_configs/user-dirs.locale;
+    "user-dirs.dirs".source = ../../configs/user-dirs.dirs;
+    "user-dirs.locale".source = ../../configs/user-dirs.locale;
   };
 
   # BEGIN PROGRAMS
@@ -196,12 +189,6 @@
 
   # BEGIN SERVICES
   services = {
-    hyprpaper.enable = true;
-    hypridle.enable = true;
-
-    blueman-applet.enable = true;
-    network-manager-applet.enable = true;
-
     emacs = {
       enable = true;
       package = pkgs.emacs-gtk;
@@ -215,14 +202,15 @@
       startWithUserSession = "graphical";
     };
 
-    gnome-keyring.enable = true;
-
     gpg-agent = {
       enable = true;
       defaultCacheTtl = 1800;
       enableSshSupport = true;
     };
 
+    gnome-keyring.enable = true;
+    network-manager-applet.enable = true;
     nextcloud-client.enable = true;
+    swww.enable = true;
   };
 }