switched from foot to kitty, removed tmux, other tweaks
This commit is contained in:
parent
051e05e02a
commit
3571f22331
|
@ -7,7 +7,7 @@ pushd "$builddir"
|
||||||
|
|
||||||
rm -rf ./x265_git ./build ./build-10 ./build-12
|
rm -rf ./x265_git ./build ./build-10 ./build-12
|
||||||
|
|
||||||
git clone --depth 1 --branch 3.4.1 "https://bitbucket.org/multicoreware/x265_git.git"
|
git clone --depth 1 --branch 3.6 "https://bitbucket.org/multicoreware/x265_git.git"
|
||||||
|
|
||||||
cmake -S x265_git/source -B build-12 \
|
cmake -S x265_git/source -B build-12 \
|
||||||
-DCMAKE_INSTALL_PREFIX='/home/rudism/.local' \
|
-DCMAKE_INSTALL_PREFIX='/home/rudism/.local' \
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
font=monospace:size=14
|
|
||||||
|
|
||||||
[colors]
|
|
||||||
foreground=cdd6f4
|
|
||||||
background=1e1e2e
|
|
||||||
|
|
||||||
regular0=bac2de
|
|
||||||
regular1=f38ba8
|
|
||||||
regular2=a6e3a1
|
|
||||||
regular3=f9e2af
|
|
||||||
regular4=89b4fa
|
|
||||||
regular5=f5c2e7
|
|
||||||
regular6=94e2d5
|
|
||||||
regular7=585b70
|
|
||||||
|
|
||||||
bright0=a6adc8
|
|
||||||
bright1=f38ba8
|
|
||||||
bright2=a6e3a1
|
|
||||||
bright3=f9e2af
|
|
||||||
bright4=89b4fa
|
|
||||||
bright5=f5c2e7
|
|
||||||
bright6=94e2d5
|
|
||||||
bright7=45475a
|
|
||||||
|
|
||||||
selection-foreground=cdd6f4
|
|
||||||
selection-background=414356
|
|
||||||
|
|
||||||
search-box-no-match=11111b f38ba8
|
|
||||||
search-box-match=cdd6f4 313244
|
|
||||||
|
|
||||||
jump-labels=11111b fab387
|
|
||||||
urls=89b4fa
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
# vim:ft=kitty
|
||||||
|
|
||||||
|
## name: Catppuccin-Mocha
|
||||||
|
## author: Pocco81 (https://github.com/Pocco81)
|
||||||
|
## license: MIT
|
||||||
|
## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
|
||||||
|
## blurb: Soothing pastel theme for the high-spirited!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# The basic colors
|
||||||
|
foreground #CDD6F4
|
||||||
|
background #1E1E2E
|
||||||
|
selection_foreground #1E1E2E
|
||||||
|
selection_background #F5E0DC
|
||||||
|
|
||||||
|
# Cursor colors
|
||||||
|
cursor #F5E0DC
|
||||||
|
cursor_text_color #1E1E2E
|
||||||
|
|
||||||
|
# URL underline color when hovering with mouse
|
||||||
|
url_color #F5E0DC
|
||||||
|
|
||||||
|
# Kitty window border colors
|
||||||
|
active_border_color #B4BEFE
|
||||||
|
inactive_border_color #6C7086
|
||||||
|
bell_border_color #F9E2AF
|
||||||
|
|
||||||
|
# OS Window titlebar colors
|
||||||
|
wayland_titlebar_color system
|
||||||
|
macos_titlebar_color system
|
||||||
|
|
||||||
|
# Tab bar colors
|
||||||
|
active_tab_foreground #11111B
|
||||||
|
active_tab_background #CBA6F7
|
||||||
|
inactive_tab_foreground #CDD6F4
|
||||||
|
inactive_tab_background #181825
|
||||||
|
tab_bar_background #11111B
|
||||||
|
|
||||||
|
# Colors for marks (marked text in the terminal)
|
||||||
|
mark1_foreground #1E1E2E
|
||||||
|
mark1_background #B4BEFE
|
||||||
|
mark2_foreground #1E1E2E
|
||||||
|
mark2_background #CBA6F7
|
||||||
|
mark3_foreground #1E1E2E
|
||||||
|
mark3_background #74C7EC
|
||||||
|
|
||||||
|
# The 16 terminal colors
|
||||||
|
|
||||||
|
# black
|
||||||
|
color0 #45475A
|
||||||
|
color8 #585B70
|
||||||
|
|
||||||
|
# red
|
||||||
|
color1 #F38BA8
|
||||||
|
color9 #F38BA8
|
||||||
|
|
||||||
|
# green
|
||||||
|
color2 #A6E3A1
|
||||||
|
color10 #A6E3A1
|
||||||
|
|
||||||
|
# yellow
|
||||||
|
color3 #F9E2AF
|
||||||
|
color11 #F9E2AF
|
||||||
|
|
||||||
|
# blue
|
||||||
|
color4 #89B4FA
|
||||||
|
color12 #89B4FA
|
||||||
|
|
||||||
|
# magenta
|
||||||
|
color5 #F5C2E7
|
||||||
|
color13 #F5C2E7
|
||||||
|
|
||||||
|
# cyan
|
||||||
|
color6 #94E2D5
|
||||||
|
color14 #94E2D5
|
||||||
|
|
||||||
|
# white
|
||||||
|
color7 #BAC2DE
|
||||||
|
color15 #A6ADC8
|
File diff suppressed because it is too large
Load Diff
|
@ -48,6 +48,9 @@ vim.api.nvim_set_keymap('n', 'z=', '<cmd>Telescope spell_suggest<cr>', noremap)
|
||||||
-- f12 for zen mode
|
-- f12 for zen mode
|
||||||
vim.api.nvim_set_keymap('n', '<F12>', '<cmd>TZAtaraxis<cr>', noremap)
|
vim.api.nvim_set_keymap('n', '<F12>', '<cmd>TZAtaraxis<cr>', noremap)
|
||||||
|
|
||||||
|
-- clipboard history
|
||||||
|
vim.api.nvim_set_keymap('n', '<leader>y', '<cmd>YankBank<cr>', noremap)
|
||||||
|
|
||||||
vim.api.nvim_set_keymap('', '<S-ScrollWheelUp>', '<ScrollWheelLeft>', noremap)
|
vim.api.nvim_set_keymap('', '<S-ScrollWheelUp>', '<ScrollWheelLeft>', noremap)
|
||||||
vim.api.nvim_set_keymap('', '<S-ScrollWheelDown>', '<ScrollWheelRight>', noremap)
|
vim.api.nvim_set_keymap('', '<S-ScrollWheelDown>', '<ScrollWheelRight>', noremap)
|
||||||
vim.api.nvim_set_keymap('', '<S-2-ScrollWheelUp>', '<2-ScrollWheelLeft>', noremap)
|
vim.api.nvim_set_keymap('', '<S-2-ScrollWheelUp>', '<2-ScrollWheelLeft>', noremap)
|
||||||
|
|
|
@ -17,6 +17,9 @@ require('luasnip.loaders.from_snipmate').lazy_load({
|
||||||
paths = "~/.config/nvim/snippets"
|
paths = "~/.config/nvim/snippets"
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- yankbank config
|
||||||
|
require('yankbank').setup()
|
||||||
|
|
||||||
-- replace built in selector with telescope
|
-- replace built in selector with telescope
|
||||||
local fb_actions = require'telescope'.extensions.file_browser.actions
|
local fb_actions = require'telescope'.extensions.file_browser.actions
|
||||||
require('telescope').setup {
|
require('telescope').setup {
|
||||||
|
|
|
@ -17,6 +17,7 @@ return require('packer').startup(function()
|
||||||
use 'gpanders/editorconfig.nvim'
|
use 'gpanders/editorconfig.nvim'
|
||||||
use 'neovim/nvim-lspconfig'
|
use 'neovim/nvim-lspconfig'
|
||||||
use 'L3MON4D3/LuaSnip' -- snipets
|
use 'L3MON4D3/LuaSnip' -- snipets
|
||||||
|
use 'ptdewey/yankbank-nvim' -- clipboard history
|
||||||
use {
|
use {
|
||||||
'hrsh7th/nvim-cmp', -- autocomplete
|
'hrsh7th/nvim-cmp', -- autocomplete
|
||||||
requires = {
|
requires = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
set $mod Mod4
|
set $mod Mod4
|
||||||
set $term foot
|
set $term kitty -1
|
||||||
set $menu fuzzel
|
set $menu fuzzel
|
||||||
set $wobpipe /run/user/1000/wobpipe
|
set $wobpipe /run/user/1000/wobpipe
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
set $qterm-id quaketerm
|
set $qterm-id quaketerm
|
||||||
set $qterm $term -a $qterm-id
|
set $qterm $term --app-id $qterm-id
|
||||||
set $qterm-resize resize set 100ppt 40ppt, move position 0 0
|
set $qterm-resize resize set 100ppt 40ppt, move position 0 0
|
||||||
|
|
||||||
for_window [app_id="$qterm-id"] {
|
for_window [app_id="$qterm-id"] {
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
session="$(loginctl show-session "$(loginctl | grep "$(whoami)" | awk '{print $1}')" -p Type)"
|
|
||||||
|
|
||||||
if [ "$session" = "Type=x11" ]; then
|
|
||||||
exec xsel -b -i "$@"
|
|
||||||
else
|
|
||||||
exec wl-copy "$@"
|
|
||||||
fi
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
session="$(loginctl show-session "$(loginctl | grep "$(whoami)" | awk '{print $1}')" -p Type)"
|
|
||||||
|
|
||||||
if [ "$session" = "Type=x11" ]; then
|
|
||||||
exec xsel -b -o
|
|
||||||
else
|
|
||||||
exec wl-paste
|
|
||||||
fi
|
|
|
@ -1,32 +0,0 @@
|
||||||
set-option -g history-limit 100000
|
|
||||||
set-option -g status off
|
|
||||||
set-option -g focus-events on
|
|
||||||
|
|
||||||
set -ga terminal-overrides ",*256col*:Tc"
|
|
||||||
set -g mouse on
|
|
||||||
|
|
||||||
setw -g aggressive-resize on
|
|
||||||
setw -g mode-keys vi
|
|
||||||
setw -g automatic-rename on
|
|
||||||
|
|
||||||
bind m \
|
|
||||||
set -g mouse on \;\
|
|
||||||
display 'Mouse: ON'
|
|
||||||
|
|
||||||
bind M \
|
|
||||||
set -g mouse off \;\
|
|
||||||
display 'Mouse: OFF'
|
|
||||||
|
|
||||||
set -s copy-command '~/skynet/tmux/copy-cmd'
|
|
||||||
bind ] run "tmux set-buffer -- \"$(~/skynet/tmux/paste-cmd)\"; tmux paste-buffer"
|
|
||||||
bind-key -n MouseDown2Pane run "tmux set-buffer -- \"$(~/skynet/tmux/paste-cmd)\"; tmux paste-buffer"
|
|
||||||
|
|
||||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
|
||||||
bind-key -T copy-mode-vi y send-keys -X copy-selection
|
|
||||||
bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
|
|
||||||
|
|
||||||
bind r source-file ~/.tmux.conf \; display "tmux config reloaded :)"
|
|
||||||
bind i split-window -h -c "#{pane_current_path}"
|
|
||||||
bind j split-window -v -c "#{pane_current_path}"
|
|
||||||
|
|
||||||
set -s escape-time 0
|
|
|
@ -21,6 +21,7 @@ alias syncmusic='rsync -av --size-only --ignore-times --no-perms --no-owner --no
|
||||||
alias watchsync='watch -d grep -e Dirty: -e Writeback: /proc/meminfo'
|
alias watchsync='watch -d grep -e Dirty: -e Writeback: /proc/meminfo'
|
||||||
alias localai='COMPOSE_FILE=~/.local/share/local-ai/docker-compose.yaml docker compose up -d --force-recreate'
|
alias localai='COMPOSE_FILE=~/.local/share/local-ai/docker-compose.yaml docker compose up -d --force-recreate'
|
||||||
alias win='dbus-run-session sway --unsupported-gpu'
|
alias win='dbus-run-session sway --unsupported-gpu'
|
||||||
|
alias transcrilium='/home/rudism/src/transcrilium/transcrilium /mnt/usb/PRIVATE/SONY/REC_FILE/Voice\ Notes01'
|
||||||
|
|
||||||
# llm aliases that use aichat
|
# llm aliases that use aichat
|
||||||
if command -v aichat >/dev/null; then
|
if command -v aichat >/dev/null; then
|
||||||
|
|
|
@ -54,6 +54,7 @@ source ~/skynet/zsh/zsh-grc
|
||||||
export DOTNET_ROOT=$HOME/dotnet
|
export DOTNET_ROOT=$HOME/dotnet
|
||||||
export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH
|
||||||
export PATH=$HOME/.local/bin:$HOME/dotnet:$HOME/.dotnet/tools:$HOME/go/bin:$HOME/.cargo/bin:$HOME/node/node_modules/.bin:$PATH
|
export PATH=$HOME/.local/bin:$HOME/dotnet:$HOME/.dotnet/tools:$HOME/go/bin:$HOME/.cargo/bin:$HOME/node/node_modules/.bin:$PATH
|
||||||
|
export MANPATH=$MANPATH:$HOME/.local/share/man
|
||||||
|
|
||||||
# keybindings
|
# keybindings
|
||||||
bindkey "^[[1~" beginning-of-line
|
bindkey "^[[1~" beginning-of-line
|
||||||
|
@ -70,8 +71,3 @@ if [ -d "$HOME/.config/plasma-workspace/env" ]; then
|
||||||
source "$sh"
|
source "$sh"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# load tmux if it exists and we're not in it
|
|
||||||
if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ linux ]] && [ -z "$TMUX" ]; then
|
|
||||||
exec tmux
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in New Issue