Update

home/apps/default.nix

@@ -0,0 +1,4 @@
+{
+  imports =
+    [ ./kitty ./lf ./neofetch ./nvim ./qutebrowser ./spicetify ./wofi ./cava ];
+}

home/apps/lf/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [ pistol ];
 
   programs.lf = {

home/apps/qutebrowser/default.nix

@@ -49,13 +49,21 @@
           odd.fg = "#${config.theme.colors.fg}";
           even.bg = "#${config.theme.colors.bg}";
           even.fg = "#${config.theme.colors.fg}";
-          selected.odd.bg = "#${config.theme.colors.primary-bg}";
-          selected.odd.fg = "#${config.theme.colors.primary-fg}";
-          selected.even.bg = "#${config.theme.colors.primary-bg}";
-          selected.even.fg = "#${config.theme.colors.primary-fg}";
-          indicator.error = "#${config.theme.colors.color1}";
-          indicator.start = "#${config.theme.colors.alt-bg}";
-          indicator.stop = "#${config.theme.colors.alt-bg}";
+          selected = {
+            odd = {
+              bg = "#${config.theme.colors.primary-bg}";
+              fg = "#${config.theme.colors.primary-fg}";
+            };
+            even = {
+              bg = "#${config.theme.colors.primary-bg}";
+              fg = "#${config.theme.colors.primary-fg}";
+            };
+          };
+          indicator = {
+            error = "#${config.theme.colors.color1}";
+            start = "#${config.theme.colors.alt-bg}";
+            stop = "#${config.theme.colors.alt-bg}";
+          };
         };
 
         hints = {
@@ -65,10 +73,14 @@
         };
 
         completion = {
-          category.bg = "#${config.theme.colors.bg}";
-          category.fg = "#${config.theme.colors.fg}";
-          category.border.top = "#${config.theme.colors.bg}";
-          category.border.bottom = "#${config.theme.colors.bg}";
+          category = {
+            bg = "#${config.theme.colors.bg}";
+            fg = "#${config.theme.colors.fg}";
+            border = {
+              top = "#${config.theme.colors.bg}";
+              bottom = "#${config.theme.colors.bg}";
+            };
+          };
 
           odd.bg = "#${config.theme.colors.bg}";
           even.bg = "#${config.theme.colors.bg}";
@@ -77,11 +89,13 @@
 
           match.fg = "#${config.theme.colors.primary-bg}";
 
-          item.selected.bg = "#${config.theme.colors.primary-bg}";
-          item.selected.border.top = "#${config.theme.colors.primary-bg}";
-          item.selected.border.bottom = "#${config.theme.colors.primary-bg}";
-          item.selected.fg = "#${config.theme.colors.primary-fg}";
-          item.selected.match.fg = "#${config.theme.colors.primary-fg}";
+          item.selected = {
+            bg = "#${config.theme.colors.primary-bg}";
+            border.top = "#${config.theme.colors.primary-bg}";
+            border.bottom = "#${config.theme.colors.primary-bg}";
+            fg = "#${config.theme.colors.primary-fg}";
+            match.fg = "#${config.theme.colors.primary-fg}";
+          };
         };
 
         statusbar = {
@@ -136,6 +150,7 @@
       content = {
         autoplay = false;
         javascript.clipboard = "access";
+        javascript.enabled = true;
         pdfjs = true;
       };
 

home/git/default.nix

@@ -1,12 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    userName = "Hadi"; # CHANGEME
-    userEmail = "112569860+anotherhadi@users.noreply.github.com"; # CHANGEME
-    extraConfig = {
-      init.defaultBranch = "main";
-      # Automatically track remote branch
-      push.autoSetupRemote = true;
-    };
-  };
-}

home/home.nix

@@ -1,29 +1,12 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }:
+let variable = import ../variables.nix;
+in {
 
-  imports = [
-    ./hyprland
-    ./nvim
-    ./waybar
-    ./kitty
-    ./dunst
-    ./wlogout
-    ./wofi
-    ./qutebrowser
-    ./git
-    ./shell
-    ./misc
-    ./scripts
-    ./neofetch
-    ./spicetify
-    ./theme
-    ./wallpapers
-    ./lf
-    ./sops # REMOVE
-  ];
+  imports = [ ./themes ./system ./scripts ./apps ];
 
   home = {
-    username = "hadi"; # CHANGEME
-    homeDirectory = "/home/hadi"; # CHANGEME
+    username = variable.username;
+    homeDirectory = variable.homeDirectory;
 
     packages = with pkgs; [
       swappy
@@ -49,6 +32,7 @@
       bc
       gcc
       blueman
+      zip
       unzip
       xdg_utils
       tldr
@@ -68,7 +52,7 @@
       firefox
     ];
 
-    stateVersion = "23.11";
+    stateVersion = variable.stateVersion;
   };
   programs.home-manager.enable = true;
 }

home/misc/default.nix

@@ -1 +0,0 @@
-{ imports = [ ./cava/default.nix ]; }

home/scripts/brightness.nix

@@ -1,7 +1,6 @@
 { pkgs, config, ... }:
 
 let
-  homedir = config.home.homeDirectory;
   increments = "5";
 
   brightness-change = pkgs.writeShellScriptBin "brightness-change" ''

home/scripts/default.nix

@@ -9,6 +9,6 @@
     ./night-shift.nix
     ./screenshot.nix
     ./startup.nix
-    ./nerdfont_fzf.nix
+    ./nerdfont_fzf
   ];
 }

home/scripts/nerdfont_fzf/default.nix

@@ -29,7 +29,7 @@ in {
   home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
-    source = ../misc/nerdfont_glyphnames.json;
+    source = ./nerdfont_glyphnames.json;
   };
 
 }

home/scripts/startup.nix

@@ -2,6 +2,7 @@
 { pkgs, config, ... }:
 let
   homedir = config.home.homeDirectory;
+  variable = import ../../variables.nix;
 
   battery-notif = pkgs.writeShellScriptBin "battery-notif" ''
     # Send notifications when low on battery and not in charge
@@ -44,9 +45,12 @@ let
   startup = pkgs.writeShellScriptBin "startup" ''
     # Because HM enabling services suck.
 
-    systemctl --user start sops-nix
+    [[ ${
+      toString variable.enableSops
+    } == "true" ]] && systemctl --user start sops-nix
+
+    [[ ${toString variable.enableNextcloud} == "true" ]] && nextcloud-watch &
 
-    nextcloud-watch &
     battery-notif &
     ${pkgs.waybar}/bin/waybar &
   '';

home/system/default.nix

@@ -0,0 +1,4 @@
+{
+  imports =
+    [ ./git ./dunst ./hyprland ./shell ./sops ./waybar ./wlogout ./sops ];
+}

home/system/dunst/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, pkgs, ... }: {
 
   home.packages = with pkgs; [ libnotify ];
 

home/system/git/default.nix

@@ -0,0 +1,12 @@
+let variable = import ../../../variables.nix;
+in {
+  programs.git = {
+    enable = true;
+    userName = variable.git.username;
+    userEmail = variable.git.email;
+    extraConfig = {
+      init.defaultBranch = "main";
+      push.autoSetupRemote = true;
+    };
+  };
+}

home/system/hyprland/default.nix

@@ -1,4 +1,6 @@
-{ self, pkgs, config, hyprland, ... }: {
+{ self, pkgs, config, hyprland, ... }:
+let variable = import ../../../variables.nix;
+in {
 
   imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ./hyprcursor.nix ];
 
@@ -142,7 +144,7 @@
       };
 
       input = {
-        kb_layout = "fr"; # CHANGEME
+        kb_layout = variable.keyboardLayout;
 
         kb_options = "caps:escape";
         follow_mouse = 1;

home/system/hyprland/hyprcursor.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [ hyprcursor ];
 
   #  home.file.".local/share/icons/rose-pine-hyprcursor" = {

home/system/shell/zsh.nix

@@ -42,6 +42,8 @@
       sl = "ls";
       open = "${pkgs.xdg_utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      note = "vim ~/Nextcloud/obsidian";
+      obs = "vim ~/Nextcloud/obsidian";
     };
   };
 }

home/system/sops/default.nix

@@ -1,9 +1,9 @@
-{ sops-nix, config, ... }: {
+{ sops-nix, ... }: {
   imports = [ sops-nix.homeManagerModules.sops ];
 
   sops = {
     age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFile = ../../../secrets/secrets.yaml;
     secrets = {
       sshconfig = { path = "/home/hadi/.ssh/config"; };
       oxk = { path = "/home/hadi/.ssh/oxserver"; };

home/system/waybar/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: {
+{ config, ... }: {
   services = {
     blueman-applet.enable = true;
     network-manager-applet.enable = true;
@@ -31,6 +31,7 @@
         "hyprland/window" = {
           "format" = "{title:30}";
           "max-length" = 30;
+          "separate-outputs" = true;
         };
 
         "hyprland/workspaces" = {

home/themes/config/template.nix

@@ -1,8 +1,5 @@
 { lib, ... }:
-
-with lib;
-
-{
+with lib; {
   options.theme = {
 
     waybar-transparent = mkOption {

home/themes/default.nix

@@ -1,5 +1,5 @@
 { config, ... }: {
-  imports = [ ./nixy.nix ];
+  imports = [ ./nixy.nix ./wallpapers ];
   config.theme.colors.primary-ansi-16-number =
     if config.theme.colors.primary-ansi-16 == "black" then
       0

home/themes/wallpapers/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }: {
+{
   xdg.configFile."wallpapers" = {
     recursive = true;
     source = ./wallpapers;