v4.0.0

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

hosts/laptop/configuration.nix

@@ -15,7 +15,7 @@
     ../../nixos/hyprland.nix
     ../../nixos/docker.nix
 
-    ../../nixos/omen.nix # For my laptop only
+    ../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
 
     # You should let those lines as is
     ./hardware-configuration.nix

hosts/laptop/home.nix

@@ -1,72 +1,54 @@
 {
   pkgs,
   config,
-  inputs,
   ...
 }: {
   imports = [
-    # Mostly user-specific configuration
-    ./variables.nix
-
     # Programs
-    ../../home/programs/kitty
-    # ../../home/programs/alacritty
+    ../../home/programs/vivaldi
+    ../../home/programs/proton
     ../../home/programs/ghostty
     ../../home/programs/nvf
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/git
-    ../../home/programs/git/signing.nix
+    ../../home/programs/git/lazygit.nix
+    ../../home/programs/git/signing.nix # Change the key or remove this file
     ../../home/programs/spicetify
     ../../home/programs/thunar
-    ../../home/programs/lazygit
     ../../home/programs/discord
-    ../../home/programs/tailscale
-
-    # Scripts
-    ../../home/scripts # All scripts
+    ../../home/programs/nixy
+    ../../home/programs/zathura
+    ../../home/programs/nightshift
+    ../../home/programs/group/cybersecurity.nix
 
     # System (Desktop environment like stuff)
     ../../home/system/hyprland
-    ../../home/system/hyprlock
-    ../../home/system/hyprpanel
+    ../../home/system/caelestia-shell
     ../../home/system/hyprpaper
-    ../../home/system/zathura
     ../../home/system/mime
     ../../home/system/udiskie
-    ../../home/system/vicinae
-    ../../home/system/wofi
-    # ../../home/system/hypridle
 
+    ./variables.nix # Mostly user-specific configuration
     ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
   home = {
-    inherit (config.var) username;
-    homeDirectory = "/home/" + config.var.username;
-
     packages = with pkgs; [
       # Apps
-      bitwarden-desktop # Password manager
       vlc # Video player
       blanket # White-noise app
       obsidian # Note taking app
-      planify # Todolists
       textpieces # Manipulate texts
-      curtail # Compress images
       resources # Ressource monitor
       gnome-clocks # Clocks app
       gnome-text-editor # Basic graphic text editor
       mpv # Video player
-      brave # Web browser
-
-      # Privacy
+      ticktick # Todo app
       session-desktop # Session app, private messages
       signal-desktop # Signal app, private messages
-      protonvpn-gui
-      proton-pass
-      proton-authenticator
-      ticktick # Privacy friendly todo app
+      stirling-pdf # TODO: Server version
+      calibre
 
       # Dev
       go
@@ -79,32 +61,24 @@
       pnpm
       air
       duckdb
-      inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
-      caido
-      wireshark
-      nuclei
-
-      # Utils
-      zip
-      unzip
-      optipng
-      jpegoptim
-      pfetch
-      btop
-      fastfetch
 
       # Just cool
       peaclock
       cbonsai
       pipes
       cmatrix
+      fastfetch
 
       # Backup
       vscode
+      brave
     ];
 
-    # Import my profile picture, used by the hyprpanel dashboard
-    file.".face.icon" = {source = ./profile_picture.png;};
+    inherit (config.var) username;
+    homeDirectory = "/home/" + config.var.username;
+
+    # Import a profile picture, used by the caelestia dashboard
+    file.".face" = {source = ./profile_picture.png;};
 
     # Don't touch this
     stateVersion = "24.05";

hosts/laptop/secrets/default.nix

@@ -13,11 +13,9 @@
     secrets = {
       sshconfig = {path = "/home/hadi/.ssh/config";};
       github-key = {path = "/home/hadi/.ssh/github";};
-      gitlab-key = {path = "/home/hadi/.ssh/gitlab";};
       jack-key = {path = "/home/hadi/.ssh/jack";};
       signing-key = {path = "/home/hadi/.ssh/key";};
       signing-pub-key = {path = "/home/hadi/.ssh/key.pub";};
-      pia = {path = "/home/hadi/.config/pia/pia.ovpn";};
     };
   };
 

hosts/laptop/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/nixy.nix
+    ../../themes/rose-pine.nix
   ];
 
   config.var = {
@@ -32,7 +32,7 @@
     autoGarbageCollector = true;
   };
 
-  # Let this here
+  # DON'T TOUCH THIS
   options = {
     var = lib.mkOption {
       type = lib.types.attrs;