diff --git a/flake.lock b/flake.lock
index 3e104ae..ff1f4d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,24 +21,6 @@
         "type": "github"
       }
     },
-    "catppuccin": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1748080874,
-        "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -134,26 +116,6 @@
       }
     },
     "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748737919,
-        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "zen-browser",
@@ -226,22 +188,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1748162331,
         "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
@@ -257,7 +203,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1682134069,
         "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -274,10 +220,8 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "catppuccin": "catppuccin",
-        "home-manager": "home-manager_2",
         "lix-module": "lix-module",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "vscode-server": "vscode-server",
         "zen-browser": "zen-browser"
       }
@@ -330,7 +274,7 @@
     "vscode-server": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1729422940,
@@ -348,7 +292,7 @@
     },
     "zen-browser": {
       "inputs": {
-        "home-manager": "home-manager_3",
+        "home-manager": "home-manager_2",
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index d9e3bfe..6a6f201 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,15 +13,9 @@
       url = "github:0xc000022070/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    catppuccin.url = "github:catppuccin/nix";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = inputs@{ self, nixpkgs, lix-module, vscode-server, agenix, zen-browser, catppuccin, home-manager, ... }: {
+  outputs = { self, nixpkgs, lix-module, vscode-server, agenix, zen-browser } @ inputs: {
     nixosConfigurations = {
       focalor = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -38,18 +32,6 @@
             services.vscode-server.nodejsPackage = pkgs.nodejs_20;
             environment.systemPackages = [ agenix.packages.x86_64-linux.default ];
           })
-
-          catppuccin.nixosModules.catppuccin
-
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.backupFileExtension = "HMBackup";
-            home-manager.users.regent.imports = [
-              ./home/regent/home.nix
-              catppuccin.homeManagerModules.catppuccin
-            ];
-            home-manager.extraSpecialArgs = { inherit inputs; system = "x86_64-linux";};
-          }
         ];
       };
 
diff --git a/home/regent/home.nix b/home/regent/home.nix
deleted file mode 100644
index 2b1e582..0000000
--- a/home/regent/home.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, pkgs, system, inputs, ... }:
-
-{
-  home.username = "regent";
-  home.homeDirectory = "/home/regent";
-
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    accent = "blue";
-  };
-
-  programs.waybar = {
-    enable = true;
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        height = 30;
-        output = [
-          "HDMI-A-1"
-          "DP-2"
-        ];
-        modules-left = [ "sway/workspaces" "sway/mode" "wlr/taskbar" ];
-        modules-center = [ "sway/window" ];
-        modules-right = [ "mpd" ];
-
-        "sway/workspaces" = {
-          disable-scroll = true;
-          all-outputs = true;
-        };
-      };
-    };
-  };
-
-  home.stateVersion = "25.05";
-}
\ No newline at end of file
diff --git a/modules/desktop/core.nix b/modules/desktop/core.nix
index cad4382..31e9485 100644
--- a/modules/desktop/core.nix
+++ b/modules/desktop/core.nix
@@ -6,8 +6,8 @@
     kitty
     vscode
     inputs.zen-browser.packages."${system}".default
+    neofetch
     fastfetch
-    hyfetch 
     sway-contrib.grimshot
     discord
   ];
diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix
index 0f074ae..af502bf 100644
--- a/modules/desktop/sway.nix
+++ b/modules/desktop/sway.nix
@@ -2,7 +2,6 @@
 {
   environment.systemPackages = with pkgs; [
     grim
-    sway-contrib.grimshot
     wl-clipboard
     mako
   ];