diff --git a/flake.lock b/flake.lock deleted file mode 100644 index e93d010..0000000 --- a/flake.lock +++ /dev/null @@ -1,431 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", - "owner": "ryantm", - "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "brew-src": { - "flake": false, - "locked": { - "lastModified": 1763638478, - "narHash": "sha256-n/IMowE9S23ovmTkKX7KhxXC2Yq41EAVFR2FBIXPcT8=", - "owner": "Homebrew", - "repo": "brew", - "rev": "fbfdbaba008189499958a7aeb1e2c36ab10c067d", - "type": "github" - }, - "original": { - "owner": "Homebrew", - "ref": "5.0.3", - "repo": "brew", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "ironbar", - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765217760, - "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "ip-whitelist": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1733315147, - "narHash": "sha256-maBv+DuS0e0xuO+lh1WebUg8YkHL1jnafrmCPLrd2D0=", - "owner": "Oak-Digital", - "repo": "nixos-ip-whitelist-firewall", - "rev": "14e3346cc015d370b00a16b790a1c323b985ff63", - "type": "github" - }, - "original": { - "owner": "Oak-Digital", - "repo": "nixos-ip-whitelist-firewall", - "type": "github" - } - }, - "ironbar": { - "inputs": { - "flake-compat": "flake-compat", - "naersk": "naersk", - "nix-systems": "nix-systems", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765211814, - "narHash": "sha256-USI9biMhvWBs7hC9JlDS3/Oi/TlFNcYCszA5GT9gp3o=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "222f5c55b655b627d0703cb05948fc61e09ab231", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, - "naersk": { - "inputs": { - "fenix": "fenix", - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763384566, - "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", - "owner": "nix-community", - "repo": "naersk", - "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", - "type": "github" - }, - "original": { - "owner": "LnL7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-homebrew": { - "inputs": { - "brew-src": "brew-src" - }, - "locked": { - "lastModified": 1764473698, - "narHash": "sha256-C91gPgv6udN5WuIZWNehp8qdLqlrzX6iF/YyboOj6XI=", - "owner": "zhaofengli", - "repo": "nix-homebrew", - "rev": "6a8ab60bfd66154feeaa1021fc3b32684814a62a", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "nix-homebrew", - "type": "github" - } - }, - "nix-systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", - "path": "/nix/store/aa0zsahvyqnvzkicsh29jirm9hwv95pg-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 0, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", - "path": "/nix/store/khbvilmsrv4l69nwd52h27j1mp44a0xi-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", - "ip-whitelist": "ip-whitelist", - "ironbar": "ironbar", - "nix-darwin": "nix-darwin", - "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", - "zellij-switch": "zellij-switch" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1736476219, - "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zellij-switch": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1742588229, - "narHash": "sha256-IPg0pBw0ciF+xl6viq3nK+dvZoDZrfBDui7dkPLz258=", - "owner": "mostafaqanbaryan", - "repo": "zellij-switch", - "rev": "0e3c303c19890ccb03589230ac5a7c4307e573e4", - "type": "github" - }, - "original": { - "owner": "mostafaqanbaryan", - "repo": "zellij-switch", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} 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 { diff --git a/home/darwin-work.nix b/home/darwin-work.nix index 99db990..89c2e6d 100644 --- a/home/darwin-work.nix +++ b/home/darwin-work.nix @@ -17,8 +17,10 @@ ../modules/git ../modules/zoxide ../modules/fish - ../modules/wezterm + ../modules/ghostty + ../modules/zellij ../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..0614850 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -22,50 +22,66 @@ }; nix.settings.trusted-users = [ "dennis" ]; + nixpkgs.overlays = [ + inputs.zellij-switch.overlays.default + ]; + # System Packages environment.systemPackages = with pkgs; [ circumflex gh + 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 ]; - 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 ]; } diff --git a/modules/fish/default.nix b/modules/fish/default.nix index 5a2c219..728f6db 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/ghostty/default.nix b/modules/ghostty/default.nix index 1901ed7..85eb16d 100644 --- a/modules/ghostty/default.nix +++ b/modules/ghostty/default.nix @@ -3,7 +3,7 @@ enable = true; enableFishIntegration = true; 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" 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" }, - }, -} 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,