Various changes to desktop configuration
This commit is contained in:
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
machines/desktop/config/aichat/config.yaml
|
||||||
8
machines/desktop/config/aichat/config.yaml.example
Normal file
8
machines/desktop/config/aichat/config.yaml.example
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# see https://github.com/sigoden/aichat/blob/main/config.example.yaml
|
||||||
|
|
||||||
|
model: openrouter:xiaomi/mimo-v2-flash
|
||||||
|
clients:
|
||||||
|
- type: openai-compatible
|
||||||
|
name: openrouter
|
||||||
|
api_base: https://openrouter.ai/api/v1
|
||||||
|
api_key:
|
||||||
1797
machines/desktop/config/aichat/models-override.yaml
Normal file
1797
machines/desktop/config/aichat/models-override.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -20,12 +20,23 @@ if status is-interactive
|
|||||||
abbr -a mv 'mv -i'
|
abbr -a mv 'mv -i'
|
||||||
abbr -a rm 'rm -i'
|
abbr -a rm 'rm -i'
|
||||||
|
|
||||||
|
alias ai="aichat"
|
||||||
|
alias llm="aichat"
|
||||||
|
|
||||||
if type -q fzf
|
if type -q fzf
|
||||||
fzf --fish | source
|
fzf --fish | source
|
||||||
end
|
end
|
||||||
|
|
||||||
if type -q starship
|
if type -q starship
|
||||||
starship init fish | source
|
if test "$TERM" != linux
|
||||||
|
starship init fish | source
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -z "$WAYLAND_DISPLAY"; and test (tty) = "/dev/tty1"
|
||||||
|
exec sway
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
26
machines/desktop/config/mako/config
Normal file
26
machines/desktop/config/mako/config
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
font=Hack Nerd Font 10
|
||||||
|
background-color=#1c1c24
|
||||||
|
text-color=#cdcdcd
|
||||||
|
border-color=#2f2f3d
|
||||||
|
progress-color=#7e98e8
|
||||||
|
|
||||||
|
border-size=2
|
||||||
|
border-radius=0
|
||||||
|
padding=8
|
||||||
|
margin=6
|
||||||
|
|
||||||
|
default-timeout=5000
|
||||||
|
ignore-timeout=0
|
||||||
|
|
||||||
|
[urgency=low]
|
||||||
|
background-color=#141415
|
||||||
|
text-color=#c3c3d5
|
||||||
|
|
||||||
|
[urgency=normal]
|
||||||
|
background-color=#1c1c24
|
||||||
|
text-color=#cdcdcd
|
||||||
|
|
||||||
|
[urgency=high]
|
||||||
|
background-color=#1c1c24
|
||||||
|
text-color=#d8647e
|
||||||
|
border-color=#d8647e
|
||||||
39
machines/desktop/config/nvim/lazy-lock.json
Normal file
39
machines/desktop/config/nvim/lazy-lock.json
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
"LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
|
||||||
|
"alpha-nvim": { "branch": "main", "commit": "a9d8fb72213c8b461e791409e7feabb74eb6ce73" },
|
||||||
|
"base16-black-metal-scheme": { "branch": "master", "commit": "c7a32bec8105a1ceddb9fcc90b713dabde5e7e5e" },
|
||||||
|
"blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
|
||||||
|
"copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" },
|
||||||
|
"fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
|
||||||
|
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
||||||
|
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
||||||
|
"fzf-lua": { "branch": "main", "commit": "5921997472574fca3880b62949eb8679dc6f5afc" },
|
||||||
|
"gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
|
||||||
|
"grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" },
|
||||||
|
"kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
|
||||||
|
"koda.nvim": { "branch": "main", "commit": "25c52c710a5083cf6f3ac533d57fefecce7e2021" },
|
||||||
|
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||||
|
"lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
|
||||||
|
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||||
|
"marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" },
|
||||||
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
||||||
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
|
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
|
||||||
|
"nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" },
|
||||||
|
"nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
|
||||||
|
"nvim-treesitter": { "branch": "main", "commit": "4d9466677a5ceadef104eaa0fe08d60d91c4e9a7" },
|
||||||
|
"nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
|
||||||
|
"oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
|
||||||
|
"opencode.nvim": { "branch": "main", "commit": "d080eb4e4f03cfdcb3c5eacc88cc4e17bd8c1980" },
|
||||||
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
|
"snipe.nvim": { "branch": "main", "commit": "d2d196c335919767803f905d573ce66340e33ee6" },
|
||||||
|
"tabout.nvim": { "branch": "master", "commit": "9a3499480a8e53dcaa665e2836f287e3b7764009" },
|
||||||
|
"targets.vim": { "branch": "master", "commit": "6325416da8f89992b005db3e4517aaef0242602e" },
|
||||||
|
"typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" },
|
||||||
|
"vague.nvim": { "branch": "main", "commit": "c1ab4d4891ff3a27deba6a80222d895ac8ffb2e5" },
|
||||||
|
"vesper.nvim": { "branch": "main", "commit": "1717b1ad657c94bec3fc2bdebb0c55452d9fe46d" },
|
||||||
|
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
|
||||||
|
"vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" },
|
||||||
|
"vimtex": { "branch": "master", "commit": "95b93a24740f7b89dd8331326b41bdd1337d79f6" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
|
||||||
|
}
|
||||||
@@ -49,9 +49,18 @@ input type:keyboard {
|
|||||||
xkb_layout "us"
|
xkb_layout "us"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
output HDMI-A-1 resolution 2560x1440 pos 0 0
|
||||||
|
output HDMI-A-2 resolution 1920x1080 pos -1920 0
|
||||||
|
|
||||||
|
workspace 1 output HDMI-A-1
|
||||||
|
workspace 4 output HDMI-A-2
|
||||||
|
|
||||||
|
|
||||||
workspace_auto_back_and_forth yes
|
workspace_auto_back_and_forth yes
|
||||||
bindsym $mod+Tab workspace back_and_forth
|
bindsym $mod+Tab workspace back_and_forth
|
||||||
|
|
||||||
|
bindsym $mod+Shift+m exec ~/.config/sway/toggle-hdmi.sh
|
||||||
|
|
||||||
### Key bindings
|
### Key bindings
|
||||||
bindsym $mod+Return exec $term
|
bindsym $mod+Return exec $term
|
||||||
bindsym $mod+q kill
|
bindsym $mod+q kill
|
||||||
@@ -112,3 +121,5 @@ bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
|
|||||||
bindsym Print exec grim -g "$(slurp)" - | wl-copy
|
bindsym Print exec grim -g "$(slurp)" - | wl-copy
|
||||||
bindsym $mod+Print exec grim - | wl-copy
|
bindsym $mod+Print exec grim - | wl-copy
|
||||||
|
|
||||||
|
|
||||||
|
exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway
|
||||||
|
|||||||
17
machines/desktop/config/sway/toggle-hdmi.sh
Executable file
17
machines/desktop/config/sway/toggle-hdmi.sh
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
OUTPUT="HDMI-A-2"
|
||||||
|
|
||||||
|
active="$(swaymsg -t get_outputs -r \
|
||||||
|
| jq -r --arg o "$OUTPUT" '.[] | select(.name==$o) | .active')"
|
||||||
|
|
||||||
|
case "$active" in
|
||||||
|
true) swaymsg output "$OUTPUT" disable ;;
|
||||||
|
false) swaymsg output "$OUTPUT" enable ;;
|
||||||
|
*)
|
||||||
|
printf 'Output %s not found or jq parse error\n' "$OUTPUT" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
61
machines/desktop/config/tmux/tmux.conf
Normal file
61
machines/desktop/config/tmux/tmux.conf
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
unbind C-b
|
||||||
|
set -g prefix C-a
|
||||||
|
bind C-a send-prefix
|
||||||
|
|
||||||
|
bind -n M-h previous-window
|
||||||
|
bind -n M-l next-window
|
||||||
|
|
||||||
|
unbind x
|
||||||
|
bind x kill-pane
|
||||||
|
|
||||||
|
unbind &
|
||||||
|
bind & kill-window
|
||||||
|
|
||||||
|
set -g default-terminal "tmux-256color"
|
||||||
|
set -as terminal-overrides ',*:Tc'
|
||||||
|
|
||||||
|
set -g detach-on-destroy off
|
||||||
|
set -g renumber-windows on
|
||||||
|
set -g base-index 1
|
||||||
|
setw -g pane-base-index 1
|
||||||
|
|
||||||
|
set -g status-position top
|
||||||
|
set -g status on
|
||||||
|
|
||||||
|
set -g status-style "bg=default,fg=white"
|
||||||
|
set -g status-left ""
|
||||||
|
set -g status-right ""
|
||||||
|
set -g status-justify centre
|
||||||
|
|
||||||
|
set -g window-status-format "#I: #W"
|
||||||
|
set -g window-status-current-format "#I: #W"
|
||||||
|
|
||||||
|
set -g window-status-separator " "
|
||||||
|
set -g status-interval 5
|
||||||
|
|
||||||
|
set -g pane-border-style "fg=colour240"
|
||||||
|
set -g pane-active-border-style "fg=white"
|
||||||
|
|
||||||
|
set -g mouse on
|
||||||
|
set -g history-limit 10000
|
||||||
|
setw -g automatic-rename on
|
||||||
|
|
||||||
|
# neovim tmux navigator
|
||||||
|
vim_pattern='(\S+/)?g?\.?(view|l?n?vim?x?|fzf)(diff)?(-wrapped)?'
|
||||||
|
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
||||||
|
| grep -iqE '^[^TXZ ]+ +${vim_pattern}$'"
|
||||||
|
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
||||||
|
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
||||||
|
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
||||||
|
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
||||||
|
tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
|
||||||
|
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
||||||
|
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
||||||
|
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
|
||||||
|
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
|
||||||
|
|
||||||
|
bind-key -T copy-mode-vi 'C-h' select-pane -L
|
||||||
|
bind-key -T copy-mode-vi 'C-j' select-pane -D
|
||||||
|
bind-key -T copy-mode-vi 'C-k' select-pane -U
|
||||||
|
bind-key -T copy-mode-vi 'C-l' select-pane -R
|
||||||
|
bind-key -T copy-mode-vi 'C-\' select-pane -l
|
||||||
Reference in New Issue
Block a user