start using nixpkgs-fmt

7 files changed, 90 insertions, 69 deletions

diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index 5394515..a3471af 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -1,26 +1,26 @@
-{pkgs, ...}: {
-	imports = [
-		./git.nix
-		./neovim
-		./starship.nix
-		./vim.nix
-	];
+{ pkgs, ... }: {
+  imports = [
+    ./git.nix
+    ./neovim.nix
+    ./starship.nix
+    ./vim.nix
+  ];
 
-	home.packages = with pkgs; [
-		alejandra
-		bat
-		clang
-		deadnix
-		eclint
-		exa
-		fd
-		gh
-		lld
-		rclone
-		restic
-		ripgrep
-		statix
-	];
+  home.packages = with pkgs; [
+    alejandra
+    bat
+    clang
+    deadnix
+    eclint
+    exa
+    fd
+    gh
+    lld
+    rclone
+    restic
+    ripgrep
+    statix
+  ];
 
-	xdg.enable = true;
+  xdg.enable = true;
 }
diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix
index 8daa18c..e4ddfa1 100644
--- a/users/seth/programs/git.nix
+++ b/users/seth/programs/git.nix
@@ -1,18 +1,18 @@
 _: {
-	programs.git = {
-		enable = true;
-		extraConfig = {
-			init = {defaultBranch = "main";};
-			safe = {directory = "/etc/nixos";};
-		};
-		signing = {
-			key = "D31BD0D494BBEE86";
-			signByDefault = true;
-		};
-		userEmail = "[email protected]";
-		userName = "seth";
-	};
-	services.gpg-agent.extraConfig = ''
-		pinentry-program /run/current-system/sw/bin/pinentry
-	'';
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      init = { defaultBranch = "main"; };
+      safe = { directory = "/etc/nixos"; };
+    };
+    signing = {
+      key = "D31BD0D494BBEE86";
+      signByDefault = true;
+    };
+    userEmail = "[email protected]";
+    userName = "seth";
+  };
+  services.gpg-agent.extraConfig = ''
+    pinentry-program /run/current-system/sw/bin/pinentry
+  '';
 }
diff --git a/users/seth/programs/mangohud.nix b/users/seth/programs/mangohud.nix
new file mode 100644
index 0000000..2b33471
--- /dev/null
+++ b/users/seth/programs/mangohud.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ mangohud ];
+
+  xdg.configFile."MangoHud.conf" = {
+    text = ''
+      legacy_layout=false
+      cpu_stats
+      cpu_temp
+      gpu_stats
+      gpu_temp
+      fps
+      frametime
+      media_player
+      media_player_name = spotify
+    '';
+  };
+}
diff --git a/users/seth/programs/mangohud/MangoHud.conf b/users/seth/programs/mangohud/MangoHud.conf
deleted file mode 100644
index 8e02a99..0000000
--- a/users/seth/programs/mangohud/MangoHud.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-legacy_layout=false
-cpu_stats
-cpu_temp
-gpu_stats
-gpu_temp
-fps
-frametime
-media_player
-media_player_name = spotify
diff --git a/users/seth/programs/mangohud/default.nix b/users/seth/programs/mangohud/default.nix
deleted file mode 100644
index 21dde0f..0000000
--- a/users/seth/programs/mangohud/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-	home.packages = with pkgs; [mangohud];
-
-	xdg.configFile.MangoHud = {
-		source = ./MangoHud.conf;
-	};
-}
diff --git a/users/seth/programs/starship.nix b/users/seth/programs/starship.nix
index 5c50b4b..7c213cf 100644
--- a/users/seth/programs/starship.nix
+++ b/users/seth/programs/starship.nix
@@ -1,8 +1,8 @@
 _: {
-	programs.starship = {
-		enable = false;
-		settings = {
-			format = "" "
+  programs.starship = {
+    enable = false;
+    settings = {
+      format = "" "
 				$username\
 				$hostname\
 				$directory\
@@ -24,6 +24,6 @@ _: {
 				$shell\
 				$character
 			" "";
-		};
-	};
+    };
+  };
 }
diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix
index b3dc52c..8a4c784 100644
--- a/users/seth/programs/vim.nix
+++ b/users/seth/programs/vim.nix
@@ -1,10 +1,30 @@
 _: {
-	programs.vim = {
-		enable = true;
-		settings = {
-			expandtab = false;
-			shiftwidth = 2;
-			tabstop = 2;
-		};
-	};
+  programs.vim = {
+    enable = true;
+    settings = {
+      expandtab = false;
+      shiftwidth = 2;
+      tabstop = 2;
+    };
+    extraConfig = ''
+      " https://wiki.archlinux.org/title/XDG_Base_Directory
+      set runtimepath^=$XDG_CONFIG_HOME/vim
+      set runtimepath+=$XDG_DATA_HOME/vim
+      set runtimepath+=$XDG_CONFIG_HOME/vim/after
+
+      set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
+      set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+      set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
+      set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+
+      let g:netrw_home = $XDG_DATA_HOME."/vim"
+      call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
+
+      set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')
+      set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
+      set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
+      set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
+      set viminfofile=$XDG_STATE_HOME/vim/viminfo
+    '';
+  };
 }