From 1079071b97bbd9290a45cda35ff4fcda0f46112b Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Wed, 6 Aug 2025 22:03:01 +0200 Subject: [PATCH] stuff --- .gitignore | 1 + alejandra.toml | 0 profiles/base/default.nix | 10 +++++++--- profiles/base/home-manager/default.nix | 1 - profiles/base/home-manager/jujutsu.nix | 5 ----- profiles/base/home-manager/neovim/autocmd.nix | 6 ++++++ profiles/base/home-manager/neovim/default.nix | 1 + profiles/base/home-manager/neovim/mappings.nix | 8 +++++++- profiles/base/home-manager/neovim/plugins/lazygit.nix | 5 +++++ profiles/base/home-manager/neovim/plugins/mini.nix | 3 +++ profiles/base/packages.nix | 4 ++-- profiles/darwin/default.nix | 6 +++--- profiles/darwin/home-manager/ghostty.nix | 2 +- profiles/darwin/system.nix | 2 +- 14 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 .gitignore delete mode 100644 alejandra.toml delete mode 100644 profiles/base/home-manager/jujutsu.nix create mode 100644 profiles/base/home-manager/neovim/plugins/lazygit.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/alejandra.toml b/alejandra.toml deleted file mode 100644 index e69de29..0000000 diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 16d991e..98f1fb3 100644 --- a/profiles/base/default.nix +++ b/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; + }; } diff --git a/profiles/base/home-manager/default.nix b/profiles/base/home-manager/default.nix index 883cbcd..66e67f2 100644 --- a/profiles/base/home-manager/default.nix +++ b/profiles/base/home-manager/default.nix @@ -5,7 +5,6 @@ ./eza.nix ./fish.nix ./git.nix - ./jujutsu.nix ./neovim ./ssh.nix ./starship.nix diff --git a/profiles/base/home-manager/jujutsu.nix b/profiles/base/home-manager/jujutsu.nix deleted file mode 100644 index f816130..0000000 --- a/profiles/base/home-manager/jujutsu.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.jujutsu = { - enable = true; - }; -} diff --git a/profiles/base/home-manager/neovim/autocmd.nix b/profiles/base/home-manager/neovim/autocmd.nix index 9e95c47..a5993d6 100644 --- a/profiles/base/home-manager/neovim/autocmd.nix +++ b/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"; diff --git a/profiles/base/home-manager/neovim/default.nix b/profiles/base/home-manager/neovim/default.nix index 3cdf422..7443d8d 100644 --- a/profiles/base/home-manager/neovim/default.nix +++ b/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 diff --git a/profiles/base/home-manager/neovim/mappings.nix b/profiles/base/home-manager/neovim/mappings.nix index babd804..b06da14 100644 --- a/profiles/base/home-manager/neovim/mappings.nix +++ b/profiles/base/home-manager/neovim/mappings.nix @@ -20,9 +20,15 @@ } { mode = "n"; - key = "e"; + key = "ed"; action = ":Oil"; options.desc = "File browser"; } + { + mode = "n"; + key = "gg"; + action = ":LazyGit"; + options.desc = "Lazygit"; + } ]; } diff --git a/profiles/base/home-manager/neovim/plugins/lazygit.nix b/profiles/base/home-manager/neovim/plugins/lazygit.nix new file mode 100644 index 0000000..03d0cea --- /dev/null +++ b/profiles/base/home-manager/neovim/plugins/lazygit.nix @@ -0,0 +1,5 @@ +{ + programs.nixvim.plugins.lazygit = { + enable = true; + }; +} diff --git a/profiles/base/home-manager/neovim/plugins/mini.nix b/profiles/base/home-manager/neovim/plugins/mini.nix index 1245946..fd2078b 100644 --- a/profiles/base/home-manager/neovim/plugins/mini.nix +++ b/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 = {}; diff --git a/profiles/base/packages.nix b/profiles/base/packages.nix index 04fd8d3..fddeb77 100644 --- a/profiles/base/packages.nix +++ b/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 diff --git a/profiles/darwin/default.nix b/profiles/darwin/default.nix index 375e7d9..13e21fb 100644 --- a/profiles/darwin/default.nix +++ b/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"; }; }; diff --git a/profiles/darwin/home-manager/ghostty.nix b/profiles/darwin/home-manager/ghostty.nix index 4634b3d..dbf09d9 100644 --- a/profiles/darwin/home-manager/ghostty.nix +++ b/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" diff --git a/profiles/darwin/system.nix b/profiles/darwin/system.nix index 59db4f1..9f896d2 100644 --- a/profiles/darwin/system.nix +++ b/profiles/darwin/system.nix @@ -15,7 +15,7 @@ show-recents = false; launchanim = true; orientation = "bottom"; - tilesize = 50; + tilesize = 60; }; finder = {