diff --git a/config/i3/config b/config/i3/config index c9d639a..933d1fb 100644 --- a/config/i3/config +++ b/config/i3/config @@ -98,8 +98,6 @@ bindsym $mod+o exec ~/lock.sh #bindsym $mod+o exec slimlock # ristretto bindsym $mod+e exec thunar -# Xournal -bindsym $mod+n exec xournalpp # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that @@ -297,8 +295,11 @@ bar { # separator_symbol "ʃ" #separator_symbol "❰" + separator_symbol " ❱ " + #separator_symbol " ▷ " + #separator_symbol " ∠ " #separator_symbol "|" - separator_symbol "ǁ" + #separator_symbol "ǁ" strip_workspace_name no diff --git a/config/i3/i3status.conf b/config/i3/i3status.conf new file mode 100644 index 0000000..d70edb5 --- /dev/null +++ b/config/i3/i3status.conf @@ -0,0 +1,44 @@ +order += "whatismyip" +order += "ipv6" +order += "wireless _first_" +order += "ethernet _first_" +order += "battery all" +order += "disk /" +order += "disk /home" +order += "load" +order += "memory" +order += "tztime local" + +whatismyip { + format = " {isp}\|{city}\|{countryCode} ({ip}) " + hide_when_offline = True + url_geo = "http://ip-api.com/json" +} + +battery all { + format = "%status %percentage %consumption" +} + +wireless _first_ { + format_up = " %ip (%essid)" + format_down = "" +} + +ethernet _first_ { + format_up = " %ip (%speed)" + format_down = "" +} + +disk "/" { + format = "%percentage_used (%used / %free / %total)" + on_click 1 = "exec thunar /" +} + +disk "/home" { + format = "%percentage_used (%used / %free / %total)" + on_click 1 = "exec thunar /home/legrems/Documents/Arcanite" +} + +tztime local { + format = "%Y-%m-%d %H:%M:%S" +} diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index e222acb..4bbac22 100644 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -2,6 +2,6 @@ configuration { show-icons: true; - font: "Courier New 32"; + font: "Courier New 12"; icon-theme: "Papirus"; } diff --git a/config/rofi/powermenu/powermenu.sh b/config/rofi/powermenu/powermenu.sh index 9b444f4..45dffea 100755 --- a/config/rofi/powermenu/powermenu.sh +++ b/config/rofi/powermenu/powermenu.sh @@ -34,11 +34,11 @@ uptime=$(uptime -p | sed -e 's/up //g') rofi_command="rofi -theme $dir/$theme" # Options -shutdown="" -reboot="" -lock="" -suspend="" -logout="" +shutdown="Sh" +reboot="Re" +lock="Lk" +suspend="Su" +logout="Lg" # Confirmation confirm_exit() { diff --git a/config/rofi/powermenu/styles/colors.rasi b/config/rofi/powermenu/styles/colors.rasi index a1d2937..d01b5ea 100644 --- a/config/rofi/powermenu/styles/colors.rasi +++ b/config/rofi/powermenu/styles/colors.rasi @@ -7,4 +7,4 @@ * */ -@import "nordic.rasi" +@import "gotham.rasi" diff --git a/gitconfig b/gitconfig index 0f2c5e1..97c75de 100644 --- a/gitconfig +++ b/gitconfig @@ -19,12 +19,12 @@ d = difftool adog = log --all --decorate --oneline --graph dog = log --decorate --oneline --graph -[core] - editor = nvim - excludesfile = /home/legrems/.gitignore_global [push] default = current - +[core] + editor = nvim + pager = delta + excludesfile = /home/legrems/.gitignore_global [pager] diff = delta log = delta diff --git a/tmux.conf b/tmux.conf index 823e5c7..bd9d7e5 100644 --- a/tmux.conf +++ b/tmux.conf @@ -6,8 +6,8 @@ bind-key C-a send-prefix # split panes bind | split-window -h -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}" -bind s split-window -h -p 25 -c "#{pane_current_path}" -bind g split-window -h -p 25 -c "#{pane_current_path}" -b +bind s split-window -h -p 20 -c "#{pane_current_path}" +bind g split-window -h -p 20 -c "#{pane_current_path}" -b bind v split-window -v -p 30 -c "#{pane_current_path}" # switch panes diff --git a/vimrc b/vimrc index b3467b8..8d2f606 100644 --- a/vimrc +++ b/vimrc @@ -202,7 +202,8 @@ Plug 'https://github.com/millermedeiros/vim-statline.git' Plug 'https://github.com/tpope/vim-fugitive' let g:statline_fugitive = 1 let g:fugitive_gitlab_domains = ['https://git.arcanite.ch', 'https://git.polylan.ch'] -Plug 'https://github.com/junegunn/gv.vim' +"Plug 'https://github.com/junegunn/gv.vim' +Plug 'https://github.com/Legrems/gv.vim' Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'https://github.com/vim-syntastic/syntastic.git' @@ -248,7 +249,6 @@ let g:lightline = { \ [ 'filename', 'readonly', 'modified' ], \ [ 'gitdiff' ] ], \ 'right': [ [ 'lineinfo' ], - \ [ 'percent' ], \ [ 'gitbranch' ] ] \ }, \ 'inactive': { @@ -265,6 +265,7 @@ let g:lightline = { \ 'gitdiff': 'middle', \ }, \ } + Plug 'https://github.com/preservim/nerdcommenter' " Add spaces after comment delimiters by default let g:NERDSpaceDelims = 0 @@ -512,8 +513,6 @@ nnoremap :bnext nnoremap o nnoremap O -" nnoremap %!xxd - nnoremap / Telescope search_history "nnoremap ch Telescope command_history nnoremap ch CocCommand fzf-preview.CommandPalette @@ -532,3 +531,9 @@ nnoremap iss ! glab issue list vmap y :w! /tmp/vimtmp " Read from temp file nmap p :r! cat /tmp/vimtmp + +" Copy filename + line number into clipboard +nmap oo :call setreg('+', expand("%:h") . "/" . expand("%:t") . "#L" . line(".")) + + +nmap xx :%!xxd diff --git a/work_monitor.sh b/work_monitor.sh new file mode 100755 index 0000000..4ae2487 --- /dev/null +++ b/work_monitor.sh @@ -0,0 +1,18 @@ +xrandr --output DP-1-0 --pos 0x0 +xrandr --output DP-1-3 --pos 2560x0 +xrandr --output eDP-1 --off + +i3-msg workspace 1 +i3-msg move workspace to output DP-1-3 + +i3-msg workspace 2 +i3-msg move workspace to output DP-1-3 + +i3-msg workspace 3 +i3-msg move workspace to output DP-1-0 + +i3-msg workspace 4 +i3-msg move workspace to output DP-1-0 + +i3-msg workspace 3 +i3-msg workspace 1 diff --git a/xinitrc b/xinitrc index 87ebc88..7650150 100644 --- a/xinitrc +++ b/xinitrc @@ -50,7 +50,8 @@ setxkbmap -option caps:swapescape # Set background #feh --bg-fill ~/Downloads/atlantis-nexus-nebula-black-background-digital-render-3840x2400-3704.jpg -feh --bg-fill ~/Downloads/digital-abstract-3d-render-pattern-minimal-art-black-3840x2160-7124.jpg +#feh --bg-fill ~/Downloads/digital-abstract-3d-render-pattern-minimal-art-black-3840x2160-7124.jpg +feh --bg-fill ~/Downloads/wp2618248-blackarch-wallpaper.png # Launch i3 exec i3 diff --git a/xprofile b/xprofile index 8e7495b..516628e 100644 --- a/xprofile +++ b/xprofile @@ -1,7 +1,7 @@ xbindkeys export QT_AUTO_SCREEN_SCALE_FACTOR=1 -export GDK_SCALE=2 -export GDK_DPI_SCALE=0.5 +export GDK_SCALE=1 +export GDK_DPI_SCALE=1 # Used by i3-sensible-terminal export TERMINAL=alacritty diff --git a/zsh/alias.sh b/zsh/alias.sh index b6393de..a23aa6b 100644 --- a/zsh/alias.sh +++ b/zsh/alias.sh @@ -29,6 +29,12 @@ amendnow() { GIT_COMMITTER_DATE="$(date +%d/%m/%Y' '%H:%M:%S)" git commit --amen continous-running() { while true; do inotifywait $1 -r -e close_write && ${@:2}; done } f() { find . -name "*$1*"; } +tar-create() {tar cfv $@} +tar-list() {tar -tvf $@} +tar-extract() {tar xfv $@} +us-layout() {setxkbmap us -option caps:swapescape } +usint-layout() {setxkbmap us -variant intl -option caps:swapescape } + make_venv() { echo $(basename $(pwd) | awk '{print "conda activate "$1}') > $(pwd | awk '{print $1"/.autoenv.zsh"}') echo $(basename $(pwd) | awk '{print "conda deactivate "}') > $(pwd | awk '{print $1"/.autoenv_leave.zsh"}') diff --git a/zsh/generic.sh b/zsh/generic.sh index 00c7bf9..afe1769 100644 --- a/zsh/generic.sh +++ b/zsh/generic.sh @@ -29,6 +29,8 @@ export PATH=$HOME/custom_commands:$PATH export NB_MINIONS=4 export VAGRANT_TYPE='abacus-abahost' export NB_HAPROXY=2 +export NB_PROXMOXS=1 +export VAGRANT_ABACUS_BOX="ubuntu/focal64" export VISUAL=nvim export EDITOR=nvim export AUTOENV_ENV_FILENAME='.autoenv.zsh'