stuff

.gitignore

@@ -0,0 +1 @@
+result

profiles/base/default.nix

@@ -1,8 +1,8 @@
 {
   agenix,
   config,
-  pkgs,
   lib,
+  pkgs,
   user,
   ...
 }: {
@@ -60,10 +60,14 @@
     agenix.packages."${pkgs.system}".default
   ];
 
-  programs.fish.enable = true;
-
   system = {
     primaryUser = user;
     stateVersion = 5;
   };
+
+  programs.fish.enable = true;
+
+  services.tailscale = {
+    enable = true;
+  };
 }

profiles/base/home-manager/default.nix

@@ -5,7 +5,6 @@
     ./eza.nix
     ./fish.nix
     ./git.nix
-    ./jujutsu.nix
     ./neovim
     ./ssh.nix
     ./starship.nix

profiles/base/home-manager/jujutsu.nix

@@ -1,5 +0,0 @@
-{
-  programs.jujutsu = {
-    enable = true;
-  };
-}

profiles/base/home-manager/neovim/autocmd.nix

@@ -17,6 +17,12 @@
         pattern = "*";
         command = "normal zR";
       }
+      {
+        event = "FileReadPost";
+        group = "Christoph";
+        pattern = "*";
+        command = "normal zR";
+      }
       {
         event = "LspAttach";
         group = "Christoph";

profiles/base/home-manager/neovim/default.nix

@@ -4,6 +4,7 @@
     ./autocmd.nix
     ./mappings.nix
     ./plugins/conform.nix
+    ./plugins/lazygit.nix
     ./plugins/mini.nix
     ./plugins/oil.nix
     ./plugins/treesitter.nix

profiles/base/home-manager/neovim/mappings.nix

@@ -20,9 +20,15 @@
     }
     {
       mode = "n";
-      key = "<leader>e";
+      key = "<leader>ed";
       action = ":Oil<CR>";
       options.desc = "File browser";
     }
+    {
+      mode = "n";
+      key = "<leader>gg";
+      action = ":LazyGit<CR>";
+      options.desc = "Lazygit";
+    }
   ];
 }

profiles/base/home-manager/neovim/plugins/lazygit.nix

@@ -0,0 +1,5 @@
+{
+  programs.nixvim.plugins.lazygit = {
+    enable = true;
+  };
+}

profiles/base/home-manager/neovim/plugins/mini.nix

@@ -24,6 +24,8 @@
         };
       };
       align = {};
+      diff = {};
+      git = {};
       bracketed = {};
       comment = {};
       completion = {
@@ -33,6 +35,7 @@
       };
       indentscope = {};
       move = {};
+      starter = {};
       pairs = {};
       trailspace = {};
       visits = {};

profiles/base/packages.nix

@@ -2,17 +2,17 @@
 with pkgs; [
   age
   age-plugin-yubikey
+  lazygit
   alejandra
   delta
   docker
   docker-compose
   git
   gnupg
-  jjui
   jq
   killall
   libfido2
-  nerd-fonts.iosevka
+  iosevka
   nodejs_24
   nurl
   opencode

profiles/darwin/default.nix

@@ -8,10 +8,10 @@
   ...
 }: {
   imports = [
-    ./dock
+    ./secrets.nix
     ./system.nix
     ./homebrew.nix
-    ./secrets.nix
+    ./dock
   ];
 
   users.users.${user} = {
@@ -37,7 +37,7 @@
       ];
       fonts.fontconfig.enable = true;
       home = {
-        packages = pkgs.callPackage ./packages.nix {} ++ pkgs.callPackage ../base/packages.nix {};
+        packages = pkgs.callPackage ../base/packages.nix {} ++ pkgs.callPackage ./packages.nix {};
         stateVersion = "24.05";
       };
     };

profiles/darwin/home-manager/ghostty.nix

@@ -8,7 +8,7 @@
       window-padding-x = 8;
       window-padding-y = 2;
       window-padding-balance = true;
-      font-family = "Iosevka Nerd Font";
+      font-family = "Iosevka";
       font-size = 15.5;
       font-feature = [
         "-calt"

profiles/darwin/system.nix

@@ -15,7 +15,7 @@
       show-recents = false;
       launchanim = true;
       orientation = "bottom";
-      tilesize = 50;
+      tilesize = 60;
     };
 
     finder = {