diff --git a/alacritty.yml b/alacritty.yml index 7593cab..ea2d171 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -41,24 +41,24 @@ draw_bold_text_with_bright_colors: true font: # The normal (roman) font face to use. normal: - family: Menlo + family: Iosevka Nerd Font # Style can be specified to pick a specific face. - # style: Regular + style: Regular # The bold font face bold: - family: Menlo + family: Iosevka Nerd Font # Style can be specified to pick a specific face. - # style: Bold + style: Bold # The italic font face italic: - family: Menlo + family: Iosevka Nerd Font # Style can be specified to pick a specific face. - # style: Italic + style: Italic # Point size of the font - size: 12.0 + size: 8.0 # Offset is the extra space around each character. offset.y can be thought of # as modifying the linespacing, and offset.x as modifying the letter spacing. @@ -158,7 +158,7 @@ visual_bell: duration: 0 # Background opacity -background_opacity: 1.0 +background_opacity: 0.8 # Mouse bindings # diff --git a/gpg-agent.conf b/gpg-agent.conf index da68606..96d9f04 100644 --- a/gpg-agent.conf +++ b/gpg-agent.conf @@ -1,3 +1,4 @@ -pinentry-program /usr/local/bin/pinentry-mac +# pinentry-program /usr/local/bin/pinentry-mac +pinentry-program /run/current-system/sw/bin/pinentry default-cache-ttl 86400 max-cache-ttl 86400 diff --git a/i3 b/i3 index 758b051..391547f 100644 --- a/i3 +++ b/i3 @@ -1,40 +1,14 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see https://i3wm.org/docs/userguide.html for a complete reference! - -for_window [class="^.*"] border pixel 1 -new_window pixel 1 - +set $mod Mod4 gaps inner 10 gaps outer 0 # smart_gaps on smart_borders on -set $mod Mod4 +for_window [class="^.*"] border pixel 0 +new_window pixel 1 -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -# font pango:monospace 8 font pango:Iosevka Nerd Font Regular 8 -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# Before i3 v4.8, we used to recommend this one as the default: -# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 -# The font above is very space-efficient, that is, it looks good, sharp and -# clear in small sizes. However, its unicode glyph coverage is limited, the old -# X core fonts rendering does not support right-to-left and this being a bitmap -# font, it doesn’t scale on retina/hidpi displays. - # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -43,14 +17,13 @@ floating_modifier $mod bindsym $mod+Return exec alacritty # kill focused window -bindsym $mod+Shift+apostrophe kill +bindsym $mod+Shift+q kill # start dmenu (a program launcher) bindsym $mod+e exec dmenu_run -# bindsym Mod1+Space exec dmenu_run -# 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 -# installed. +bindsym Mod1+space exec "rofi -show combi" +bindsym Mod1+Mod4+Ctrl+e exec "emacsclient -c" +bindsym Mod1+Mod4+Ctrl+b exec "qutebrowser" # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop # change focus @@ -158,10 +131,10 @@ mode "resize" { # Pressing right will grow the window’s width. # Pressing up will shrink the window’s height. # Pressing down will grow the window’s height. - bindsym h resize shrink width 10 px or 10 ppt - bindsym t resize grow height 10 px or 10 ppt - bindsym n resize shrink height 10 px or 10 ppt - bindsym s resize grow width 10 px or 10 ppt + bindsym h resize shrink width 5 px or 5 ppt + bindsym k resize grow height 5 px or 5 ppt + bindsym j resize shrink height 5 px or 5 ppt + bindsym l resize grow width 5 px or 5 ppt # same bindings, but for the arrow keys bindsym Left resize shrink width 10 px or 10 ppt @@ -177,8 +150,43 @@ mode "resize" { bindsym $mod+p mode "resize" -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -# bar { -# status_command i3status -# } +# gaps shortcuts +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global) +set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global) +bindsym $mod+Shift+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Return mode "default" + bindsym Escape mode "default" +} + +mode "$mode_gaps_inner" { + bindsym plus gaps inner current plus 5 + bindsym minus gaps inner current minus 5 + bindsym 0 gaps inner current set 0 + + bindsym Shift+plus gaps inner all plus 5 + bindsym Shift+minus gaps inner all minus 5 + bindsym Shift+0 gaps inner all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym plus gaps outer current plus 5 + bindsym minus gaps outer current minus 5 + bindsym 0 gaps outer current set 0 + + bindsym Shift+plus gaps outer all plus 5 + bindsym Shift+minus gaps outer all minus 5 + bindsym Shift+0 gaps outer all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} + +exec "polybar top" + diff --git a/polybar b/polybar index 61bfbcd..68f7600 100644 --- a/polybar +++ b/polybar @@ -8,11 +8,11 @@ ;===================================================== [colors] -;background = ${xrdb:color0:#222} -background = #dd000000 +background = ${xrdb:color0:#222} +;background = #88000000 background-alt = #444444 -;foreground = ${xrdb:color7:#222} -foreground = #ffffff +foreground = ${xrdb:color7:#222} +;foreground = #ffffff foreground-alt = #aaaaaa primary = #0a6cf5 secondary = #e60053 @@ -43,7 +43,7 @@ padding-right = 2 module-margin-left = 2 module-margin-right = 2 -font-0 = Iosevka:fontformat=truetype:size=8;0 +font-0 = Iosevka Nerd Font:fontformat=truetype:size=8;0 font-1 = siji:pixelsize=10;1 modules-left = workspace xwindow diff --git a/spacemacs b/spacemacs index 82c441b..64cef1c 100644 --- a/spacemacs +++ b/spacemacs @@ -199,7 +199,7 @@ values." ;; dotspacemacs-default-font '("Source Code Pro" ;; dotspacemacs-default-font '("PragmataPro" dotspacemacs-default-font '("Iosevka Nerd Font" - :size 12 + :size 11 :weight normal :width normal :powerline-scale 1.0) diff --git a/symlinks.sh b/symlinks.sh index 0c34d25..cfeb12c 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -13,6 +13,7 @@ mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf mkdir -p ~/.config/qutebrowser; ln -sf ~/dotfiles/qutebrowser.py ~/.config/qutebrowser/config.py +mkdir -p ~/.config/alacritty; ln -sf ~/dotfiles/alacritty.yml ~/.config/alacritty/alacritty.py # Mail stuff ln -sf ~/dotfiles/offlineimaprc ~/.offlineimaprc diff --git a/xprofile b/xprofile index ab6f05c..4bb48ba 100644 --- a/xprofile +++ b/xprofile @@ -1,7 +1,7 @@ setxkbmap -option ctrl:nocaps -option compose:ralt xcape -e 'Control_L=Escape' xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek" -compton -cGb +compton -cGb --inactive-opacity 0.75 sh ~/dotfiles/logitech_linux_mouse.sh xsetroot -solid black -cursor_name left_ptr nitrogen --restore &