Formatting

users/common/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ...} :
 {
-
+  config,
+  pkgs,
+  ...
+}: {
   programs.fzf.enable = true;
 
   home.packages = with pkgs; [
@@ -13,14 +15,30 @@
     enable = true;
     scdaemonSettings.disable-ccid = true;
     publicKeys = [
-			{ source = ../../data/pubkey.gpg;
+      {
+        source = ../../data/pubkey.gpg;
         trust = 5;
       }
-			{ source = ../../data/newpubkey.gpg;
+      {
+        source = ../../data/newpubkey.gpg;
         trust = 5;
       }
     ];
   };
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    defaultEditor = true;
+    withNodeJs = true;
+  };
+
+  xdg.configFile.nvim = {
+    recursive = true;
+    source = ../../data/nvim;
+  };
+  programs.git.enable = true;
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
@@ -35,19 +53,23 @@
     enable = true;
     initExtra = builtins.readFile ../../data/zshrc;
     plugins = [
-		{	name = "powerlevel10k";
+      {
+        name = "powerlevel10k";
         file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
         src = pkgs.zsh-powerlevel10k;
       }
-		{	name = "fzf-tab";
+      {
+        name = "fzf-tab";
         file = "share/fzf-tab/fzf-tab.plugin.zsh";
         src = pkgs.zsh-fzf-tab;
       }
-		{	name = "fast-syntax-highlighting";
+      {
+        name = "fast-syntax-highlighting";
         file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
         src = pkgs.zsh-fast-syntax-highlighting;
       }
-		{	name = "zsh-histdb";
+      {
+        name = "zsh-histdb";
         file = "sqlite-history.zsh";
         src = pkgs.fetchFromGitHub {
           owner = "larkery";
@@ -66,6 +88,5 @@
       #	};
       #}
     ];
-
   };
 }

users/common/desktop.nix

@@ -1,11 +1,12 @@
 {
   config,
   pkgs,
-	...}:
-	{
+  ...
+}: {
   home.packages = with pkgs; [
     zathura
     pinentry
     arandr
+    feh
   ];
 }

users/default.nix

@@ -11,12 +11,6 @@ in {
   home-manager.users.patrick.imports = [./patrick.nix];
   home-manager.users.root = {
     imports = [./common];
-    programs.neovim.enable = true;
-    programs.git.enable = true;
-    xdg.configFile.nvim = {
-      recursive = true;
-      source = ../data/nvim;
-    };
     home.stateVersion = "23.05";
   };
 }

users/patrick.nix

@@ -15,22 +15,9 @@
     common/kitty.nix
     common/herbstluftwm.nix
     common/desktop.nix
-	./common ];
+    ./common
+  ];
+
   nixpkgs.config.allowUnfree = true;
   xsession.enable = true;
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    #withNodes = true;
-  };
-  programs.git.enable = true;
-
-  programs.zsh.enable = true;
-
-  xdg.configFile.nvim = {
-    recursive = true;
-    source = ../data/nvim;
-  };
 }