Refactor user config files

flake.lock

@@ -26,8 +26,8 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1636132244,
+        "lastModified": 1636508828,
-        "narHash": "sha256-uIfXaXszC0YSgEjPWE97o/JR4WS5bqJ8BcrKYz9ex4Y=",
+        "narHash": "sha256-qgjgowDhUF3Kb4KKzJGd5VtKEHkDqn4unEexPauPvgs=",
         "type": "git",
         "url": "file:///home/daniel/go/src/i3utils"
       },

user/daniel/home.nix

@@ -11,30 +11,32 @@
 	# Let Home Manager install and manage itself.
 	programs.home-manager.enable = true;
 
-	home.username = "daniel";
+	services.dunst.enable = true;
-	home.homeDirectory = "/home/daniel";
 
-	home.file = {
+	home = {
+		username = "daniel";
+		homeDirectory = "/home/daniel";
+
+		file = {
 			".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors";
 
 			"bin/system-update.sh" = {
 				source = ../../scripts/system-update.sh;
 				executable = true;
 			};
+
 			"bin/home-update.sh" = {
 				source = ../../scripts/home-update.sh;
 				executable = true;
 			};
+
 			"bin/update.sh" = {
 				source = ../../scripts/update.sh;
 				executable = true;
 			};
 		};
 
-	xsession.enable = true;
+		packages = with pkgs; [
-	services.dunst.enable = true;
-
-	home.packages =	with pkgs; [
 			cargo
 			chezmoi
 			discord
@@ -59,13 +61,16 @@
 			zettlr
 		];
 
-	home.keyboard = {
+		keyboard = {
 			layout = "gb";
 			options = [
 				"caps:escape"
 			];
 		};
 
+		stateVersion = "21.05";
+	};
+
 	programs = {
 		zsh = {
 			enable = true;
@@ -75,19 +80,14 @@
 				theme = "agnoster";
 			};
 		};
-	};
+		git = {
-
-	programs.git = {
 			enable = true;
 			userName = "Daniel Patterson";
 			userEmail = "me@danielpatterson.dev";
 		};
 
-	programs.starship.enable = true;
+		starship.enable = true;
 
-        programs.vscode = {
+		vscode.enable = true;
-          enable = true;
 	};
-
-	home.stateVersion = "21.05";
 }

user/progs/i3/default.nix

@@ -3,7 +3,10 @@
 let
 	mod = "Mod4";
 in {
-	xsession.windowManager.i3 = {
+	xsession = {
+		enable = true;
+
+		windowManager.i3 = {
 			enable = true;
 			config = {
 				bars = [ ];
@@ -76,4 +79,5 @@ in {
 
 			};
 		};
+	};
 }