changes 8

common/desktop.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, home-manager, ...}:
+{ lib, config, pkgs, ...}:
 
 let
   customPolybar = pkgs.polybar.override {
@@ -7,7 +7,6 @@ let
   };
 in {
   imports = [
-    home-manager.nixosModules.default
     ./main.nix
   ];
 
@@ -178,75 +177,6 @@ in {
     fi
   '';
 
-  home-manager.users.usr = {
-    home.stateVersion = "23.05";
-
-    programs.neovim = {
-      enable = true;
-      extraLuaPackages = luaPkgs: with luaPkgs; [ luaexpat ];
-      extraPackages = [ pkgs.sqlite ];
-    };
-
-    home.file = {
-      ".config/bash" = {
-        source = ../config/bash;
-        recursive = true;
-      };
-      ".config/bspwm" = {
-        source = ../config/bspwm;
-        recursive = true;
-      };
-      ".config/git" = {
-        source = ../config/git;
-        recursive = true;
-      };
-      ".config/htop" = {
-        source = ../config/htop;
-        recursive = true;
-      };
-      ".config/nvim" = {
-        source = ../config/nvim;
-        recursive = true;
-      };
-      ".config/python" = {
-        source = ../config/python;
-        recursive = true;
-      };
-      ".config/polybar" = {
-        source = ../config/polybar;
-        recursive = true;
-      };
-      ".config/sx" = {
-        source = ../config/sx;
-        recursive = true;
-      };
-      ".config/sxhkd" = {
-        source = ../config/sxhkd;
-        recursive = true;
-      };
-      ".config/tridactyl" = {
-        source = ../config/tridactyl;
-        recursive = true;
-      };
-      ".config/zathura" = {
-        source = ../config/zathura;
-        recursive = true;
-      };
-      ".local/share/wallpapers" = {
-        source = ../wallpapers;
-        recursive = true;
-      };
-      ".local/share/gnupg" = {
-        source = ../config/gnupg;
-        recursive = true;
-      };
-      ".config/emacs" = {
-        source = ../config/emacs;
-        recursive = true;
-      };
-    };
-  };
-
   environment.etc = {
     "profile.local" = {
       text = "source /home/usr/.config/bash/profile";

common/main.nix

@@ -32,6 +32,5 @@ in {
     (pkgs.callPackage ../builds/rebuild.nix {})
   ];
 
-  system.copySystemConfiguration = true;
   system.stateVersion = "23.11"; # don't change this, lol
 }

common/testing.nix

@@ -0,0 +1,5 @@
+{ lib, config, pkgs, home-manager, ...}:
+
+{
+  home
+

flake.nix

@@ -13,13 +13,18 @@
     nixosConfigurations = {
       virtbox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-	specialArgs = {
-	  home-manager = home-manager;
-	};
+#        specialArgs = inputs;
         modules = [
           ./bootstrap.nix
           ./boxes/virtbox.nix
-	  ./common/desktop.nix
+          ./common/desktop.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.users.usr = import ./home/terminal.nix;
+          }
         ];
       };
     };

home.nix

@@ -1,16 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  home.username = "usr";
-  home.homeDirectory = lib.mkForce "/home/usr";
-
-  home.packages = [
-    pkgs.htop
-  ];
-  programs.neovim = {
-    enable = true;
-  };
-
-  home.stateVersion = "23.11";
-  programs.home-manager.enable = true;
-}

home/bash/default.nix

@@ -0,0 +1,12 @@
+{ lib, config, pkgs, home, ... }:
+
+{
+  home.file = {
+    ".config/bash/bashrc" = {
+      source = ./bashrc;
+    };
+    ".config/bash/profile" = {
+      source = ./profile;
+    };
+  };
+}

home/bspwm/default.nix

@@ -0,0 +1,9 @@
+{ lib, config, pkgs, home, ... }:
+
+{
+  home.file = {
+    ".config/bspwm/bspwmrc" = {
+      source = ./bspwmrc;
+    };
+  };
+}