diff --git a/config/.config/i3/config b/config/.config/i3/config index b2dae01..00aed00 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -21,7 +21,7 @@ focus_follows_mouse no # Configure # border style -new_window pixel 1 +new_window none new_float normal hide_edge_borders none @@ -85,10 +85,8 @@ bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 # Open specific applications in floating mode -for_window [title="alsamixer"] flMoating enable border pixel 1 +for_window [title="alsamixer"] floating enable border pixel 1 for_window [title="File Transfer*"] floating enable -for_window [class="GParted"] floating enable border normal -for_window [title="i3_help"] floating enable sticky enable border normal for_window [class="Lightdm-gtk-greeter-settings"] floating enable for_window [class="Lxappearance"] floating enable sticky enable border normal for_window [class="Nitrogen"] floating enable sticky enable border normal @@ -99,6 +97,7 @@ for_window [class="(?i)System-config-printer.py"] floating enable border normal for_window [class="Thus"] floating enable border normal for_window [class="Timeset-gui"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal +for_window [title="KeePassX$"] floating enable border normal # switch to workspace with urgent window automatically for_window [urgent=latest] focus @@ -107,7 +106,7 @@ for_window [urgent=latest] focus ############################ Startup Applications ############################# ############################################################################### -exec ~/.scripts/startup.sh +exec --no-startup-id setxkbmap us,de exec --no-startup-id nitrogen --restore; compton -b exec --no-startup-id nextcloud exec --no-startup-id emacs --daemon @@ -115,6 +114,9 @@ exec --no-startup-id udiskie exec --no-startup-id polybar beep -r exec --no-startup-id polybar boop -r exec --no-startup-id setxkbmap -option "ctrl:swapcaps" +exec --no-startup-id nm-applet +exec --no-startup-id xss-lock -- python ~/.scripts/i3lock.py + ############################################################################### ################################# Keybindings ################################# ############################################################################### @@ -141,7 +143,7 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # Application Shortcuts bindsym $mod+b exec env GTK_THEME=Materia:light waterfox -bindsym $mod+e exec pcmanfm +bindsym $mod+e exec termite -e ranger bindsym $mod+m exec thunderbird bindsym Print exec --no-startup-id scrot @@ -189,9 +191,9 @@ bindsym $mod+minus scratchpad show bindsym $mod+Ctrl+semicolon workspace next bindsym $mod+Ctrl+j workspace prev -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +# restart/exit i3 bindsym $mod+Shift+r restart - +bindsym $mod+Shift+e exit # Resize window (you can also use the mouse for that) bindsym $mod+r mode "resize" @@ -281,15 +283,15 @@ client.background $i3_color10 ############################# # Set inner/outer gaps -gaps inner 15 +gaps inner 10 gaps outer -4 # Smart gaps (gaps used if only more than one container on the workspace) -smart_gaps on +# smart_gaps on # Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) -smart_borders on +# smart_borders on # Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). If you also press Shift with these keys, the change will be global for all workspaces. set $mode_gaps Gaps: (o) outer, (i) inner diff --git a/config/.config/polybar/config b/config/.config/polybar/config index 27089a4..85e3384 100644 --- a/config/.config/polybar/config +++ b/config/.config/polybar/config @@ -37,7 +37,7 @@ font-3 = FontAwesome:style=Regular:pixelsize=10 modules-left = spotify modules-center = spotify-prev spotify-play spotify-stop spotify-next -modules-right = xkeyboard volume xbacklight wlan eth battery date +modules-right = xkeyboard volume xbacklight wlan eth battery1 date cursor-click = pointer cursor-scroll = ns-resize @@ -78,7 +78,7 @@ cursor-click = pointer cursor-scroll = ns-resize [module/xkeyboard] -pptype = internal/xkeyboard +type = internal/xkeyboard blacklist-0 = num lock format-prefix = " " @@ -252,10 +252,41 @@ bar-volume-empty = ─ bar-volume-empty-font = 2 bar-volume-empty-foreground = ${colors.foreground-alt} -[module/battery] +[module/battery1] +type = internal/battery +battery = BAT0 +adapter = AC0 +full-at = 98 + +format-charging = +format-charging-underline = ${colors.yellow} + +format-discharging = +format-discharging-underline = ${self.format-charging-underline} + +format-full-prefix =  +format-full-prefix-foreground = ${colors.foreground-alt} +format-full-underline = ${self.format-charging-underline} + +ramp-capacity-0 =  +ramp-capacity-1 =  +ramp-capacity-2 =  +ramp-capacity-3 =  +ramp-capacity-4 =  +ramp-capacity-foreground = ${colors.foreground-alt} + +animation-charging-0 =  +animation-charging-1 =  +animation-charging-2 =  +animation-charging-3 =  +animation-charging-4 =  +animation-charging-foreground = ${colors.foreground-alt} +animation-charging-framerate = 750 + +[module/battery2] type = internal/battery battery = BAT1 -adapter = ADP1 +adapter = ACP0 full-at = 98 format-charging = diff --git a/config/.config/ranger/rc.conf b/config/.config/ranger/rc.conf new file mode 100644 index 0000000..2f005cd --- /dev/null +++ b/config/.config/ranger/rc.conf @@ -0,0 +1,2 @@ +set preview_images true +set vcs_aware true \ No newline at end of file diff --git a/config/.scripts/i3lock.py b/config/.scripts/i3lock.py index cbfc1d7..ca2135e 100755 --- a/config/.scripts/i3lock.py +++ b/config/.scripts/i3lock.py @@ -93,17 +93,28 @@ def lock_config(): lock_del = '--bshlcolor D13400FF' # Color of seperator | Color: dark-blue lock_sep_color = '--separatorcolor 0000D1FF' - - indicator_outer_ring = "{} {} {} {} {} {}".format(lock_ring, lock_ring_w, - lock_ring_v, lock_press, - lock_del, lock_sep_color) + # Right Text + lock_right_text = '--veriftext="\.\.\."' + # Wrong Text + lock_wrong_text = '--wrongtext="Noope"' + # Ring Position + lock_texts = '{} {}'.format(lock_right_text, lock_wrong_text) + lock_pos = '--indpos={}:{}'.format(int(clock_x)+350, int(clock_y+90)) + # Ring size + ring_size = 40 + lock_radius = '--radius {}'.format(ring_size) + lock_stats = '{} {}'.format(lock_pos, lock_radius) + indicator_outer_ring = "{} {} {} {} {} {} {} {}".format(lock_ring, lock_ring_w, + lock_ring_v, lock_press, + lock_del, lock_sep_color, + lock_stats, lock_texts) # done indicator = "{} {}".format(indicator_inner, indicator_outer_ring) # background lock_pic = '-i /tmp/i3lock.png' - print('pixelate: {}'.format(time.time() - lock_time)) + print('lock: {}'.format(time.time() - lock_time)) return "{} {} {} {} {}".format(lock_core, clock, datetime, indicator, lock_pic) diff --git a/config/.scripts/startup.sh b/config/.scripts/startup.sh index 81bcb45..6b640a7 100755 --- a/config/.scripts/startup.sh +++ b/config/.scripts/startup.sh @@ -1,4 +1,3 @@ #!/bin/zsh -xrandr --output "eDP1" --mode "1920x1080" setxkbmap us,de diff --git a/zsh/.zshrc b/zsh/.zshrc index 93a3a9a..5f0bdf7 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -46,4 +46,5 @@ export TERM="xterm-256color" # in case you are using urxvt, to bypass an error d export GPG_TTY=$(tty) export LC_ALL=en_GB.UTF-8 PATH=$PATH:~/.local/bin - +export EDITOR='emacsclient -nw' +export DEFAULT_EDITOR='emacsclient -nw'