From 9a4796fef555bbbe4bb75da071fdab2cbb791a0d Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 10 Dec 2025 13:21:28 +0100 Subject: [PATCH 1/6] moves back to lazygit --- modules/fish/default.nix | 4 ++-- modules/nvim/config/lua/plugins/neogit.lua | 19 ------------------- modules/nvim/config/lua/plugins/snacks.lua | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 modules/nvim/config/lua/plugins/neogit.lua diff --git a/modules/fish/default.nix b/modules/fish/default.nix index 6e28fbb..944a2c0 100644 --- a/modules/fish/default.nix +++ b/modules/fish/default.nix @@ -222,8 +222,8 @@ ''; shellAbbrs = { - lg = "nvim +Neogit"; - gg = "nvim +Neogit"; + lg = "lazygit"; + gg = "lazygit"; g = "git"; frc = "source ~/.config/fish/**/*.fish"; }; diff --git a/modules/nvim/config/lua/plugins/neogit.lua b/modules/nvim/config/lua/plugins/neogit.lua deleted file mode 100644 index 8955ec7..0000000 --- a/modules/nvim/config/lua/plugins/neogit.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", - "sindrets/diffview.nvim", - "folke/snacks.nvim", - }, - lazy = false, - opts = {}, - keys = { - { "gg", "Neogit", desc = "Open neogit", mode = "n" }, - { "gc", "Neogit commit", desc = "Open neogit commit UI", mode = "n" }, - { "gp", "Neogit push", desc = "Open neogit push UI", mode = "n" }, - { "gf", "Neogit pull", desc = "Open neogit pull UI", mode = "n" }, - { "gm", "Neogit merge", desc = "Open neogit merge UI", mode = "n" }, - { "ghb", "DiffviewFileHistory", desc = "Show history for current branch", mode = "n" }, - { "ghf", "DiffviewFileHistory %", desc = "Show file history", mode = "n" }, - }, -} diff --git a/modules/nvim/config/lua/plugins/snacks.lua b/modules/nvim/config/lua/plugins/snacks.lua index 64906f7..aa356f8 100644 --- a/modules/nvim/config/lua/plugins/snacks.lua +++ b/modules/nvim/config/lua/plugins/snacks.lua @@ -39,7 +39,7 @@ return { keys = { -- Git { - "g_", + "gg", function() Snacks.lazygit() end, From 231b043a17046657354d6efccd7d4ae6ebc9471f Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 10 Dec 2025 13:23:31 +0100 Subject: [PATCH 2/6] temporarily removes gopher --- modules/nvim/config/lazy-lock.json | 20 +++++++++----------- modules/nvim/config/lua/plugins/gopher.lua | 15 --------------- 2 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 modules/nvim/config/lua/plugins/gopher.lua diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json index d552d37..89ad03a 100644 --- a/modules/nvim/config/lazy-lock.json +++ b/modules/nvim/config/lazy-lock.json @@ -1,31 +1,29 @@ { "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, - "codecompanion.nvim": { "branch": "main", "commit": "a8c696d1fc4268085e4306d54af39b07be884b17" }, - "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "codecompanion.nvim": { "branch": "main", "commit": "8ad65eef735b31bb47d76f59d878ee1bac4bdc85" }, + "conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitportal.nvim": { "branch": "main", "commit": "2420f27c6269184f13d018f347f36eb120403110" }, - "gopher.nvim": { "branch": "main", "commit": "295e21e637f9194a4d2bc34622d324a88b028141" }, + "gopher.nvim": { "branch": "main", "commit": "6a3924cee5a9f36d316f8e4a90c3020438d3513f" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, - "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, - "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" }, - "neogit": { "branch": "master", "commit": "614a63489be5734b14f314c3449535566b8352d4" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mini.pairs": { "branch": "main", "commit": "472ec50092a3314ec285d2db2baa48602d71fe93" }, "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, + "oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "schemastore.nvim": { "branch": "main", "commit": "eed1834170f343c14a6768f085b26b3571a55302" }, - "snacks.nvim": { "branch": "main", "commit": "3c5c23ba91e608bd89bb36d76cb005aa63d20dbf" }, + "schemastore.nvim": { "branch": "main", "commit": "3941c524f88fd4b7696bc574d7acde0313ef5bf5" }, + "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "snipe.nvim": { "branch": "main", "commit": "d2d196c335919767803f905d573ce66340e33ee6" }, "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" }, "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" }, "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" }, - "vim-dadbod-ui": { "branch": "master", "commit": "236179fd6bdc2aabeb1326d428e6b29d41044d8e" }, + "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/modules/nvim/config/lua/plugins/gopher.lua b/modules/nvim/config/lua/plugins/gopher.lua deleted file mode 100644 index e5eda18..0000000 --- a/modules/nvim/config/lua/plugins/gopher.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "olexsmir/gopher.nvim", - ft = "go", - build = function() - vim.cmd.GoInstallDeps() - end, - ---@module "gopher" - ---@type gopher.Config - opts = {}, - keys = { - { "cga", "GoTagAdd", desc = "Add tags to struct", mode = "n" }, - { "cgi", "GoIfErr", desc = "Adds if err boilerplate", mode = "n" }, - { "cgt", "GoTestAdd", desc = "Add test under cursor", mode = "n" }, - }, -} From bd4c36008e27ccc8cc1800d37ae6fc926ce1baf8 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 10 Dec 2025 13:26:42 +0100 Subject: [PATCH 3/6] switches back to lazygit --- home/darwin-work.nix | 1 + home/darwin.nix | 1 + hosts/dnsc-work/default.nix | 75 ++++++++++++++++++++----------------- modules/base/default.nix | 1 + 4 files changed, 43 insertions(+), 35 deletions(-) diff --git a/home/darwin-work.nix b/home/darwin-work.nix index 99db990..c18fc94 100644 --- a/home/darwin-work.nix +++ b/home/darwin-work.nix @@ -19,6 +19,7 @@ ../modules/fish ../modules/wezterm ../modules/nvim + ../modules/lazygit ]; programs.home-manager.enable = true; diff --git a/home/darwin.nix b/home/darwin.nix index 602d9d5..0bb2f9a 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -20,6 +20,7 @@ ../modules/nvim ../modules/ghostty ../modules/zellij + ../modules/lazygit ]; programs.home-manager.enable = true; diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index d90580c..0bd3044 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -22,50 +22,55 @@ }; nix.settings.trusted-users = [ "dennis" ]; + nixpkgs.overlays = [ + inputs.zellij-switch.overlays.default + ]; + # System Packages environment.systemPackages = with pkgs; [ circumflex gh + zellij + zellij-switch # rsync ]; - masApps = { - Bitwarden = 1352778147; - Wireguard = 1451685025; - # XCode = 497799835; - }; - - brews = [ - "watchman" - "pnpm" - "pkg-config" - "cairo" - "pango" - "libpng" - "jpeg" - "giflib" - "librsvg" - "pixman" - "python-setuptools" - "gmp" - "rbenv" - "mysql@8.0" - ]; - - casks = [ - "arc" - "microsoft-teams" - "wezterm" - "1password" - "1password-cli" - "android-studio" - "zulu@17" - "postman" - "docker-desktop" - "google-chrome" - ]; + homebrew.masApps = { + Bitwarden = 1352778147; + Wireguard = 1451685025; + # XCode = 497799835; }; + homebrew.brews = [ + "watchman" + "pnpm" + "pkg-config" + "cairo" + "pango" + "libpng" + "jpeg" + "giflib" + "librsvg" + "pixman" + "python-setuptools" + "gmp" + "rbenv" + "mysql@8.0" + ]; + + homebrew.casks = [ + "arc" + "microsoft-teams" + "wezterm" + "1password" + "1password-cli" + "android-studio" + "zulu@17" + "postman" + "docker-desktop" + "google-chrome" + ]; + # Shells environment.shells = [ pkgs.fish ]; diff --git a/modules/base/default.nix b/modules/base/default.nix index 2d5d927..17dde99 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -47,5 +47,6 @@ imagemagick sqlite fortune + lazygit ]; } From 6b5bd65a32ff15a4ecdc481f8e040f45a5d49ee3 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 11 Dec 2025 12:35:08 +0100 Subject: [PATCH 4/6] passes nix-homebrew to dnsc-work --- flake.lock | 50 +++++++++++++++++++++++++------------------------- flake.nix | 5 ++++- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 116aad0..3939870 100644 --- a/flake.lock +++ b/flake.lock @@ -24,16 +24,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1761551821, - "narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=", + "lastModified": 1763638478, + "narHash": "sha256-n/IMowE9S23ovmTkKX7KhxXC2Yq41EAVFR2FBIXPcT8=", "owner": "Homebrew", "repo": "brew", - "rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3", + "rev": "fbfdbaba008189499958a7aeb1e2c36ab10c067d", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.6.19", + "ref": "5.0.3", "repo": "brew", "type": "github" } @@ -85,11 +85,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1762721397, - "narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1763910938, - "narHash": "sha256-1P2UOQ9ILAKAqfLV8yfBuB8MxlTilOqFTDw33NCmDiE=", + "lastModified": 1765211814, + "narHash": "sha256-USI9biMhvWBs7hC9JlDS3/Oi/TlFNcYCszA5GT9gp3o=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "bac7f76161c790e927392c1593bfd07481f6be37", + "rev": "222f5c55b655b627d0703cb05948fc61e09ab231", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1752689277, - "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", + "lastModified": 1763384566, + "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", "owner": "nix-community", "repo": "naersk", - "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", + "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1762627886, - "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", + "lastModified": 1765065051, + "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", + "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1761927470, - "narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=", + "lastModified": 1764473698, + "narHash": "sha256-C91gPgv6udN5WuIZWNehp8qdLqlrzX6iF/YyboOj6XI=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca", + "rev": "6a8ab60bfd66154feeaa1021fc3b32684814a62a", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762482733, - "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", + "lastModified": 1765270179, + "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", + "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ed31144..361e99b 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,10 @@ darwinConfigurations.dnsc-work = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/dnsc-work ]; + modules = [ + nix-homebrew.darwinModules.nix-homebrew + ./hosts/dnsc-work + ]; }; homeConfigurations."dnsc-deck" = home-manager.lib.homeManagerConfiguration { From 4177f612e5a96026826bd1a37455c9ddda855be6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 11 Dec 2025 13:21:05 +0100 Subject: [PATCH 5/6] uses new config on dnsc-work --- home/darwin-work.nix | 3 ++- hosts/dnsc-work/default.nix | 1 + modules/ghostty/default.nix | 2 +- modules/homebrew/default.nix | 4 ---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/home/darwin-work.nix b/home/darwin-work.nix index c18fc94..89c2e6d 100644 --- a/home/darwin-work.nix +++ b/home/darwin-work.nix @@ -17,7 +17,8 @@ ../modules/git ../modules/zoxide ../modules/fish - ../modules/wezterm + ../modules/ghostty + ../modules/zellij ../modules/nvim ../modules/lazygit ]; diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 0bd3044..bbf7caa 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -30,6 +30,7 @@ environment.systemPackages = with pkgs; [ circumflex gh + fnm zellij zellij-switch # rsync diff --git a/modules/ghostty/default.nix b/modules/ghostty/default.nix index ea20af4..7291021 100644 --- a/modules/ghostty/default.nix +++ b/modules/ghostty/default.nix @@ -4,7 +4,7 @@ enableFishIntegration = true; package = null; settings = { - font-size = 17; + font-size = 18; font-family = "Victor Mono"; font-style = "SemiBold"; background-opacity = 0.945; diff --git a/modules/homebrew/default.nix b/modules/homebrew/default.nix index db33b15..afcd93f 100644 --- a/modules/homebrew/default.nix +++ b/modules/homebrew/default.nix @@ -15,10 +15,6 @@ cleanup = "zap"; }; - taps = [ - "homebrew/services" - ]; - brews = [ "go" "mas" From 4d3e7864bea7d76ca4c7cf979ad58e640eae430d Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 11 Dec 2025 13:55:08 +0100 Subject: [PATCH 6/6] installs nvim packages systemwide --- hosts/dnsc-work/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index bbf7caa..0614850 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -33,6 +33,16 @@ fnm zellij zellij-switch + stylua + typescript-language-server + vscode-langservers-extracted + astro-language-server + tailwindcss-language-server + lua-language-server + prettierd + eslint_d + nil + tree-sitter # rsync ];