diff --git a/fish-cyberboobs/.config/fish/device-conf.fish b/fish-cyberboobs/.config/fish/device-conf.fish index d48c5a7..9582a84 100644 --- a/fish-cyberboobs/.config/fish/device-conf.fish +++ b/fish-cyberboobs/.config/fish/device-conf.fish @@ -1,4 +1,4 @@ if test "$TERM" != dumb - eval (/usr/bin/starship init fish) + eval (/usr/local/bin/starship init fish) end diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index acd3970..050b740 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -20,7 +20,6 @@ status --is-interactive; and begin # Aliases alias backup '$HOME/.borg/backup.sh' alias budget 'hledger print income:krankengeld | grep -Po '\''^\d\d\d\d-\d\d-\d\d'\'' | tail -1 | xargs -I{} hledger balance budgets date:{}-today' - alias cat bat alias fox cat alias g git alias grep rg @@ -33,6 +32,7 @@ status --is-interactive; and begin alias tt 'exa --git -Tl' alias vimdiff 'nvim -d' alias vim 'nvim' + alias cat batcat # Interactive shell initialisation set -gx GPG_TTY (tty) @@ -41,10 +41,10 @@ status --is-interactive; and begin end -if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ] - exec sway -end +#if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ] +# exec sway +#end set -g EDITOR /usr/bin/nvim set -g VISUAL /usr/bin/nvim -set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket +#set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket diff --git a/gtk/.config/gtk-3.0/.gitignore b/gtk/.config/gtk-3.0/.gitignore new file mode 100644 index 0000000..7e1f6a7 --- /dev/null +++ b/gtk/.config/gtk-3.0/.gitignore @@ -0,0 +1 @@ +bookmarks diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua.bak similarity index 84% rename from nvim/.config/nvim/init.lua rename to nvim/.config/nvim/init.lua.bak index f5c6799..bccbb23 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua.bak @@ -6,4 +6,4 @@ vim.cmd [[source /home/vi/.config/nvim/config.vim]]require("nightfox").setup({ } } }) -vim.cmd("colorscheme duskfox") +vim.cmd("colorscheme dayfox") diff --git a/nvim/.config/nvim/config.vim b/nvim/.config/nvim/init.vim similarity index 96% rename from nvim/.config/nvim/config.vim rename to nvim/.config/nvim/init.vim index 0643718..3f200e5 100644 --- a/nvim/.config/nvim/config.vim +++ b/nvim/.config/nvim/init.vim @@ -23,6 +23,7 @@ syntax on call plug#begin('~/.vim/plugged') Plug 'Yggdroot/indentLine' Plug 'EdenEast/nightfox.nvim' +Plug 'cdmill/neomodern.nvim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-syntastic/syntastic'