diff options
| -rw-r--r-- | cfg/.tmux.conf | 16 | ||||
| -rw-r--r-- | cfg/.vimrc | 23 | ||||
| -rw-r--r-- | cfg/Preferences.sublime-settings | 10 | ||||
| -rw-r--r-- | cfg/alacritty.toml | 10 | ||||
| -rw-r--r-- | cfg/i3/config | 31 | ||||
| -rw-r--r-- | cfg/i3/jmdmenu | 4 | ||||
| -rw-r--r-- | cfg/i3/kurobar.sh | 5 | ||||
| -rw-r--r-- | cfg/i3/sway/config | 24 | ||||
| -rw-r--r-- | cfg/kitty-cfg | 28 | ||||
| -rw-r--r-- | cfg/kitty.conf | 57 |
10 files changed, 141 insertions, 67 deletions
diff --git a/cfg/.tmux.conf b/cfg/.tmux.conf index fa4b430..0908378 100644 --- a/cfg/.tmux.conf +++ b/cfg/.tmux.conf @@ -10,12 +10,15 @@ bind C-Space send-prefix set -g prefix2 '*' bind '*' send-prefix -# commodity +# commodities # splits bind n split-window -h bind v split-window -v bind h split-window -h # same as '*n' +set -g default-terminal "tmux-256color" +set-option -ga terminal-overrides ",xterm-256color:Tc" + # navigation bind h select-pane -L bind j select-pane -D @@ -46,13 +49,15 @@ set -g status-position bottom set -g status-justify left set -g status-style 'fg=red' -set -g status-left '' -set -g status-left-length 10 - set -g status-right-style 'fg=red bg=black' -set -g status-right '%Y-%m-%d %H:%M ' +set -g status-left " #S " +set -g status-left-length 30 +set -g status-right " %Y-%m-%d %H:%M " set -g status-right-length 50 +bind n split-window -h \; resize-pane -U 2 +bind v split-window -v \; resize-pane -U 2 + setw -g window-status-current-style 'fg=red bg=black' setw -g window-status-current-format ' #I #W #F ' @@ -75,3 +80,4 @@ bind -r 6 run "tmux select-window -t 6 2>/dev/null || tmux new-window -t 6 -n 6" bind -r 7 run "tmux select-window -t 7 2>/dev/null || tmux new-window -t 7 -n 7" bind -r 8 run "tmux select-window -t 8 2>/dev/null || tmux new-window -t 8 -n 8" bind -r 9 run "tmux select-window -t 9 2>/dev/null || tmux new-window -t 9 -n 9" + @@ -4,6 +4,8 @@ set tabstop=4 set shiftwidth=4 set expandtab +set exrc secure +set virtualedit=block " c-o-l-o-r-s-! syntax on filetype plugin on @@ -22,6 +24,8 @@ set fileencoding=utf-8 set fileformat=unix " disable mouse because who fucking needs that shit set mouse= +" for firenvim +set guifont=Comic\ Mono:h12 " vim-plug fine shyt call plug#begin() @@ -31,6 +35,8 @@ Plug 'qaptoR-nvim/chocolatier.nvim' Plug 'nvim-tree/nvim-web-devicons' Plug 'ficcdaf/ashen.nvim' Plug 'llathasa-veleth/vim-brainfuck' +Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } +Plug 'lervag/vimtex' call plug#end() @@ -39,3 +45,20 @@ set background=dark "silent! color chocolatier "silent! color retrobox silent! color ashen + +" disable BIG jumps everywhere (shift+up / shift+down act like plain arrows) +map <S-Up> <Up> +map <S-Down> <Down> +nmap <S-Up> <Up> +nmap <S-Down> <Down> +imap <S-Up> <Up> +imap <S-Down> <Down> +vmap <S-Up> <Up> +vmap <S-Down> <Down> +xmap <S-Up> <Up> +xmap <S-Down> <Down> +omap <S-Up> <Up> +omap <S-Down> <Down> +cmap <S-Up> <Up> +cmap <S-Down> <Down> + diff --git a/cfg/Preferences.sublime-settings b/cfg/Preferences.sublime-settings index df3465c..bab3603 100644 --- a/cfg/Preferences.sublime-settings +++ b/cfg/Preferences.sublime-settings @@ -1,6 +1,6 @@ { - "font_face": "mononoki", - "font_size": 14, + "font_face": "Iosevka", + "font_size": 12, "margin": "8", "gdi": "true", "theme": "Cyanide.sublime-theme", @@ -11,14 +11,14 @@ "hardware_acceleration": "opengl", "draw_minimap": "false", "overlay_scroll_bars": "enabled", - /*"overlay_scroll_bars": "enabled",*/ "always_show_minimap": "false", "small_ui_font": "true", "color_scheme": "Packages/Theme - Cyanide/Cyanide - Alert - Black.tmTheme", "ignored_packages": [ - "Vintage", + "Vintage" ], "index_files": true, - "relative_line_numbers": true, + "relative_line_numbers": true } + diff --git a/cfg/alacritty.toml b/cfg/alacritty.toml index 5afcf79..747c930 100644 --- a/cfg/alacritty.toml +++ b/cfg/alacritty.toml @@ -1,13 +1,15 @@ [font] -size = 12.0 +size = 11.0 [font.normal] -#family = "FiraCode" -family = "mononoki" +family = "Comic Mono" +#family = "JetBrains Mono" +#family = "mononoki" +#family = "Iosevka" style = "Regular" [window] -opacity = 0.9 +opacity = 0.98 [window.padding] x = 18 diff --git a/cfg/i3/config b/cfg/i3/config index 6bb9098..3cdb537 100644 --- a/cfg/i3/config +++ b/cfg/i3/config @@ -1,5 +1,5 @@ # ========================= -# クロナのI3チエッフギ +# クロナのi3wmチエッフギ # ==> maxwasmailed@proton.me # ========================= @@ -11,8 +11,10 @@ set $mod Mod4 # ------------------------- # default terminal & launcher # ------------------------- -set $term alacritty +#set $term alacritty +set $term kitty set $shell fish +set $jfont Iosevka # ------------------------ # system & controls @@ -41,6 +43,11 @@ bindsym XF86AudioMute exec pamixer -t # mute mic bindsym XF86AudioMicMute exec pamixer --default-source -t +# remap capslock to escape +exec --no-startup-id setxkbmap -option caps:escape +# compose key +exec --no-startup-id setxkbmap -option compose:ralt + # ------------------------- # window management # ------------------------- @@ -57,7 +64,7 @@ bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right bindsym $mod+q kill -bindsym $mod+t floating toggle +bindsym $mod+t floating toggle, resize set 672 432 bindsym $mod+v split v bindsym $mod+h split h @@ -70,12 +77,6 @@ bindsym $mod+Tab exec i3-msg workspace next_on_output bindsym $mod+Shift+Tab exec i3-msg workspace prev_on_output # ------------------------- -# a bit of layout -# ------------------------- -exec --no-startup-id i3-msg gaps horizontal all set 32 -exec --no-startup-id i3-msg gaps vertical all set 8 - -# ------------------------- # workspaces # ------------------------- set $ws1 "1:f" @@ -117,7 +118,7 @@ floating_modifier $mod # ------------------------- # borders / titlebars # ------------------------- -new_window pixel 16 +font pango:$jfont 9 client.focused #f82323 #0f0f0f #f82323 #0f0f0f client.focused_inactive #0f0f0f #0f0f0f #f82323 #0f0f0f client.unfocused #0f0f0f #0f0f0f #f82323 #0f0f0f @@ -129,7 +130,7 @@ client.urgent #0f0f0f #0f0f0f #f82323 #0f0f0f bar { #status_command i3status status_command ~/.config/i3/kurobar.sh - font pango:chirufont 10 + font pango:$jfont 9 position top colors { background #0f0f0f @@ -152,11 +153,11 @@ exec --no-startup-id ibus-daemon -drx exec --no-startup-id nm-applet exec --no-startup-id xsetroot -cursor_name left_ptr exec --no-startup-id xsetroot -solid "#1f1f1f" -exec --no-startup-id feh --bg-fill ~/Pictures/halftone-red0.png +exec --no-startup-id feh --bg-fill ~/Pictures/murasamBIG.png exec --no-startup-id picom exec --no-startup-id kwalletd6 -exec --no-startup-id xinput set-prop 11 "libinput Tapping Enabled" 1 -exec --no-startup-id xinput set-prop 9 "libinput Accel Speed" -1 +exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1 +exec --no-startup-id xinput set-prop "MOSART Semi. 2.4G Wireless Mouse" "libinput Accel Speed" -1 exec --no-startup-id blueman-applet # ------------------------- @@ -164,5 +165,5 @@ exec --no-startup-id blueman-applet # ------------------------- bindsym $mod+Shift+r restart bindsym $mod+Shift+e exit -bindsym $mod+l exec i3lock -c 0f0f0f +bindsym $mod+l exec i3lock diff --git a/cfg/i3/jmdmenu b/cfg/i3/jmdmenu index 8cb7beb..2f48614 100644 --- a/cfg/i3/jmdmenu +++ b/cfg/i3/jmdmenu @@ -1,10 +1,10 @@ #!/bin/bash -# simple black & white dmenu wrapper # ------------------------- # configuration # ------------------------- -DMENU_FN="chirufont-10,Noto Color Emoji-10" +#DMENU_FN="chirufont-10,Noto Color Emoji-10" +DMENU_FN="Iosevka-10,Noto Color Emoji-10" DMENU_NB="#0f0f0f" # normal background DMENU_NF="#f82323" # normal foreground DMENU_SB="#f82323" # selected background diff --git a/cfg/i3/kurobar.sh b/cfg/i3/kurobar.sh index 7018460..a9d82a0 100644 --- a/cfg/i3/kurobar.sh +++ b/cfg/i3/kurobar.sh @@ -21,7 +21,8 @@ while true; do # --- LAN ip --- # 192.168.x.x - localip=$(hostname -i | grep -oE '192\.168\.[0-9]+\.[0-9]+') + localip=$(ip -4 addr show | awk '/inet 192\.168\./ {print $2}' | cut -d/ -f1 | head -n1) + #localip=$(hostname -i | grep -oE '192\.168\.[0-9]+\.[0-9]+') # --- public IP --- # attached to the fetchpubip service and the .config/i3/fetch_public_ip.sh script @@ -38,7 +39,7 @@ while true; do dt=$(date '+%Y年%m月%d日 %H時%M分%S秒') # --- print bar line --- - echo "vol.$volume% | bat.$bat% | bri.$bright | lan.$localip | pub.$pubip | $mem_used/$mem_total gb | $dt" + echo "vol.$volume% | bat.$bat% | bri.$bright | lan.$localip | pub.$pubip | "$mem_used"/"$mem_total"gb | $dt" sleep 0.01 done diff --git a/cfg/i3/sway/config b/cfg/i3/sway/config index 68f5ef7..21b713e 100644 --- a/cfg/i3/sway/config +++ b/cfg/i3/sway/config @@ -20,7 +20,6 @@ set $shell fish bindsym Mod1+Space exec jmdmenu run bindsym $mod+BackSpace exec jmdmenu run bindsym $mod+Return exec $term -#bindsym $mod+v exec jmdmenu clipbd bindsym $mod+period exec jmdmenu bmj bindsym $mod+Shift+c exec xcolor | jmdmenu bindsym $mod+e exec nemo @@ -43,7 +42,14 @@ bindsym XF86AudioMicMute exec pamixer --default-source -t # compose key input * xkb_options compose:ralt # fallback to **KILL** dmenu when it freezes because fuck sway i guess -bindsym $mod+Alt_L+q exec kill -9 dmenu +bindsym $mod+Alt_L+q exec kill dmenu +# [re]binds +input * { + xkb_options caps:escape +} +# [un]binds +bindsym Page_Up nop +bindsym Page_Down nop # ------------------------- @@ -77,8 +83,8 @@ bindsym $mod+Shift+Tab exec i3-msg workspace prev_on_output # ------------------------- # a bit of layout # ------------------------- -exec --no-startup-id i3-msg gaps horizontal all set 32 -exec --no-startup-id i3-msg gaps vertical all set 8 +#exec --no-startup-id i3-msg gaps horizontal all set 32 +#exec --no-startup-id i3-msg gaps vertical all set 8 # ------------------------- # workspaces @@ -156,7 +162,13 @@ bar { exec --no-startup-id export GTK_USE_PORTAL=0 exec --no-startup-id export XDG_CURRENT_DESKTOP=GNOME exec --no-startup-id sudo systemctl --user mask xdg-desktop-portal-kde.service -exec --no-startup-id ibus-daemon -drx + +exec --no-startup-id export GTK_IM_MODULE=fcitx +exec --no-startup-id export QT_IM_MODULE=fcitx +exec --no-startup-id export XMODIFIERS=@im=fcitx +#exec --no-startup-id ibus-daemon -drx +exec --no-startup-id ibus start + exec --no-startup-id nm-applet exec --no-startup-id xsetroot -cursor_name left_ptr exec --no-startup-id xsetroot -solid "#1f1f1f" @@ -174,5 +186,5 @@ input "type:touchpad" { # ------------------------- bindsym $mod+Shift+r reload bindsym $mod+Shift+e exit -bindsym $mod+l exec i3lock -c 101010 +bindsym $mod+l exec /home/max/.config/sway/swaylock_colors.sh diff --git a/cfg/kitty-cfg b/cfg/kitty-cfg deleted file mode 100644 index 5541ffa..0000000 --- a/cfg/kitty-cfg +++ /dev/null @@ -1,28 +0,0 @@ -# __ ___ __ __ -# / //_(_) /_/ /___ __ -# / ,< / / __/ __/ // / -# /_/|_/_/\__/\__/\_, / -# /___/ -# -# Configuration -font_family mononoki -font_size 12 -bold_font auto -italic_font auto -bold_italic_font auto -remember_window_size no -initial_window_width 1010 -initial_window_height 656 -cursor_blink_interval 0.5 -cursor_stop_blinking_after 1 -scrollback_lines 2000 -wheel_scroll_min_lines 1 -enable_audio_bell no -window_padding_width 25 -hide_window_decorations yes -background_opacity 0.8 -dynamic_background_opacity yes -confirm_os_window_close 0 -selection_foreground none -selection_background none -cursor_trail 1 diff --git a/cfg/kitty.conf b/cfg/kitty.conf new file mode 100644 index 0000000..2a94a32 --- /dev/null +++ b/cfg/kitty.conf @@ -0,0 +1,57 @@ +# font stuff +font_family Iosevka +font_size 12 +enable_ligatures always +# +bold_font auto +italic_font auto +bold_italic_font auto +# customization (colors etc) +window_padding_width 20 + +# performance +cursor_blink_interval 0 +cursor_stop_blinking_after 0 +# +sync_to_monitor no +repaint_delay 12 +input_delay 3 +# +background_opacity 1 +dynamic_background_opacity no +cursor_trail 0 + +# misc +wheel_scroll_min_lines 1 +enable_audio_bell no +hide_window_decorations yes +confirm_os_window_close 0 +remember_window_size no +# dimming +dim_opacity 0.5 +inactive_text_alpha 0.5 +inactive_window_tint 0.5 + +# Afterglow theme +background #0f0f0f +foreground #d0d0d0 +cursor #d0d0d0 +color0 #151515 +color8 #505050 +#color1 #ac4142 +color1 #f82323 +color9 #f82323 +color2 #7e8d50 +color10 #7e8d50 +color3 #e5b566 +color11 #e5b566 +color4 #6c99ba +color12 #6c99ba +color5 #9e4e85 +color13 #9e4e85 +color6 #7dd5cf +color14 #7dd5cf +color7 #d0d0d0 +color15 #f5f5f5 +selection_background #303030 +selection_foreground #202020 |