diff --git a/flake.lock b/flake.lock
index aabfeb1..4706649 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,15 +8,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1675282109,
+        "lastModified": 1675550670,
         "narHash": "sha256-0XuyVuT3OowRiQyzuvFl6PvxLMqmIjtInBzu7Oxmrk8=",
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "fetch-rs",
-        "rev": "764f96781597de3130c54624340b9ee26d19aca3",
+        "rev": "aca3e2db71a9b11b0201fd609d0be6b8eeac86ed",
         "type": "github"
       },
       "original": {
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "fetch-rs",
         "type": "github"
       }
@@ -51,27 +51,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1675462931,
-        "narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1675454231,
@@ -98,13 +77,13 @@
       "locked": {
         "lastModified": 1675536108,
         "narHash": "sha256-HjWJ7HF77U32QLsRWZGrrZXW3lnq7iYPZ6as+Je5dwQ=",
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "nvim-config",
         "rev": "cda439a36bf6677fe4c8ebddf7e59e2df2742059",
         "type": "github"
       },
       "original": {
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "nvim-config",
         "type": "github"
       }
@@ -112,7 +91,6 @@
     "root": {
       "inputs": {
         "fetch-rs": "fetch-rs",
-        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nvim-config": "nvim-config",
         "spicetify-nix": "spicetify-nix",
@@ -127,15 +105,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1674530093,
-        "narHash": "sha256-iOV4gzi/ZXU1wNjsCmwAgi2ziqGWGTXQjJUiWVEkb44=",
-        "owner": "the-argus",
+        "lastModified": 1675557167,
+        "narHash": "sha256-L1PZV1sYymzyklrluQ39J0yJQDPIv6W7eMogwv4hoOY=",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "f551a7485fc4d6021583fd274f7f040b23799a7e",
+        "rev": "b32952b5928c9ea74882c6e7889d6393e9336b9d",
         "type": "github"
       },
       "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
         "type": "github"
       }
@@ -149,13 +127,13 @@
       "locked": {
         "lastModified": 1674960943,
         "narHash": "sha256-BotT9GZYgOxXUJwkL4bDmqhjESlpx7Q2BTS2iWMK+Z4=",
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "suckless",
         "rev": "efe8a86ab187163c83cb2a7833e5558b2f41ca4e",
         "type": "github"
       },
       "original": {
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "suckless",
         "type": "github"
       }
@@ -169,31 +147,16 @@
       "locked": {
         "lastModified": 1674954890,
         "narHash": "sha256-KRgIRX66funp1WdPeiKvHLZeMPoV7+0rkkzTC2MiGFk=",
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "sxhkd-flake",
         "rev": "0c4fd3eb98f8ac5b4e5168c529c0c6d0e70de690",
         "type": "github"
       },
       "original": {
-        "owner": "ISnortPennies",
+        "owner": "Gerg-L",
         "repo": "sxhkd-flake",
         "type": "github"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 5274aa9..c6399d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,28 +1,24 @@
 {
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
-    home-manager = {
-      url = github:nix-community/home-manager;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     spicetify-nix = {
-      url = github:the-argus/spicetify-nix;
+      url = github:Gerg-L/spicetify-nix;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     suckless = {
-      url = github:ISnortPennies/suckless;
+      url = github:Gerg-L/suckless;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nvim-config = {
-      url = github:ISnortPennies/nvim-config;
+      url = github:Gerg-L/nvim-config;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sxhkd-flake = {
-      url = github:ISnortPennies/sxhkd-flake;
+      url = github:Gerg-L/sxhkd-flake;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fetch-rs = {
-      url = github:ISnortPennies/fetch-rs;
+      url = github:Gerg-L/fetch-rs;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -62,8 +58,6 @@
         };
         modules = [
           inputs.sxhkd-flake.nixosModules.sxhkd
-          inputs.home-manager.nixosModules.home-manager
-          ./home-manager
           ./common.nix
           ./systems/desktop.nix
           ./nix.nix
@@ -80,8 +74,6 @@
           };
         };
         modules = [
-          inputs.home-manager.nixosModules.home-manager
-          ./home-manager
           ./common.nix
           ./systems/laptop.nix
           ./nix.nix
diff --git a/home-manager/default.nix b/home-manager/default.nix
deleted file mode 100644
index 9efdeba..0000000
--- a/home-manager/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  settings,
-  lib,
-  inputs,
-  ...
-}: {
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = false;
-    extraSpecialArgs = {inherit inputs settings;};
-    users = {
-      ${settings.username} = {
-        imports =
-          [
-            ./spicetify.nix
-          ];
-        xsession.numlock.enable = true;
-        home = {
-          homeDirectory = "/home/${settings.username}";
-          stateVersion = settings.version;
-        };
-      };
-    };
-  };
-}
diff --git a/home-manager/spicetify.nix b/modules/spicetify.nix
similarity index 95%
rename from home-manager/spicetify.nix
rename to modules/spicetify.nix
index 607c2ab..ce0aa6f 100644
--- a/home-manager/spicetify.nix
+++ b/modules/spicetify.nix
@@ -6,7 +6,7 @@
   sp-nix = inputs.spicetify-nix;
   spicePkgs = sp-nix.packages.${pkgs.system}.default;
 in {
-  imports = [sp-nix.homeManagerModule];
+  imports = [sp-nix.nixosModule];
   programs.spicetify = {
     spotifyPackage = pkgs.spotify-unwrapped;
     spicetifyPackage = pkgs.spicetify-cli;
diff --git a/nix.nix b/nix.nix
index 3b3bf96..9a54fdc 100644
--- a/nix.nix
+++ b/nix.nix
@@ -1,25 +1,19 @@
 {
   inputs,
   lib,
+  config,
   ...
 }: {
   environment.etc = {
     "nix/flake-channels/system".source = inputs.self;
     "nix/flake-channels/nixpkgs".source = inputs.nixpkgs.outPath;
-    "nix/flake-channels/home-manager".source = inputs.home-manager.outPath;
   };
   nix = {
-    nixPath = [
-      "nixpkgs=/etc/nix/flake-channels/nixpkgs"
-      "home-manager=/etc/nix/flake-channels/home-manager"
-    ];
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
     #automatically get registry from input flakes
     registry =
-      {
-        system.flake = inputs.self;
-        default.flake = inputs.nixpkgs;
-      }
-      // lib.attrsets.mapAttrs (
+      lib.attrsets.mapAttrs (
         _: source: {
           flake = source;
         }
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 81d7607..bab8c7b 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -18,6 +18,7 @@
       "sxhkd"
       "theme"
       "vfio"
+      "spicetify"
       #"mining"
     ];
   in