diff --git a/default-host/hardware-configuration.nix b/default-host/hardware-configuration.nix
index ce093690..3903a195 100644
--- a/default-host/hardware-configuration.nix
+++ b/default-host/hardware-configuration.nix
@@ -12,29 +12,31 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.kernelModules = ["dm-snapshot"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/7594aea3-de1f-466c-8420-3c7e4997fb34";
-    fsType = "bcachefs";
+    device = "/dev/lvm-pool/root";
+    fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/CF37-079C";
+    device = "/dev/disk/by-uuid/E804-6DF4";
     fsType = "vfat";
-    options = ["fmask=0137" "dmask=0027"];
+    options = ["fmask=0022" "dmask=0022"];
   };
 
+  swapDevices = [];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/dev-environment/default.nix b/dev-environment/default.nix
index f6159869..8bd8d0bf 100644
--- a/dev-environment/default.nix
+++ b/dev-environment/default.nix
@@ -20,4 +20,6 @@
     ]
     ++ lib.optionals servicesSettings.adb [./adb-toolchain.nix]
     ++ lib.optionals servicesSettings.nginx [./nginx.nix];
+
+  programs.java.enable = true;
 }
diff --git a/dev-environment/nginx.nix b/dev-environment/nginx.nix
index 92dd8e73..2250e2de 100644
--- a/dev-environment/nginx.nix
+++ b/dev-environment/nginx.nix
@@ -11,15 +11,23 @@
   ];
 
   services.nginx.enable = true;
-  services.nginx.virtualHosts."johnrtitor.org" = {
+  services.nginx.recommendedTlsSettings = true;
+  services.nginx.recommendedOptimisation = true;
+  services.nginx.recommendedProxySettings = true;
+  services.nginx.recommendedZstdSettings = true;
+
+  services.nginx.virtualHosts."localhost" = {
     # addSSL = true;
     # enableACME = true; # for automatic certificate generation
-    root = "/var/www/johnrtitor.org";
+    root = "/var/www/localhost";
+  };
+
+  /*
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = userSettings.email;
   };
-  # security.acme = {
-  #   acceptTerms = true;
-  #   defaults.email = userSettings.email;
-  # };
+  */
 
   services.mysql = {
     enable = true;
@@ -27,6 +35,11 @@
     settings.mysqld.bind-address = "localhost";
   };
 
+  systemd.tmpfiles.rules = [
+    "d /var/www/localhost"
+    "f /var/www/localhost/index.php - - - - <?php phpinfo();>"
+  ];
+
   # hacky way to create our directory structure and index page... don't actually use this
   # systemd.tmpfiles.rules = [
   #   "d /var/www/example.org"
diff --git a/flake.lock b/flake.lock
index 6515edbe..da1abb83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1721306136,
-        "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
+        "lastModified": 1725841979,
+        "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
+        "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796",
         "type": "github"
       },
       "original": {
@@ -54,33 +54,6 @@
         "type": "github"
       }
     },
-    "bcachefs-tools": {
-      "inputs": {
-        "crane": "crane",
-        "fenix": "fenix",
-        "flake-compat": "flake-compat",
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1725154455,
-        "narHash": "sha256-EAfDQEnWPL/ch6zfPFukXw3tb6yl9+k81x6jI7RjJyg=",
-        "owner": "koverstreet",
-        "repo": "bcachefs-tools",
-        "rev": "1e058db4b603f8992b781b4654b48221dd04407a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "koverstreet",
-        "repo": "bcachefs-tools",
-        "type": "github"
-      }
-    },
     "browser-previews": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -90,11 +63,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1725220948,
-        "narHash": "sha256-sZJz17IsrkDMkwypQ2AO5mByL8XPGn8PAGoqM5jvWcE=",
+        "lastModified": 1725937011,
+        "narHash": "sha256-WXIT5Q4+qinP9WDzfhZAl2to8UwYXC3yDOyRDeI+swQ=",
         "owner": "nix-community",
         "repo": "browser-previews",
-        "rev": "ecd68e2e3a24b951e9ce6b9df50046c2c956c3d2",
+        "rev": "bc30b9d79472729cd2c843d9fc483fdb7572513f",
         "type": "github"
       },
       "original": {
@@ -135,21 +108,18 @@
     },
     "chaotic": {
       "inputs": {
-        "compare-to": "compare-to",
-        "fenix": "fenix_2",
+        "fenix": "fenix",
         "flake-schemas": "flake-schemas",
         "home-manager": "home-manager",
         "jovian": "jovian",
-        "nixpkgs": "nixpkgs",
-        "systems": "systems_3",
-        "yafas": "yafas"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1725043054,
-        "narHash": "sha256-wNKROMH0TmS3yqpces3ldlRLE75Bec0gfmaP9DF6OPc=",
+        "lastModified": 1725979332,
+        "narHash": "sha256-+SfmdSqkmYmOOMCQqllx6yuL0jVK+WojDKtxNRy6B6E=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "1de4f25728a7f37785da5742f6d3fe98daffe83f",
+        "rev": "cdf56675d380775258f8971778719ff5ce4d18a0",
         "type": "github"
       },
       "original": {
@@ -159,42 +129,7 @@
         "type": "github"
       }
     },
-    "compare-to": {
-      "locked": {
-        "lastModified": 1695341185,
-        "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=",
-        "rev": "98b8e330823a3570d328720f87a1153f8a7f2224",
-        "revCount": 2,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
-      }
-    },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "bcachefs-tools",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721842668,
-        "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "crane_2": {
       "inputs": {
         "nixpkgs": [
           "lanzaboote",
@@ -218,17 +153,17 @@
     "devenv": {
       "inputs": {
         "cachix": "cachix",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "nix": "nix_2",
         "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1725287955,
-        "narHash": "sha256-hnibVK/T/7+nrYrcuYAFr2Cj0vKd/kpr3ePZvm3/rGE=",
+        "lastModified": 1725964132,
+        "narHash": "sha256-+IW4z7tXTgkEA677hbT+qsfNxaduCZY+1rAKFgVVmLI=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "0ceddcb8040b72943d34af364cde79294222e1af",
+        "rev": "98c7c131e3fa30eb00e9bfe44c1a180c7f94102f",
         "type": "github"
       },
       "original": {
@@ -271,17 +206,17 @@
     "fenix": {
       "inputs": {
         "nixpkgs": [
-          "bcachefs-tools",
+          "chaotic",
           "nixpkgs"
         ],
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1722320953,
-        "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=",
+        "lastModified": 1725863722,
+        "narHash": "sha256-YBcCMVp9RrN2rgqhsMhpu/iw7L8z17N4fp4A129IZ3w=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "483df76def3e5010d709aa3a0418ba2088503994",
+        "rev": "c30b094741641eef4a7200a5d52a8a16f0f345c6",
         "type": "github"
       },
       "original": {
@@ -291,31 +226,9 @@
       }
     },
     "fenix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src_2"
-      },
-      "locked": {
-        "lastModified": 1724999484,
-        "narHash": "sha256-AIR8uYGteWS/RyHyZJAHQAUEJ/Mv4ktkPe2mzbJ2zCE=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "e3bb9176e807e2b166d54153ce8caea5cb2c6700",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
-    "fenix_3": {
       "inputs": {
         "nixpkgs": "nixpkgs_7",
-        "rust-analyzer-src": "rust-analyzer-src_3"
+        "rust-analyzer-src": "rust-analyzer-src_2"
       },
       "locked": {
         "lastModified": 1722493751,
@@ -333,22 +246,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -364,7 +261,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -380,7 +277,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -396,7 +293,7 @@
         "type": "github"
       }
     },
-    "flake-compat_5": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -412,7 +309,7 @@
         "type": "github"
       }
     },
-    "flake-compat_6": {
+    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -428,7 +325,7 @@
         "type": "github"
       }
     },
-    "flake-compat_7": {
+    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -444,7 +341,7 @@
         "type": "github"
       }
     },
-    "flake-compat_8": {
+    "flake-compat_7": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -503,16 +400,16 @@
     },
     "flake-schemas": {
       "locked": {
-        "lastModified": 1693491534,
-        "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=",
-        "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279",
-        "revCount": 21,
+        "lastModified": 1721999734,
+        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
+        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
+        "revCount": 75,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz"
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
       }
     },
     "flake-utils": {
@@ -538,7 +435,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -556,7 +453,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -574,7 +471,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -592,7 +489,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -660,11 +557,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "lastModified": 1725893417,
+        "narHash": "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "10541f19c584fe9633c921903d8c095d5411e041",
         "type": "github"
       },
       "original": {
@@ -680,11 +577,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1725948275,
+        "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe",
         "type": "github"
       },
       "original": {
@@ -700,7 +597,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1722623071,
@@ -752,7 +649,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_7"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1725204025,
@@ -776,15 +673,15 @@
         "hyprutils": "hyprutils_3",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs_4",
-        "systems": "systems_8",
+        "systems": "systems_7",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1725219211,
-        "narHash": "sha256-17WA01XfBTuH1CJdGje3095K/7RUUL6lwQHEFq9t2Go=",
+        "lastModified": 1725976150,
+        "narHash": "sha256-Dv4XEWRcVFZhBDbj11/zuuXyf7TGHFVU1IGH9W/yPX8=",
         "ref": "refs/heads/main",
-        "rev": "6934e7aa2b300bc4565855a4092fb34de8a9a8d2",
-        "revCount": 5178,
+        "rev": "155d44016d0cb11332c454db73d59030cdbd7b13",
+        "revCount": 5209,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -967,7 +864,7 @@
           "xdph",
           "nixpkgs"
         ],
-        "systems": "systems_14"
+        "systems": "systems_13"
       },
       "locked": {
         "lastModified": 1725188252,
@@ -990,14 +887,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
-        "lastModified": 1725203994,
-        "narHash": "sha256-N7Kfq8tpOWjtRKBnH5RqcDtQFGZPZ5vXgmxbnZVPCuU=",
+        "lastModified": 1725535663,
+        "narHash": "sha256-hsvbU1utffVOFTRa3arPepv8en42VltR33L72vK3QVo=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763",
+        "rev": "153977aab35a72f3e142e32aed6b268b659d18e1",
         "type": "github"
       },
       "original": {
@@ -1169,11 +1066,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724999205,
-        "narHash": "sha256-Lc9kb5hhUohcJlUye5Pu8BNYHDPIOUtejYySTvHTlio=",
+        "lastModified": 1725600800,
+        "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "a14f978f74e89213a5f565f827454dd6178b2bb5",
+        "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb",
         "type": "github"
       },
       "original": {
@@ -1184,8 +1081,8 @@
     },
     "lanzaboote": {
       "inputs": {
-        "crane": "crane_2",
-        "flake-compat": "flake-compat_4",
+        "crane": "crane",
+        "flake-compat": "flake-compat_3",
         "flake-parts": [
           "flake-parts"
         ],
@@ -1196,11 +1093,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1722329086,
-        "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=",
+        "lastModified": 1725379389,
+        "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a",
+        "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871",
         "type": "github"
       },
       "original": {
@@ -1211,7 +1108,7 @@
     },
     "nix": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "devenv",
           "cachix",
@@ -1322,18 +1219,18 @@
     },
     "nix-vscode-extensions": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1725241396,
-        "narHash": "sha256-b4YfdCTuVLmrTGt8M44T+k0+rwRhBDXYKPhQR9o6LxU=",
+        "lastModified": 1725932651,
+        "narHash": "sha256-TQXR4UbFegmFqOTmD1zvhlsKecZUcRmI+lKFh4yM+8M=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "36fbe64e2b1b879871d896e94d560691ec88c08b",
+        "rev": "fd9e191cbc65896105d9eb0647a6023b631a12e4",
         "type": "github"
       },
       "original": {
@@ -1371,11 +1268,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1725634671,
+        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
         "type": "github"
       },
       "original": {
@@ -1387,11 +1284,11 @@
     },
     "nixpkgs-edge": {
       "locked": {
-        "lastModified": 1725274606,
-        "narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=",
+        "lastModified": 1725946965,
+        "narHash": "sha256-tt4Z99aNEuqEERF4H1TZ1t6GH/nU8A869mtgGVZIdfE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98",
+        "rev": "28e9b6d60ffd048dbbfbce525f8ab5bd726a22c3",
         "type": "github"
       },
       "original": {
@@ -1402,11 +1299,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1725294213,
-        "narHash": "sha256-mtEDY1u6xlw3xRBELGL/X0Su56x6TKxho9k5rDC20SA=",
+        "lastModified": 1725992268,
+        "narHash": "sha256-ONzL/eBFp2v5xLX3UQSLy1dczIvdvmEw7DkduCtW6TE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6df34e21fb2730c45f820dc2d733076ae6976dad",
+        "rev": "d77ecc757ace937c1a677f290bc52adbaf212251",
         "type": "github"
       },
       "original": {
@@ -1529,11 +1426,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725634671,
+        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
         "type": "github"
       },
       "original": {
@@ -1544,11 +1441,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725634671,
+        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
         "type": "github"
       },
       "original": {
@@ -1576,11 +1473,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1725293221,
-        "narHash": "sha256-pdR2NeX9O/OQ687HvkKvpdAiUNHFRgi2VzVpIhdPdF8=",
+        "lastModified": 1725990395,
+        "narHash": "sha256-Sfg6DPQ11wf2lUCv20CwIpWig0BVR/h/bmO4EWNGNZw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c862b37c18f59067fb6583dd80b75596a3ff3457",
+        "rev": "c463727bffa9bcaec18cc8bbd2226e220aba751b",
         "type": "github"
       },
       "original": {
@@ -1622,8 +1519,8 @@
           "pyprland",
           "nixpkgs"
         ],
-        "systems": "systems_12",
-        "treefmt-nix": "treefmt-nix_2"
+        "systems": "systems_11",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
         "lastModified": 1718881664,
@@ -1696,12 +1593,12 @@
     },
     "pyprland": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_5",
         "nixpkgs": [
           "nixpkgs"
         ],
         "poetry2nix": "poetry2nix_2",
-        "systems": "systems_13"
+        "systems": "systems_12"
       },
       "locked": {
         "lastModified": 1724658681,
@@ -1720,7 +1617,6 @@
     "root": {
       "inputs": {
         "ags": "ags",
-        "bcachefs-tools": "bcachefs-tools",
         "browser-previews": "browser-previews",
         "chaotic": "chaotic",
         "devenv": "devenv",
@@ -1747,11 +1643,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1722262053,
-        "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=",
+        "lastModified": 1725630423,
+        "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853",
+        "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d",
         "type": "github"
       },
       "original": {
@@ -1762,23 +1658,6 @@
       }
     },
     "rust-analyzer-src_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724937894,
-        "narHash": "sha256-M/28TIG+fm5x3GtQ6qSGDw1NHS4nHttz0DM7JcDs4g8=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "0ae42bd42576566540a84c62e118aa823edcf2ec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
-    "rust-analyzer-src_3": {
       "flake": false,
       "locked": {
         "lastModified": 1722449213,
@@ -1847,21 +1726,6 @@
       }
     },
     "systems_11": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_12": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1875,7 +1739,7 @@
         "type": "indirect"
       }
     },
-    "systems_13": {
+    "systems_12": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1890,7 +1754,7 @@
         "type": "github"
       }
     },
-    "systems_14": {
+    "systems_13": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1905,7 +1769,7 @@
         "type": "github"
       }
     },
-    "systems_15": {
+    "systems_14": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1936,21 +1800,6 @@
       }
     },
     "systems_3": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1965,7 +1814,7 @@
         "type": "github"
       }
     },
-    "systems_5": {
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1980,7 +1829,7 @@
         "type": "github"
       }
     },
-    "systems_6": {
+    "systems_5": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1995,7 +1844,7 @@
         "type": "github"
       }
     },
-    "systems_7": {
+    "systems_6": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -2010,7 +1859,7 @@
         "type": "github"
       }
     },
-    "systems_8": {
+    "systems_7": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -2025,7 +1874,7 @@
         "type": "github"
       }
     },
-    "systems_9": {
+    "systems_8": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -2040,28 +1889,22 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "bcachefs-tools",
-          "nixpkgs"
-        ]
-      },
+    "systems_9": {
       "locked": {
-        "lastModified": 1722330636,
-        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
+    "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
           "pyprland",
@@ -2088,11 +1931,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1725264806,
-        "narHash": "sha256-Ppllpr+CZQJUR7ORG5CCEdWiUogqmdrHuKezyf5zt8w=",
+        "lastModified": 1725905797,
+        "narHash": "sha256-aP17SCANSqxgzRT5rXNm+kGdCGGGH8UbIhlcaJeT42c=",
         "owner": "e-tho",
         "repo": "ucodenix",
-        "rev": "e194a31fd97e7e831db7e22837c339d776a6585d",
+        "rev": "433133cde831057eaced397d40824f43b982218b",
         "type": "github"
       },
       "original": {
@@ -2103,8 +1946,8 @@
     },
     "wallust": {
       "inputs": {
-        "fenix": "fenix_3",
-        "flake-compat": "flake-compat_7",
+        "fenix": "fenix_2",
+        "flake-compat": "flake-compat_6",
         "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
@@ -2127,17 +1970,17 @@
     },
     "waybar": {
       "inputs": {
-        "flake-compat": "flake-compat_8",
+        "flake-compat": "flake-compat_7",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1724670643,
-        "narHash": "sha256-XHE2Ix3JQ625Le1H8klJidhlOM9trJImlVJ8qkqH7SA=",
+        "lastModified": 1725946636,
+        "narHash": "sha256-UbVApb+B5QyOl+zrc2oKQ6+M5aKRiw3EotrjxzUfp9A=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "5d184f74d8f99b834ea19ce353a68786c8602a15",
+        "rev": "6560e32bc1fd3c777d7094b2033a4358a98ca0ee",
         "type": "github"
       },
       "original": {
@@ -2163,11 +2006,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725203932,
-        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+        "lastModified": 1725228143,
+        "narHash": "sha256-kbSiPA5oXiz1+1eVoRslMi5wylHD6SDT8dS9eZAxXAM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+        "rev": "11e15b437e7efc39e452f36e15a183225d6bfa39",
         "type": "github"
       },
       "original": {
@@ -2183,7 +2026,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_15"
+        "systems": "systems_14"
       },
       "locked": {
         "lastModified": 1725228143,
@@ -2198,31 +2041,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "yafas": {
-      "inputs": {
-        "flake-schemas": [
-          "chaotic",
-          "flake-schemas"
-        ],
-        "systems": [
-          "chaotic",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1695926485,
-        "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=",
-        "owner": "UbiqueLambda",
-        "repo": "yafas",
-        "rev": "7772afd6686458ca0ddbc599a52cf5d337367653",
-        "type": "github"
-      },
-      "original": {
-        "owner": "UbiqueLambda",
-        "repo": "yafas",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 30eb844f..933de991 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,11 +64,6 @@
     };
 
     ## MISC PACKAGES ##
-    bcachefs-tools = {
-      url = "github:koverstreet/bcachefs-tools";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
 
     ucodenix.url = "github:e-tho/ucodenix";
     browser-previews = {
diff --git a/flake/hosts.nix b/flake/hosts.nix
index 894c342b..c40eff6f 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -47,7 +47,7 @@ in {
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = true;
-              # backupFileExtension = ".hm.bak";
+              backupFileExtension = ".hm.bak";
               extraSpecialArgs =
                 specialArgs
                 // {
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 5a916968..b1b64dcb 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -19,7 +19,6 @@
       ./git.nix # git config
       ./alacritty.nix
       ./vscode.nix
-      ./devenv.nix # development environment
       ./cli-tools.nix # Useful CLI tools
       # ./thunar.nix
 
diff --git a/home-manager/devenv.nix b/home-manager/devenv.nix
deleted file mode 100644
index 733c6658..00000000
--- a/home-manager/devenv.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contains devenv and direnv settings
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
-  # Enable devenv
-  home.packages = [pkgs.devenv];
-  # Configure direnv
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-  home.sessionVariables = lib.mkIf (config.programs.direnv.enable) {
-    DIRENV_LOG_FORMAT = ""; # silence direnv logs
-  };
-}
diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
index 31522b0d..3670eb44 100644
--- a/modules-overlays/default.nix
+++ b/modules-overlays/default.nix
@@ -8,10 +8,4 @@
   imports = [
     #./amdgpu.nix # import modules here to test
   ];
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
-    })
-  ];
 }
diff --git a/pkgs/settings.nix b/pkgs/settings.nix
index 36797467..3ac19c8a 100644
--- a/pkgs/settings.nix
+++ b/pkgs/settings.nix
@@ -1,23 +1,33 @@
-{pkgs, ...}: {
-  # Enable aarch64-linux cross-compilation and running those binaries
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+# This config file is used to define system/global packages
+# this file is imported ../configuration.nix
+# User specific packages should be installed in ./user-packages.nix
+# Some packages/apps maybe handled by config options
+# They are scattered in ../system/ ../home-manager/ and ../programs/ directories
+{
+  self,
+  pkgs,
+  pkgs-edge,
+  inputs,
+  ...
+}: {
+  environment.systemPackages =
+    (with pkgs; [
+      # System Packages
+      git # obviously
+      openssh # for ssh
 
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-    package = pkgs.appimage-run.override {
-      # Extra libraries and packages for Appimage run
-      extraPkgs = pkgs:
-        with pkgs; [
-          ffmpeg
-          imagemagick
-        ];
-    };
-  };
+      ## URL FETCH TOOLS ##
+      curl
+      wget
 
-  # enable flatpak support
-  # flatpak configured via nix-flatpak flake modules
-  # which allows installing flatpak packages declaratively
-  # install flatpak packages in ./global-packages.nix or ./user-packages.nix
-  services.flatpak.enable = true;
+      #(callPackage ./gparted-wrapper.nix {})
+    ])
+    ++ (with pkgs-edge; [
+      # list of latest packages from nixpkgs master
+      # Can be used to install latest version of some packages
+    ])
+    ++ [
+      self.packages.${pkgs.system}.fhs-shell
+    ];
+  services.flatpak.packages = (import ./flatpak-packages.nix).systemPackages;
 }
diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix
index ac82f43c..20bda33b 100644
--- a/pkgs/user-packages.nix
+++ b/pkgs/user-packages.nix
@@ -72,8 +72,6 @@
       # ani-cli # watch anime in terminal!
 
       ## MONITORING TOOLS ##
-      btop # for CPU, RAM, and Disk monitoring
-      nvtopPackages.amd # for AMD GPUs
       #iotop # for disk I/O monitoring
       #iftop # for network I/O monitoring
 
@@ -81,13 +79,11 @@
       # Editors #
       # emacs
 
+      devenv
+
       # IDEs #
       android-studio
-      (jetbrains.plugins.addPlugins jetbrains.phpstorm [
-        "github-copilot"
-        "nixidea"
-      ])
-      (jetbrains.plugins.addPlugins jetbrains.rust-rover [
+      (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
         "github-copilot"
         "nixidea"
       ])
diff --git a/preferences.nix b/preferences.nix
index bcc773fe..12260a91 100644
--- a/preferences.nix
+++ b/preferences.nix
@@ -6,7 +6,7 @@
     timezone = "Asia/Kolkata"; # select timezone
     locale = "en_US.UTF-8"; # select locale
     localeoverride = "en_IN";
-    stableversion = "24.05";
+    stableversion = "24.11";
     secureboot = true;
     laptop = false;
   };
@@ -28,5 +28,7 @@
     containers = false;
     tpm = false;
     virtualisation = false;
+    printing = false;
+    apparmor = false;
   };
 }
diff --git a/programs/kde-connect.nix b/programs/kde-connect.nix
deleted file mode 100644
index 2618b5cf..00000000
--- a/programs/kde-connect.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  # No firewall configuration needed, handled by this option
-  programs.kdeconnect.enable = true;
-}
diff --git a/programs/neovim.nix b/programs/neovim.nix
index eefcfcaa..0d10679f 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   programs.neovim = {
     enable = true; # Enable Neovim
     vimAlias = true; # Enable vim alias
diff --git a/system/boot/boot-options.nix b/system/boot/boot-options.nix
index 6ff44db4..4909f562 100644
--- a/system/boot/boot-options.nix
+++ b/system/boot/boot-options.nix
@@ -1,51 +1,9 @@
-# This conf file is used to configure boot
 {
-  config,
-  lib,
-  pkgs,
-  servicesSettings,
-  ...
-}: {
-  # Enable systemd-boot
+  # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
-  # Bootspec needed for secureboot
-  boot.bootspec.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   # bootloader timeout set, also press t repeatedly in the bootmenu to set there
   boot.loader.timeout = 15;
-  # use systemd initrd instead of udev
-  boot.initrd.systemd.enable = true;
-  boot.initrd.systemd.dbus.enable = true;
-
-  # boot.consoleLogLevel = 0; # configure silent boot
-  boot.kernelParams =
-    [
-      "nohibernate" # disable hibernate, can't on zram swap, also skips lockscreen/login manager so not secure
-      # "acpi_enforce_resources=lax" # openrgb
-      # "quiet"
-      # "udev.log_level=3"
-      # "lockdown=integrity"
-
-      # Masking the following units reduces boot time
-      # vconsole fails most of the time anyway
-      "systemd.mask=systemd-vconsole-setup.service"
-    ]
-    ++ lib.optionals (!servicesSettings.tpm) [
-      # if tpm service is disabled lets mask the service
-      # this also reduces boot time
-      "systemd.mask=dev-tpmrm0.device"
-    ];
-
-  # plymouth theme for splash screen
-  boot.plymouth = {
-    enable = true;
-    # theme = "breeze"; # default
-    # black_hud circle_hud cross_hud square_hud
-    # circuit connect cuts_alt seal_2 seal_3
-    theme = "matrix";
-    themePackages = [
-      #(pkgs.adi1090x-plymouth-themes.override {selected_themes = ["rings_2"];})
-      pkgs.plymouth-matrix-theme
-    ];
-  };
+  # Bootspec needed for secureboot
+  boot.bootspec.enable = true;
 }
diff --git a/system/boot/kernel.nix b/system/boot/kernel.nix
index b0b00252..f554ad36 100644
--- a/system/boot/kernel.nix
+++ b/system/boot/kernel.nix
@@ -5,10 +5,5 @@
   pkgs-edge,
   ...
 }: {
-  boot.kernelPackages = pkgs-edge.linuxPackages_xanmod_latest;
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    # zenpower is used for reading temperature, voltage, current and power
-    zenpower
-  ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/system/boot/lanzaboote.nix b/system/boot/lanzaboote.nix
index 4f1378fc..3b7c3b35 100644
--- a/system/boot/lanzaboote.nix
+++ b/system/boot/lanzaboote.nix
@@ -13,6 +13,7 @@
     pkiBundle = "/etc/secureboot";
   };
 
-  # enable sbctl - a frontend to create, enroll manage keys
-  environment.systemPackages = [pkgs.sbctl];
+  # sbctl - a frontend to create, enroll manage keys
+  # just need once for importing secureboot keys
+  # environment.systemPackages = [pkgs.sbctl];
 }
diff --git a/system/default.nix b/system/default.nix
index 2b25eaf8..dce88c98 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -31,6 +31,8 @@
       ./services
       # include specializations
       ./safe-specialization.nix
+
+      ./shell/direnv.nix
     ]
     ++
     # Configure secure boot with lanzaboote, if secureboot is enabled
diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix
index 27891556..d05e51a6 100644
--- a/system/hardware/audio.nix
+++ b/system/hardware/audio.nix
@@ -1,16 +1,15 @@
 # This conf file is used to configure audio and sound related settings
 {...}: {
-  # Enable sound with pipewire, don't enable pulseaudio.
+  # Enable sound via pipewire
   services.pipewire = {
     enable = true;
-    alsa.enable = true; # alsa support
-    alsa.support32Bit = true;
-    pulse.enable = true; # pulseaudio compat
-    jack.enable = true; # enable jack audio
+    pulse.enable = true;
   };
+
   # Enable rtkit for real-time scheduling, required for pipewire
   security.rtkit.enable = true;
 
+  /*
   # Enable low latency
   services.pipewire.extraConfig.pipewire."92-low-latency" = {
     "context.properties" = {
@@ -41,4 +40,5 @@
       "resample.quality" = 1;
     };
   };
+  */
 }
diff --git a/system/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
index bb155bf8..843a89f1 100644
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -2,7 +2,7 @@
 {...}: {
   hardware.bluetooth = {
     enable = true; # enables support for Bluetooth
-    powerOnBoot = true; # powers up the default Bluetooth controller on boot
+    # powerOnBoot = true; # powers up the default Bluetooth controller on boot
     settings.General = {
       Experimental = true; # enable bluetooth battery percentage features
       KernelExperimental = true;
diff --git a/system/hardware/disk.nix b/system/hardware/disk.nix
index 7e45e98c..5623bf54 100644
--- a/system/hardware/disk.nix
+++ b/system/hardware/disk.nix
@@ -1,19 +1,5 @@
 # Configure disks and zram
 {pkgs, ...}: {
-  # Enable support for bcachefs
-  boot.supportedFilesystems = ["bcachefs"];
-
-  fileSystems = {
-    "/".options = [
-      "defaults"
-      "noatime"
-    ]; # disable access time updates
-    "/boot".options = [
-      "fmask=0137"
-      "dmask=0027"
-    ]; # restrict access to /boot
-  };
-
   # Enable zram swap
   zramSwap = {
     enable = true;
diff --git a/system/hardware/graphics.nix b/system/hardware/graphics.nix
index f9bd675b..9d3818f4 100644
--- a/system/hardware/graphics.nix
+++ b/system/hardware/graphics.nix
@@ -9,7 +9,6 @@
 in {
   hardware.amdgpu = {
     initrd.enable = true;
-    legacySupport.enable = true;
     # disabled to use a mix of pocl and rocm below
     opencl.enable = false;
   };
@@ -61,10 +60,13 @@ in {
   environment.systemPackages =
     (with pkgs; [
       ## GRAPHICS UTILS ##
+      /*
+         NOT NEEDED UNLESS WE NEED TESTING
       clinfo # OpenCL hardware information
       libva-utils # libva graphics library tools
       vdpauinfo # vdpau graphics library tools
       vulkan-tools # vulkan graphics library tools
+      */
     ])
     ++ (with nur-amdgpu; [
       amdgpu-pro-libs.prefixes
diff --git a/system/hyprland/default.nix b/system/hyprland/default.nix
index cccd11cc..5e7b188f 100644
--- a/system/hyprland/default.nix
+++ b/system/hyprland/default.nix
@@ -140,6 +140,10 @@ in {
       hyprcursor
       pyprland # hyprland plugin, dropdown term, etc
       ags # widgets pipup
+
+      ## MONITORING TOOLS ##
+      btop # for CPU, RAM, and Disk monitoring
+      nvtopPackages.amd # for AMD GPUs
     ])
     ++ [
       self.packages.${pkgs.system}.weather-python-script # weather script
diff --git a/system/network.nix b/system/network.nix
index 40390069..1a8bc24d 100644
--- a/system/network.nix
+++ b/system/network.nix
@@ -2,6 +2,7 @@
 {...}: {
   # Enable WIFI, Ethernet, ...
   networking.networkmanager.enable = true;
+  /*
   networking.networkmanager.wifi.backend = "iwd"; # newer backend
 
   services.resolved.enable = true; # enable systemd-resolved
@@ -13,6 +14,7 @@
     "1.1.1.1" # Cloudflare DNS
     "1.0.0.1"
   ];
+  */
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/system/printing.nix b/system/printing.nix
index b3f7d9a9..c3b4a888 100644
--- a/system/printing.nix
+++ b/system/printing.nix
@@ -6,10 +6,10 @@
   ...
 }: {
   # Enable CUPS to print documents.
-  services.printing = {
+  services.printing = lib.mkIf servicesSettings.printing {
     enable = true;
     # cups-pdf.enable = true; # Enable seperate PDF printing virtual printer
-    # openFirewall = true; # Open ports for printing
+    openFirewall = true; # Open ports for printing
   };
   # Enable Avahi to discover printers, and LAN devices
   services.avahi = lib.mkIf servicesSettings.avahi {
diff --git a/system/services/default.nix b/system/services/default.nix
index 3245a34d..b07ec0ee 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -10,12 +10,12 @@
   imports =
     [
       ./ananicy-cpp.nix
-      ./apparmor.nix
       ./console-tty.nix
       ./gnome-keyring.nix
       ./gnupg-ssh.nix
     ]
-    ++ lib.optionals servicesSettings.containers [./containers.nix];
+    ++ lib.optionals servicesSettings.containers [./containers.nix]
+    ++ lib.optionals servicesSettings.apparmor [./apparmor.nix];
 
   ## Essential services ##
   # Enable xserver with xwayland
diff --git a/system/shell/direnv.nix b/system/shell/direnv.nix
new file mode 100644
index 00000000..7f2f374a
--- /dev/null
+++ b/system/shell/direnv.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  programs.direnv = {
+    enable = true;
+    silent = true;
+  };
+}
diff --git a/system/users.nix b/system/users.nix
index f4f55377..cc8cb402 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -8,7 +8,6 @@
   inputs,
   ...
 }: {
-  imports = [inputs.home-manager.nixosModules.default];
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.${userSettings.username} = {
     isNormalUser = true;
diff --git a/wallpapers/CuteCat.png b/wallpapers/CuteCat.png
deleted file mode 100644
index cb1ded53..00000000
Binary files a/wallpapers/CuteCat.png and /dev/null differ
diff --git a/wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg b/wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg
deleted file mode 100644
index ad1eed8a..00000000
Binary files a/wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg and /dev/null differ
diff --git a/wallpapers/Dynamic-Wallpapers/Light/highway_light.jpg b/wallpapers/Dynamic-Wallpapers/Light/highway_light.jpg
deleted file mode 100644
index daee0ca8..00000000
Binary files a/wallpapers/Dynamic-Wallpapers/Light/highway_light.jpg and /dev/null differ
diff --git a/wallpapers/Fantasy-Landscape.png b/wallpapers/Fantasy-Landscape.png
deleted file mode 100644
index 79e13088..00000000
Binary files a/wallpapers/Fantasy-Landscape.png and /dev/null differ
diff --git a/wallpapers/anime-girl-abyss.png b/wallpapers/anime-girl-abyss.png
deleted file mode 100644
index 6871f0e7..00000000
Binary files a/wallpapers/anime-girl-abyss.png and /dev/null differ