more

hosts/ts-tl-mbp/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   services.nix-daemon.enable = true;
   programs.zsh.enable = true;
@@ -11,18 +11,48 @@
     programs.home-manager.enable = true;
     home.stateVersion = "22.05";
 
+    home.sessionVariables = {
+      PAGER = "less -R";
+      EDITOR = "nvim";
+    };
+
     home.packages = with pkgs; [
-        (neovim.override {
-              vimAlias = true;
-        })
       fish
+      ctags
       htop
       ripgrep
-	tmux
       wget
     ];
 
-    #home.file.".config/".source = "../../config/";
+    programs.tmux = {
+      enable = true;
+    };
+    home.file.".tmux".source = "../../tmux";
+    home.file.".tmux.conf".source = "../../tmux.conf";
+
+    programs.git = {
+      enable = true;
+      includes = [
+        { path = "~/code/tyrel.dev/dotfiles/gitconfig"; }
+      ];
+      aliases = {
+        ap = "add -p";
+      };
+      extraConfig = {
+        pull.ff = "only";
+      };
+    };
+
+    programs.neovim = {
+      enable = true;
+    };
+    xdg.configFile = {
+      "nvim" = {
+        source = ../../config/nvim;
+        recursive = true;
+      };
+    };
+
       #home.file."bin".source = "../../bin";
       #home.file.".gitconfig".source = "gitconfig";
       #home.file.".gitignore".source = "../../gitignore";
@@ -31,11 +61,9 @@
       #home.file.".shell_aliases".source = "../../shell_aliases";
       #home.file.".shell_funcs".source = "../../shell_funcs";
       #home.file.".shell_funcs.fish".source = "../../shell_funcs.fish";
-    #home.file.".tmux".source = "../../tmux";
-    #home.file.".tmux.conf".source = "../../tmux.conf";
 
+  }; # -- HomeManager
  
-  };
   homebrew = {
     enable = true;
     casks = [