updates
This commit is contained in:
fwastring
parent
03e5a47910
commit
36ade9a42d
6 changed files with 147 additions and 65 deletions
|
|
@ -75,57 +75,39 @@ in
|
|||
ls = "eza -l";
|
||||
lg = "lazygit";
|
||||
ka = "kubectl apply -f";
|
||||
t = "timew";
|
||||
a = "nix develop; opencode";
|
||||
todo = "jira issue list -a 'Fredrik Wastring' -s ~Done -s ~Closed -s ~Released --plain";
|
||||
cam = "jira issue create && jira issue assign && jira issue move";
|
||||
e = "kubectx";
|
||||
s = {
|
||||
setCursor = "%";
|
||||
expansion = "cha https://search.wastring.com/search?q=%";
|
||||
};
|
||||
tw = {
|
||||
setCursor = "%";
|
||||
expansion = "typst watch % --open zathura /tmp/zathura.pdf";
|
||||
};
|
||||
c = {
|
||||
setCursor = "%";
|
||||
expansion = "ssh 'fw:%@gateway.internalifacts.se' -p 2222";
|
||||
};
|
||||
dl = {
|
||||
setCursor = "&";
|
||||
expansion = "yt-dlp -o \"~/videor/%(title)s - %(uploader)s\" \"&\"";
|
||||
};
|
||||
e = "nvim";
|
||||
};
|
||||
interactiveShellInit =
|
||||
let
|
||||
fzfOpts = catppuccinFzfOptions.${config.fish.theme};
|
||||
in
|
||||
''
|
||||
fish_vi_key_bindings
|
||||
set fish_greeting
|
||||
set FLAKE_DIR "/home/fw/nix"
|
||||
set JIRA_API_TOKEN ATATT3xFfGF0_fkpGB1ne-QOSJzFVG0yH31j2CRtdNqbePCyEm9enpnA2uA3go75_GQwZPFX_IO9tf10ALJWvDLjsuHl8MSOUkNd703Vqr4uuGLAbHY73Z_b9fDJVrfodTrGAN9sZ5Sp75opCVkXB7MVXSAIvlWimRdwe-tqDPH4vhwY9Hqcs6M=0510D6CD
|
||||
set -gx GITHUB_PERSONAL_ACCESS_TOKEN (cat /run/secrets/github_token)
|
||||
set -gx GITHUB_HOST "https://github.com"
|
||||
set -gx GRAFANA_SERVICE_ACCOUNT_TOKEN (cat /run/secrets/grafana_token)
|
||||
set -gx GRAFANA_URL "https://monitoring.internalifacts.se"
|
||||
set -Ux FZF_CTRL_R_OPTS "--reverse"
|
||||
set -Ux FZF_TMUX_OPTS "-p"
|
||||
set -e GOROOT
|
||||
set -x -U GOPATH $HOME/.go
|
||||
gh completion -s fish > ~/.config/fish/completions/gh.fish
|
||||
set -gx PATH $PATH $HOME/scripts
|
||||
set -gx PATH $PATH $HOME/.krew/bin
|
||||
fish_vi_key_bindings
|
||||
set fish_greeting
|
||||
set FLAKE_DIR "/home/fw/nix"
|
||||
if test -r /run/secrets/jira_token
|
||||
set -gx JIRA_API_TOKEN (string trim (cat /run/secrets/jira_token))
|
||||
end
|
||||
set -gx GITHUB_PERSONAL_ACCESS_TOKEN (cat /run/secrets/github_token)
|
||||
set -gx GITHUB_HOST "https://github.com"
|
||||
set -gx GRAFANA_SERVICE_ACCOUNT_TOKEN (cat /run/secrets/grafana_token)
|
||||
set -gx GRAFANA_URL "https://monitoring.internalifacts.se"
|
||||
set -Ux FZF_CTRL_R_OPTS "--reverse"
|
||||
set -Ux FZF_TMUX_OPTS "-p"
|
||||
set -e GOROOT
|
||||
set -x -U GOPATH $HOME/.go
|
||||
gh completion -s fish > ~/.config/fish/completions/gh.fish
|
||||
set -gx PATH $PATH $HOME/scripts
|
||||
set -gx PATH $PATH $HOME/.krew/bin
|
||||
|
||||
|
||||
if not set -q SSH_AUTH_SOCK
|
||||
eval (ssh-agent -c)
|
||||
ssh-add ~/.ssh/id_ed25519 >/dev/null 2>&1
|
||||
set SSH_AUTH_SOCK /home/fw/.bitwarden-ssh-agent.sock
|
||||
end
|
||||
if not set -q SSH_AUTH_SOCK
|
||||
eval (ssh-agent -c)
|
||||
ssh-add ~/.ssh/id_ed25519 >/dev/null 2>&1
|
||||
set SSH_AUTH_SOCK /home/fw/.bitwarden-ssh-agent.sock
|
||||
end
|
||||
|
||||
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
|
||||
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,18 +25,89 @@
|
|||
|
||||
programs.home-manager.enable = true;
|
||||
programs.fish.enable = true;
|
||||
programs.opencode = {
|
||||
enable = true;
|
||||
enableMcpIntegration = false;
|
||||
settings = {
|
||||
"$schema" = "https://opencode.ai/config.json";
|
||||
theme = lib.mkForce "catppuccin";
|
||||
plugin = [ "@ex-machina/opencode-anthropic-auth" ];
|
||||
mcp = {
|
||||
az = {
|
||||
type = "local";
|
||||
command = [
|
||||
"docker"
|
||||
"run"
|
||||
"-i"
|
||||
"--rm"
|
||||
"--env-file"
|
||||
"/home/fw/.azure/credentials"
|
||||
"mcr.microsoft.com/azure-sdk/azure-mcp:latest"
|
||||
];
|
||||
};
|
||||
k8s = {
|
||||
type = "local";
|
||||
command = [
|
||||
"docker"
|
||||
"run"
|
||||
"--rm"
|
||||
"-i"
|
||||
"--user"
|
||||
"1000:100"
|
||||
"-v"
|
||||
"/home/fw/.kube:/kube:ro"
|
||||
"ghcr.io/containers/kubernetes-mcp-server:latest"
|
||||
"--kubeconfig"
|
||||
"/kube/config"
|
||||
];
|
||||
};
|
||||
github = {
|
||||
type = "local";
|
||||
command = [
|
||||
"docker"
|
||||
"run"
|
||||
"-i"
|
||||
"--rm"
|
||||
"-e"
|
||||
"GITHUB_PERSONAL_ACCESS_TOKEN"
|
||||
"ghcr.io/github/github-mcp-server"
|
||||
];
|
||||
};
|
||||
jira = {
|
||||
type = "local";
|
||||
command = [
|
||||
"docker"
|
||||
"run"
|
||||
"-i"
|
||||
"--rm"
|
||||
"--env-file"
|
||||
"/home/fw/.config/opencode/.env.local"
|
||||
"ghcr.io/sooperset/mcp-atlassian:latest"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.activation.opencodeAtlassianEnv = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
mkdir -p "$HOME/.config/opencode"
|
||||
if [ -r /run/secrets/opencode_atlassian_env ]; then
|
||||
ln -sf /run/secrets/opencode_atlassian_env "$HOME/.config/opencode/.env.local"
|
||||
fi
|
||||
'';
|
||||
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
# theme = "catppuccin_${theme}";
|
||||
theme = "catppuccin_mocha";
|
||||
settings = {
|
||||
font = {
|
||||
normal = {
|
||||
family = lib.mkForce "FiraCode Nerd Font Mono";
|
||||
};
|
||||
size = lib.mkForce 16;
|
||||
};
|
||||
};
|
||||
enable = true;
|
||||
# theme = "catppuccin_${theme}";
|
||||
theme = "catppuccin_mocha";
|
||||
settings = {
|
||||
font = {
|
||||
normal = {
|
||||
family = lib.mkForce "FiraCode Nerd Font Mono";
|
||||
};
|
||||
size = lib.mkForce 16;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.username = "fw";
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
# GUI
|
||||
feishin
|
||||
vscode
|
||||
vscode
|
||||
signal-desktop
|
||||
thunderbird
|
||||
discord
|
||||
|
|
@ -71,18 +71,18 @@
|
|||
remmina
|
||||
brightnessctl
|
||||
speedcrunch
|
||||
opencode
|
||||
quickemu
|
||||
virt-viewer
|
||||
go-passbolt-cli
|
||||
wf-recorder
|
||||
slurp
|
||||
bitwarden-desktop
|
||||
bitwarden-cli
|
||||
lagrange
|
||||
jujutsu
|
||||
rclone
|
||||
|
||||
quickemu
|
||||
virt-viewer
|
||||
go-passbolt-cli
|
||||
wf-recorder
|
||||
slurp
|
||||
bitwarden-desktop
|
||||
jira-cli-go
|
||||
|
||||
dbeaver-bin
|
||||
(
|
||||
|
|
@ -115,7 +115,8 @@
|
|||
)
|
||||
|
||||
# TUI
|
||||
codex
|
||||
# nodejs
|
||||
claude-code
|
||||
|
||||
# Browsers
|
||||
librewolf
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ with lib;
|
|||
telescope = true;
|
||||
treesitter = true;
|
||||
cmp = true;
|
||||
lualine = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -251,6 +252,18 @@ with lib;
|
|||
};
|
||||
};
|
||||
};
|
||||
# avante = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# provider = "claude-code";
|
||||
# acp_providers = {
|
||||
# claude-code = {
|
||||
# command = "npx";
|
||||
# args = [ "@zed-industries/claude-code-acp" ];
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
treesitter = {
|
||||
enable = true;
|
||||
|
|
@ -363,6 +376,9 @@ with lib;
|
|||
};
|
||||
};
|
||||
};
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
plenary-nvim
|
||||
];
|
||||
enableMan = false;
|
||||
autoCmd = [
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue