diff --git a/flake.lock b/flake.lock
index af40a83..779b3da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748421225,
-        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
+        "lastModified": 1748708770,
+        "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
+        "rev": "a59eb7800787c926045d51b70982ae285faa2346",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/mods/base.nix b/mods/base.nix
index 19881cd..6ebbfdb 100644
--- a/mods/base.nix
+++ b/mods/base.nix
@@ -10,6 +10,7 @@
       ./systemd.nix
       ./fonts.nix
       ./gpu.nix
+      ./programs.nix
     ];
 
   # Housekeeping: Garbage collection
@@ -103,31 +104,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  environment.systemPackages = with pkgs; [
-  
-  # MOVE MOST TO HOME.NIX
-    # terminal apps
-    wget
-    curl
-    fastfetch
-    gnome-tweaks
-    btop
-    htop
-    tree
-    restic # backup program
-    lm_sensors
-    hddtemp
-    f3
-    unzip
-    git
-
-    # terminal editors
-    neovim
-    ptyxis
-
-    # nix helper apps
-    nh
-  ];
 
   # Services
   # =========================
diff --git a/mods/programs.nix b/mods/programs.nix
new file mode 100644
index 0000000..23c4ebd
--- /dev/null
+++ b/mods/programs.nix
@@ -0,0 +1,95 @@
+{ pkgs, config, lib, ... }:
+
+{
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    # terminal apps
+    wget
+    curl
+    fastfetch
+    git
+    btop
+    htop
+    tree
+    restic # backup program
+    wiper # A TUI disk analyser and cleanup tool
+    curl
+
+    # emulation
+    quickemu
+
+    #emulation
+    distrobox
+
+    # terminal editors
+    neovim
+    xclip # for nvim clipboard
+    ptyxis
+
+    # nix helper apps
+    nh
+
+    # core apps
+    iotas # nextcloud compatible notes app
+    keepassxc # password client
+    nextcloud-client
+    calibre # ebook program
+    hunspell # dictionaries for libreoffice
+    hunspellDicts.en_CA
+    hunspellDicts.en_US
+    xreader # pdf viewer
+
+    # creative apps
+    kdePackages.kdenlive
+    audacity
+    gimp
+    pkgs.krita
+    element-desktop
+
+    #gpu tools
+    intel-gpu-tools
+    #nvtopPackages.full not working right now
+
+    # archive programs
+    zip
+    xz
+    unzip
+    p7zip
+
+    # utils
+    ripgrep # recursively searches directories for a regex >
+    #jq # A lightweight and flexible command-line JSON proc>
+    #yq-go # yaml processor https://github.com/mikefarah/yq
+    eza # A modern replacement for ‘ls’
+    #fzf # A command-line fuzzy finder
+    nnn # terminal file manager
+
+    # networking tools
+    mtr # A network diagnostic tool
+    iperf3
+    dnsutils  # `dig` + `nslookup`
+    #ldns # replacement of `dig`, it provide the command `drill`
+    #aria2 # A lightweight multi-protocol & multi-source command-line download utility
+    #socat # replacement of openbsd-netcat
+    nmap # A utility for network discovery and security auditing
+    #ipcalc  # it is a calculator for the IPv4/v6 addresses
+
+    # system tools
+    sysstat
+    lm_sensors # for `sensors` command
+    ethtool
+    pciutils # lspci
+    usbutils # lsusb
+
+   # system call monitoring
+    strace # system call monitoring
+    ltrace # library call monitoring
+    lsof # list open files
+
+    iotop # io monitoring
+    iftop # network monitoring
+
+  ];
+
+}