[macbook] Bunch of misc updates.

This commit is contained in:
jmug
2025-12-14 01:52:50 -08:00
parent 5400b88b75
commit e03f9db6b2
6 changed files with 108 additions and 15 deletions
Generated
+71 -11
View File
@@ -70,6 +70,27 @@
} }
}, },
"flake-utils_2": { "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": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -84,7 +105,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": [ "systems": [
"opencode-tunneler", "opencode-tunneler",
@@ -105,9 +126,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -145,6 +166,29 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -189,7 +233,7 @@
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -274,11 +318,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1756125398, "lastModified": 1765472234,
"narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -364,11 +408,11 @@
}, },
"opencode-tunneler": { "opencode-tunneler": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1756018859, "lastModified": 1756018859,
@@ -388,6 +432,7 @@
"inputs": { "inputs": {
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
"ghostty": "ghostty", "ghostty": "ghostty",
"godig": "godig",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixgl": "nixgl", "nixgl": "nixgl",
@@ -424,7 +469,7 @@
}, },
"ssh-agent-switcher": { "ssh-agent-switcher": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
@@ -488,6 +533,21 @@
} }
}, },
"systems_4": { "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": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -505,7 +565,7 @@
"walker": { "walker": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1748171996, "lastModified": 1748171996,
+7
View File
@@ -45,6 +45,11 @@
url = "github:AYM1607/opencode-tunneler"; url = "github:AYM1607/opencode-tunneler";
inputs.nixpkgs.follows = "nixpkgs-unstable"; # Use same nixpkgs 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 = { outputs = {
@@ -59,6 +64,7 @@
nixgl, nixgl,
ssh-agent-switcher, ssh-agent-switcher,
opencode-tunneler, opencode-tunneler,
godig,
... ...
}@inputs: { }@inputs: {
nixosConfigurations = { nixosConfigurations = {
@@ -148,6 +154,7 @@
pkgs-unstable = pkgs-unstable_aarch64-darwin; pkgs-unstable = pkgs-unstable_aarch64-darwin;
inherit (config) user; inherit (config) user;
inherit opencode-tunneler; inherit opencode-tunneler;
inherit godig;
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@@ -1,5 +1,7 @@
-- require'lspconfig'.pyright.setup{} -- require'lspconfig'.pyright.setup{}
vim.lsp.enable('basedpyright')
-- Autoformat on save. -- Autoformat on save.
-- vim.cmd("autocmd BufWritePre *.py execute ':Black'") -- vim.cmd("autocmd BufWritePre *.py execute ':Black'")
+6 -4
View File
@@ -57,11 +57,13 @@
bind w kill-pane bind w kill-pane
bind W kill-window bind W kill-window
# I'd rather have the session
# list functionality, don't use sync much.
# Pane sync # Pane sync
unbind s # unbind s
unbind S # unbind S
bind s setw synchronize-panes on # bind s setw synchronize-panes on
bind S setw synchronize-panes off # bind S setw synchronize-panes off
''; '';
plugins = with pkgs; [ plugins = with pkgs; [
{ {
+6
View File
@@ -44,6 +44,10 @@
"vite" "vite"
"pipx" "pipx"
"codex" "codex"
"python@3.11"
"glow"
"act"
"chromaprint"
]; ];
casks = [ casks = [
"ghostty" "ghostty"
@@ -63,6 +67,8 @@
"slack" "slack"
"discord" "discord"
"claude-code" "claude-code"
"calibre"
"rsyncui"
]; ];
}; };
+16
View File
@@ -3,6 +3,7 @@
pkgs, pkgs,
pkgs-unstable, pkgs-unstable,
opencode-tunneler, opencode-tunneler,
godig,
user, user,
... ...
} : } :
@@ -61,21 +62,36 @@ in {
})) }))
pkgs-unstable.vscode pkgs-unstable.vscode
pkgs-unstable.ngrok pkgs-unstable.ngrok
pkgs-unstable.flyctl
pkgs-unstable.awscli2
pkgs-unstable.google-cloud-sdk
pkgs-unstable.go pkgs-unstable.go
pkgs-unstable.gopls pkgs-unstable.gopls
pkgs-unstable.gotools pkgs-unstable.gotools
pkgs-unstable.bun pkgs-unstable.bun
pkgs-unstable.rustup
# Expo. # Expo.
pkgs-unstable.nodejs_24 pkgs-unstable.nodejs_24
pkgs-unstable.eas-cli pkgs-unstable.eas-cli
opencode-tunneler.packages.aarch64-darwin.default opencode-tunneler.packages.aarch64-darwin.default
godig.packages.aarch64-darwin.service
]; ];
stateVersion = "24.11"; stateVersion = "24.11";
}; };
programs.ssh = {
matchBlocks = {
media = {
user = "jmug";
hostname = "192.168.8.241";
forwardAgent = true;
};
};
};
programs.zsh = { programs.zsh = {
shellAliases = { shellAliases = {
# TODO BEGIN Interpolate the name of the host here. # TODO BEGIN Interpolate the name of the host here.