diff options
| -rw-r--r-- | .config/i3/config | 82 | ||||
| -rw-r--r-- | .config/mpd/mpd.conf | 14 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 9 | ||||
| -rw-r--r-- | .config/picom.conf | 7 | ||||
| -rw-r--r-- | .config/xb.rc | 87 | ||||
| -rwxr-xr-x | .local/share/bin/flost | 2 | ||||
| -rw-r--r-- | .zshrc | 5 |
7 files changed, 125 insertions, 81 deletions
diff --git a/.config/i3/config b/.config/i3/config index 7fc73e5..6b0bcbf 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,6 +1,6 @@ # variables set $mod Mod4 -set $inner_gaps 10 +set $inner_gaps 16 set $outer_gaps 0 # set gaps @@ -8,7 +8,6 @@ gaps inner $inner_gaps gaps outer $outer_gaps # border color -# pywal-start client.focused #222222 #222222 #f0f0f0 #111111 #222222 client.focused_inactive #050505 #050505 #f0f0f0 #050505 #050505 client.unfocused #050505 #050505 #f0f0f0 #050505 #050505 @@ -16,46 +15,18 @@ client.urgent #050505 #ac8a8c #f0f0f0 #ac8a8c #ac8a8c client.placeholder #000000 #0c0c0c #f0f0f0 #050505 #050505 client.background #c7c5ca -# pywal-end +# Replace window decorations with a border +for_window [class=".*"] border pixel 0 # font -font pango:Fira Code 9 +font pango:Inter 9 # no idea what these do but they were in here by default exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork exec --no-startup-id nm-applet set $refresh_i3status killall -SIGUSR1 i3status -# Voulme keybinds -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status - -# window interactions floating_modifier $mod -bindsym $mod+q kill - -# Replace window decorations with a border -for_window [class=".*"] border pixel 0 - -# Keybinds -bindsym $mod+Escape exec "dm-tool lock" -bindsym $mod+b exec "polybar-msg cmd toggle" -bindsym $mod+space exec "rofi -show drun -show-icons" -bindsym $mod+Return exec st -bindsym $mod+p exec bwmenu -bindsym Print exec "maim -sb 4 -c 255,255,255 | xclip -selection clipboard -t image/png" - -bindsym XF86AudioPlay exec "playerctl play-pause" -bindsym XF86AudioNext exec "playerctl next" -bindsym XF86AudioPrev exec "playerctl previous" - -# 60% keyboard media controls -bindsym Mod1+Mod4+k exec "mpc toggle" -bindsym Mod1+Mod4+l exec "mpc next" -bindsym Mod1+Mod4+j exec "mpc prev" -bindsym Mod1+Mod4+minus exec "pactl set-sink-volume @DEFAULT_SINK@ -5%" -bindsym Mod1+Mod4+equal exec "pactl set-sink-volume @DEFAULT_SINK@ +5%" # Gaps bindsym $mod+i gaps inner current plus 5 @@ -73,31 +44,9 @@ exec "xbanish &" exec "redshift &" exec "dunst &" exec "flashfocus &" -exec --no-startup-id "xset r rate 250 40" -exec --no-startup-id "autocutsel &" - -bindsym Mod1+Control+Mod4+1 exec "sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 9500 && setwacom MapToOutput 1920x1080+0+0 && setwacom Suppress 2 && setwacom RawSample 7'" -bindsym Mod1+Control+Mod4+2 exec "sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 9500 && setwacom MapToOutput 1920x1080+1920+0 && setwacom Suppress 2 && setwacom RawSample 7'" -bindsym Mod1+Control+Mod4+3 exec "sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 7600 4275 && setwacom MapToOutput 1920x1080+0+0 && setwacom Suppress 0 && setwacom RawSample 1'" -bindsym Mod1+Control+Mod4+4 exec "sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 4275 && setwacom MapToOutput 3840x1080+0+0 && setwacom Suppress 2 && setwacom RawSample 7'" - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# move focused window -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -# resize focused window -bindsym $mod+bracketright resize grow height 10 px -bindsym $mod+bracketleft resize shrink height 10 px -bindsym $mod+period resize grow width 10 px -bindsym $mod+comma resize shrink width 10 px +exec "xbindkeys -f ~/.config/xb.rc" +exec "xset r rate 250 40" +exec "autocutsel &" # split in horizontal orientation bindsym $mod+bar split h @@ -115,9 +64,6 @@ bindsym $mod+Alt+space focus mode_toggle # focus the parent container bindsym $mod+Shift+a focus parent -# focus the child container -#bindsym $mod+d focus child - # workspaces set $ws1 "1" set $ws2 "2" @@ -151,6 +97,7 @@ bindsym $mod+Shift+8 move container to workspace number $ws8 # always floating windows for_window [class="Steam"] floating enable for_window [class="cinquo"] floating enable +for_window [class="Conky"] floating enable for_window [title="Farge"] floating enable for_window [title="^\[floating\].*"] floating enable for_window [window_type=notification] floating enable @@ -160,16 +107,3 @@ for_window [class="Unturned.x86_64"] fullscreen disable for_window [class="Minecraft.*"] floating enable for_window [class="Minecraft.*"] fullscreen enable -# reload the configuration file -bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -# bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" - -# bar { -# mode hide -# hidden_state hide -# modifier none -# tray_output none -# } diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 28a8e81..6b7fdf9 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -19,3 +19,17 @@ audio_output { type "pulse" name "pulse audio" } + +audio_output { + type "shout" + name "icecast mpd stream" + host "localhost" + port "8000" + mount "/mnt/mpd" + user "source" + password "sSJKfSicDF8" + bitrate "320" + format "48000:24:2" + encoding "mp3" +} + diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index c0d46e1..873f0fa 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -68,7 +68,6 @@ Plug 'octol/vim-cpp-enhanced-highlight' Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'ryanoasis/vim-devicons' "Icons for filetypes Plug 'junegunn/fzf.vim' -Plug '/usr/local/opt/fzf' Plug 'puremourning/vimspector' " themes @@ -134,6 +133,9 @@ let g:which_key_map['*'] = 'search-selected' map <leader>h :noh<cr> let g:which_key_map.h = 'no-highlighting' +map <leader>f :FZF<cr> +let g:which_key_map.f = 'fzf' + map <leader>b :norm gg=G``<cr> let g:which_key_map.b = 'format-file' @@ -162,18 +164,19 @@ let g:which_key_map.t = { \ } map <leader>.v :tabnew ~/.config/nvim/init.vim<cr> - map <leader>.c :tabnew ~/.config/picom.conf<cr> map <leader>.z :tabnew ~/.zshrc<cr> map <leader>.i :tabnew ~/.config/i3/config<cr> map <leader>.p :tabnew ~/.config/polybar/config.ini<cr> +map <leader>.x :tabnew ~/.config/xb.rc<cr> let g:which_key_map['.'] = { \ 'name': '+config', \ 'v': 'vim', \ 'z': 'zsh', \ 'i': 'i3', \ 'c': 'picom', - \ 'p': 'polybar' + \ 'p': 'polybar', + \ 'x': 'xbindkeysrc' \ } " cmd maps cnoreabbrev W w diff --git a/.config/picom.conf b/.config/picom.conf index ef79e43..73aa2fc 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -27,7 +27,8 @@ shadow-offset-x = -48; shadow-exclude = [ "!I3_FLOATING_WINDOW@:c && _NET_WM_WINDOW_TYPE@:32a *= '_NET_WM_WINDOW_TYPE_NORMAL'", - "class_g = 'firefox' && !I3_FLOATING_WINDOW@:c" + "class_g = 'firefox' && !I3_FLOATING_WINDOW@:c", + "class_g = 'conky'" ] wintypes: { @@ -50,6 +51,10 @@ wintypes: { menu = { fade = false; }; + + utility = { + shadow = false; + }; }; # combo diff --git a/.config/xb.rc b/.config/xb.rc new file mode 100644 index 0000000..3a60d41 --- /dev/null +++ b/.config/xb.rc @@ -0,0 +1,87 @@ +"dm-tool lock" + Mod4 + Escape +"polybar-msg cmd toggle" + Mod4 + b +"rofi -show drun -show-icons" + Mod4 + space +"st" + Mod4 + Return +"bwmenu" + Mod4 + p +"flost fzmp -A" + Mod4 + a +"maim -sb 4 -c 255,255,255 | xclip -selection clipboard -t image/png" + Print + + + +"pactl set-sink-volume @DEFAULT_SINK@ -5%" + Mod1+Mod4+minus +"pactl set-sink-volume @DEFAULT_SINK@ +5%" + Mod1+Mod4+equal + +"pactl set-sink-volume @DEFAULT_SINK@ +5%" + XF86AudioRaiseVolume +"pactl set-sink-volume @DEFAULT_SINK@ -5%" + XF86AudioLowerVolume +"pactl set-sink-mute @DEFAULT_SINK@ toggle" + XF86AudioMute + +"playerctl play-pause" + XF86AudioPlay +"playerctl next" + XF86AudioNext +"playerctl previous" + XF86AudioPrev + +"mpc toggle" + Mod1+Mod4+k +"mpc next" + Mod1+Mod4+l +"mpc prev" + Mod1+Mod4+j + + + +"sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 9500 && setwacom MapToOutput 1920x1080+0+0 && setwacom Suppress 2 && setwacom RawSample 7'" + Mod1 + Control + Mod4 + 1 +"sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 9500 && setwacom MapToOutput 1920x1080+1920+0 && setwacom Suppress 2 && setwacom RawSample 7'" + Mod1 + Control + Mod4 + 2 +"sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 7600 4275 && setwacom MapToOutput 1920x1080+0+0 && setwacom Suppress 0 && setwacom RawSample 1'" + Mod1 + Control + Mod4 + 3 +"sh -c 'export PATH=~/.local/share/bin:$PATH && setwacom Area 0 0 15200 4275 && setwacom MapToOutput 3840x1080+0+0 && setwacom Suppress 2 && setwacom RawSample 7'" + Mod1 + Control + Mod4 + 4 + + + +"i3-msg focus left" + Mod4 + h +"i3-msg focus down" + Mod4 + j +"i3-msg focus up" + Mod4 + k +"i3-msg focus right" + Mod4 + l + +"i3-msg move left" + Mod4 + Shift + h +"i3-msg move down" + Mod4 + Shift + j +"i3-msg move up" + Mod4 + Shift + k +"i3-msg move right" + Mod4 + Shift + l + +"i3-msg resize grow width 10 px" + Mod4 + period +"i3-msg resize shrink width 10 px" + Mod4 + comma + +"i3-msg kill" + Mod4 + q + +"i3-msg reload" + Mod4 + Shift + c +"i3-msg restart" + Mod4 + Shift + r + diff --git a/.local/share/bin/flost b/.local/share/bin/flost new file mode 100755 index 0000000..6d1185e --- /dev/null +++ b/.local/share/bin/flost @@ -0,0 +1,2 @@ +#!/bin/sh +st -T "[floating]" -g 150x40 -e $@ @@ -61,15 +61,14 @@ alias vim="nvim" alias copy="xclip -selection c" alias sctl="systemctl" alias ncp="ncmpcpp" -alias xsiv="i3-swallow sxiv" -alias scrcpy="i3-swallow scrcpy" -alias dnd="dragon-drag-and-drop" +alias dnd="dragon-drag-and-drop -x" alias adda="git add -A" alias first="git commit -m \"first commit\"" alias les="less" alias scdl="scdl --onlymp3 -l" alias screenrecord='giph -s -b 4 -c 255,255,255 $(date +"$HOME/%Y-%m-%d_%H-%M-%S.mp4")' function b64d { echo $1 | base64 -d } +function genplaylist { find $1 -name "*.flac" | sort -V > playlists/$1.m3u } alias r="ranger" alias v="nvim" alias l="live-server" |