Browse Source

mostly accomodate for higher dpi; zshrc: some weird experiment

master
Von Random 1 year ago
parent
commit
e55a5e3de0
7 changed files with 83 additions and 43 deletions
  1. +4
    -5
      bashrc
  2. +3
    -3
      dunstrc
  3. +16
    -5
      i3_config
  4. +42
    -0
      kitty.conf
  5. +1
    -0
      tmux.conf
  6. +11
    -25
      xresources
  7. +6
    -5
      zshrc

+ 4
- 5
bashrc View File

@ -21,16 +21,15 @@ colorize() {
printf "$escs" "$color_nr" "$*"
}
prompt_command() {
typeset cwd=$(colorize 1 8 "$(pwd)")
case "$TERM" in
(screen*) printf '\ek%s\e\' "${HOSTNAME%%.*}";;
(*) printf '\e]0;%s\a' "${HOSTNAME%%.*}";;
esac
PS1="[ bash-\\v | $ps_user $HOSTNAME:$cwd ]\\n$ps_bang "
PS1="[ bash-\\v | $ps_user $HOSTNAME:$(pwd) ]\\n$ps_bang "
}
((UID)) && ps_clr=8 || ps_clr=1
((UID)) && ps_clr=4 || ps_clr=1
ps_user=$(colorize 1 $ps_clr "$USER")
ps_bang=$(colorize 1 $ps_clr \>)
ps_bang=$(colorize 1 $ps_clr =\>)
unset ps_clr
PROMPT_COMMAND=prompt_command
# }}}
@ -102,6 +101,6 @@ s() {
}
# we want to see exit code on error (it also has to be the last entry here)
trap_msg="$(colorize 0 1 \>\>) $(colorize 0 8 exit) $(colorize 0 1 %s)\n"
trap_msg="$(colorize 0 1 \>\>) exit $(colorize 0 1 %s)\n"
trap 'printf "$trap_msg" "$?" >&2' ERR
# }}}

+ 3
- 3
dunstrc View File

@ -1,5 +1,5 @@
[global]
font = PT Sans 10
font = Fira Sans Condensed 10
allow_markup = yes
format = "[%a] <b>%s</b>\n%b"
@ -10,7 +10,7 @@
show_age_threshold = 60
word_wrap = yes
ignore_newline = no
geometry = "300x5-30+20"
geometry = "600x5-30+45"
shrink = no
transparency = 0
idle_threshold = 120
@ -29,7 +29,7 @@
browser = /home/von/.local/bin/default-web-browser
icon_position = left
icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
max_icon_size = 32
max_icon_size = 256
[frame]
width = 1


+ 16
- 5
i3_config View File

@ -6,8 +6,9 @@ set $mod Mod4
set $i3_term default-terminal-emulator
set $terminus -*-terminus-bold-*-*-*-14-*-*-*-*-*-iso10646-*
set $terminus_xft xos4 Terminus:Bold:pixelsize=14
set $font Fira Sans Condensed:size=10
font $terminus
font pango:Fira Sans Condensed 10
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
@ -22,9 +23,9 @@ bindsym $mod+Shift+c kill
bindsym Control+q exec /bin/true
# start dmenu (a program launcher)
bindsym $mod+s exec dmenu_multicmd "$HOME/.displayrc.yaml" -i -fn "$terminus_xft"
bindsym $mod+d exec dmenu_run -p run -i -fn "$terminus_xft"
bindsym $mod+p exec dmenu_ssh "$i3_term -e tmux_ssh" -i -fn "$terminus_xft"
bindsym $mod+s exec dmenu_multicmd "$HOME/.displayrc.yaml" -i -fn "$font"
bindsym $mod+d exec dmenu_run -p run -i -fn "$font"
bindsym $mod+p exec dmenu_ssh "$i3_term -e tmux_ssh" -i -fn "$font"
# change focus
bindsym $mod+h focus left
@ -77,7 +78,7 @@ bindsym $mod+a focus parent
bindsym $mod+Shift+a focus child
# move to another screen
bindsym $mod+Shift+o move workspace to output left
bindsym $mod+Shift+o move workspace to output up
# switch to workspace
bindsym $mod+1 workspace 1
@ -107,17 +108,27 @@ bindsym $mod+Shift+0 move container to workspace 10
# reload the configuration file
bindsym $mod+Shift+r reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
bindsym $mod+Control+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'"
# lock screen
bindsym $mod+z exec "xscreensaver-command -lock"
# toggle touchpad
bindsym XF86TouchpadToggle exec "touchpad-toggle"
bindsym XF86KbdBrightnessDown exec "keybrightness d"
bindsym XF86KbdBrightnessUp exec "keybrightness u"
# mpd keys
bindsym XF86AudioPlay exec "mpc toggle"
bindsym XF86AudioStop exec "mpc stop"
bindsym XF86AudioNext exec "mpc next"
bindsym XF86AudioPrev exec "mpc prev"
# resize window (you can also use the mouse for that)
mode "resize" {
bindsym h resize shrink width 10 px or 10 ppt


+ 42
- 0
kitty.conf View File

@ -0,0 +1,42 @@
font_family Fira Code Retina
bold_font auto
italic_font auto
bold_italic_font auto
font_size 10
box_drawing_scale 0.1, 0.5, 1, 1.5
cursor_blink_interval 0
disable_ligatures cursor
strip_trailing_spaces always
enable_audio_bell no
window_padding_width 1
placement_strategy top-left
rectangle_select_modifiers alt
map ctrl+alt+c copy_to_clipboard
map ctrl+alt+v paste_from_clipboard
selection_foreground #fdf6e3
selection_background #657b83
foreground #657b83
background #fdf6e3
cursor #cb4b16
cursor_text_color #fdf6e3
color0 #073642
color1 #dc322f
color2 #859900
color3 #b58900
color4 #268bd2
color5 #d33682
color6 #2aa198
color7 #eee8d5
color8 #002b36
color9 #cb4b16
color10 #586e75
color11 #657b83
color12 #839496
color13 #6c71c4
color14 #93a1a1
color15 #fdf6e3

+ 1
- 0
tmux.conf View File

@ -17,6 +17,7 @@ bind y command-prompt break-pane
bind -n M-w next-window
bind -n M-q previous-window
set -g prefix C-g
set -g terminal-overrides "*:Tc"
set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
set -g mode-keys "vi"
set -g set-titles "on"


+ 11
- 25
xresources View File

@ -4,10 +4,11 @@ Xft.antialias: true
Xft.rgba: rgb
Xft.hinting: true
Xft.hintstyle: hintslight
Xft.dpi: 96
Xft.dpi: 192
#define TERMINUS -xos4-terminus-bold-*-*-*-14-*-*-*-*-*-iso10646-1
#define TERMINUS_SMALL -xos4-terminus-*-*-*-*-12-*-*-*-*-*-iso10646-1
#define FONT xft:Fira Code Retina:size=10
! solarized light
#define COLORFG #657b83
@ -35,10 +36,8 @@ Xft.dpi: 96
! }}}
! {{{ urxvt
! fonts
URxvt.font: TERMINUS
URxvt.boldFont: TERMINUS
URxvt.italicFont: TERMINUS
URxvt.boldItalicFont: TERMINUS
URxvt.font: FONT
URxvt.italicFont: FONT
! misc
URxvt.intensityStyles: false
@ -49,22 +48,21 @@ URxvt.pointerBlank: true
URxvt.saveLines: 10000
URxvt.scrollBar: false
URxvt.secondaryScroll: false
URxvt.urgentOnBell: true
URxvt.urgentOnBell: false
URxvt.visualBell: false
! keymaps
URxvt.keysym.C-V: eval:paste_clipboard
URxvt.keysym.C-C: eval:selection_to_clipboard
! perl extensions
URxvt.perl-ext-common: default,matcher
URxvt.url-launcher: /home/von/.local/bin/default-web-browser
URxvt.matcher.button: 3
! keymaps
URxvt.keysym.C-V: eval:paste_clipboard
URxvt.keysym.C-C: eval:selection_to_clipboard
! colors
URxvt.foreground: COLORFG
URxvt.background: COLORBG
URxvt.colorBD: COLORBD
URxvt.cursorColor: COLORCR
URxvt.color0: COLOR0
@ -88,8 +86,8 @@ URxvt.color15: COLOR15
! {{{ xterm
xterm.termName: xterm-direct
xterm.borderWidth: 0
xterm.vt100.font: TERMINUS
xterm.vt100.colorBDMode: true
xterm.vt100.font: FONT
xterm.vt100.colorBDMode: false
xterm.vt100.allowBoldFonts: false
xterm.vt100.boldColors: false
xterm.vt100.bellIsUrgent: true
@ -101,7 +99,6 @@ xterm.vt100.internalBorder: 1
! colors
xterm.vt100.foreground: COLORFG
xterm.vt100.background: COLORBG
xterm.vt100.colorBD: COLORBD
xterm.vt100.cursorColor: COLORCR
xterm.vt100.color0: COLOR0
@ -122,14 +119,3 @@ xterm.vt100.color13: COLOR13
xterm.vt100.color14: COLOR14
xterm.vt100.color15: COLOR15
! }}}
! {{{ xscreensaver and rofi
xscreensaver.font: TERMINUS
xscreensaver.Dialog.Font: TERMINUS_SMALL
rofi.font: xos4 Terminus Bold 11
rofi.location: 2
rofi.modi: window,run,drun,ssh,display:/home/von/git/mine/vscripts/rofi_multicmd /home/von/.displayrc.yaml
rofi.ssh-command: tmux_ssh {host}
rofi.terminal: default-terminal-emulator
rofi.theme: Arc-Dark
! }}}

+ 6
- 5
zshrc View File

@ -71,13 +71,14 @@ bindkey -s '^j' '^atime ^m' # ctrl + j
bindkey '^x^e' edit-command-line
# }}}
# {{{ prompt
prompt_ln1='[ %(!.%F{red}.%F{black})%n%f %m:%F{black}%d%f ]'
prompt_ln2=$'\n%(!.%F{red}.%F{black})>%f '
prompt_ln1='[ %(!.%F{red}.%F{blue})%n%f %m:%d ]'
#prompt_ln2=$'\n%(!.%F{red}.%F{blue})=>%f '
prompt_ln2=$'\n%(!.😈.😇) '
prompt_state_file="/tmp/zsh_gitstatus_$$.tmp"
PROMPT="$prompt_ln1$prompt_ln2"
PROMPT2='%_%(!.%F{red}.%F{black})>%f '
PROMPT3='?%(!.%F{red}.%F{black})#%f '
PROMPT4='+%N:%i%(!.%F{red}.%F{black})>%f '
PROMPT2='%_%(!.%F{red}.%F{blue})>%f '
PROMPT3='?%(!.%F{red}.%F{blue})#%f '
PROMPT4='+%N:%i%(!.%F{red}.%F{blue})>%f '
precmd.title() {
case $TERM in
(screen*) printf '\033k%s\033\' ${HOST%%.*};;


Loading…
Cancel
Save