diff --git a/flake.lock b/flake.lock index 42d9efa..77e88ae 100644 --- a/flake.lock +++ b/flake.lock @@ -70,6 +70,27 @@ } }, "flake-utils_2": { + "inputs": { + "systems": [ + "godig", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -84,7 +105,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": [ "opencode-tunneler", @@ -105,9 +126,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -145,6 +166,29 @@ "type": "github" } }, + "godig": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1761103649, + "narHash": "sha256-eny7THaLce01jRSgVqCg31lNfUCf1aNg7s5rMXEtESA=", + "owner": "AYM1607", + "repo": "godig", + "rev": "531d572910f312449a641b417e02a51294496d48", + "type": "github" + }, + "original": { + "owner": "AYM1607", + "ref": "v0.2.0", + "repo": "godig", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -189,7 +233,7 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -274,11 +318,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -364,11 +408,11 @@ }, "opencode-tunneler": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1756018859, @@ -388,6 +432,7 @@ "inputs": { "apple-silicon": "apple-silicon", "ghostty": "ghostty", + "godig": "godig", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixgl": "nixgl", @@ -424,7 +469,7 @@ }, "ssh-agent-switcher": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -488,6 +533,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -505,7 +565,7 @@ "walker": { "inputs": { "nixpkgs": "nixpkgs_6", - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1748171996, diff --git a/flake.nix b/flake.nix index bdd1504..dc30689 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,11 @@ url = "github:AYM1607/opencode-tunneler"; inputs.nixpkgs.follows = "nixpkgs-unstable"; # Use same nixpkgs }; + + godig = { + url = "github:AYM1607/godig/v0.2.0"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; # Use same nixpkgs + }; }; outputs = { @@ -59,6 +64,7 @@ nixgl, ssh-agent-switcher, opencode-tunneler, + godig, ... }@inputs: { nixosConfigurations = { @@ -148,6 +154,7 @@ pkgs-unstable = pkgs-unstable_aarch64-darwin; inherit (config) user; inherit opencode-tunneler; + inherit godig; }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home-modules/explicit-configs/nvim/lua/lsp/python-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/python-ls.lua index 0fd7378..0018b05 100644 --- a/home-modules/explicit-configs/nvim/lua/lsp/python-ls.lua +++ b/home-modules/explicit-configs/nvim/lua/lsp/python-ls.lua @@ -1,5 +1,7 @@ -- require'lspconfig'.pyright.setup{} +vim.lsp.enable('basedpyright') + -- Autoformat on save. -- vim.cmd("autocmd BufWritePre *.py execute ':Black'") diff --git a/home-modules/tmux.nix b/home-modules/tmux.nix index dd4abd7..445ac7b 100644 --- a/home-modules/tmux.nix +++ b/home-modules/tmux.nix @@ -57,11 +57,13 @@ bind w kill-pane bind W kill-window + # I'd rather have the session + # list functionality, don't use sync much. # Pane sync - unbind s - unbind S - bind s setw synchronize-panes on - bind S setw synchronize-panes off + # unbind s + # unbind S + # bind s setw synchronize-panes on + # bind S setw synchronize-panes off ''; plugins = with pkgs; [ { diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index 045f9d3..caea169 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -44,6 +44,10 @@ "vite" "pipx" "codex" + "python@3.11" + "glow" + "act" + "chromaprint" ]; casks = [ "ghostty" @@ -63,6 +67,8 @@ "slack" "discord" "claude-code" + "calibre" + "rsyncui" ]; }; diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 0d1c887..2977dc5 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -3,6 +3,7 @@ pkgs, pkgs-unstable, opencode-tunneler, + godig, user, ... } : @@ -61,21 +62,36 @@ in { })) pkgs-unstable.vscode pkgs-unstable.ngrok + pkgs-unstable.flyctl + pkgs-unstable.awscli2 + pkgs-unstable.google-cloud-sdk pkgs-unstable.go pkgs-unstable.gopls pkgs-unstable.gotools pkgs-unstable.bun + pkgs-unstable.rustup # Expo. pkgs-unstable.nodejs_24 pkgs-unstable.eas-cli opencode-tunneler.packages.aarch64-darwin.default + godig.packages.aarch64-darwin.service ]; stateVersion = "24.11"; }; + programs.ssh = { + matchBlocks = { + media = { + user = "jmug"; + hostname = "192.168.8.241"; + forwardAgent = true; + }; + }; + }; + programs.zsh = { shellAliases = { # TODO BEGIN Interpolate the name of the host here.