Refactor user config files

2021-11-11 21:50:19 +00:00
parent cdf7b2c907
commit 029d4123fd
3 changed files with 134 additions and 130 deletions
--- a/user/daniel/home.nix
+++ b/user/daniel/home.nix
@@ -11,59 +11,64 @@
 	# Let Home Manager install and manage itself.
 	programs.home-manager.enable = true;

-	home.username = "daniel";
-	home.homeDirectory = "/home/daniel";
-
-	home.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;
 	services.dunst.enable = true;

-	home.packages =	with pkgs; [
-		cargo
-		chezmoi
-		discord
-		element-desktop
-		feh
-		fzf
-		go_1_17
-                gopls
-                jetbrains.goland
-		i3
-		i3lock
-		i3utils
-                iosevka
-		lazygit
-		nerdfonts
-		oh-my-zsh
-		pavucontrol
-		restic
-		rofi
-		starship
-		xclip
-		zettlr
-	];
+	home = {
+		username = "daniel";
+		homeDirectory = "/home/daniel";

-	home.keyboard = {
-		layout = "gb";
-		options = [
-			"caps:escape"
+		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;
+			};
+		};
+
+		packages = with pkgs; [
+			cargo
+			chezmoi
+			discord
+			element-desktop
+			feh
+			fzf
+			go_1_17
+			gopls
+			jetbrains.goland
+			i3
+			i3lock
+			i3utils
+			iosevka
+			lazygit
+			nerdfonts
+			oh-my-zsh
+			pavucontrol
+			restic
+			rofi
+			starship
+			xclip
+			zettlr
 		];
+
+		keyboard = {
+			layout = "gb";
+			options = [
+				"caps:escape"
+			];
+		};
+
+		stateVersion = "21.05";
 	};

 	programs = {
@@ -75,19 +80,14 @@
 				theme = "agnoster";
 			};
 		};
+		git = {
+			enable = true;
+			userName = "Daniel Patterson";
+			userEmail = "me@danielpatterson.dev";
+		};
+
+		starship.enable = true;
+
+		vscode.enable = true;
 	};
-
-	programs.git = {
-		enable = true;
-		userName = "Daniel Patterson";
-		userEmail = "me@danielpatterson.dev";
-	};
-
-	programs.starship.enable = true;
-
-        programs.vscode = {
-          enable = true;
-        };
-
-	home.stateVersion = "21.05";
 }