diff --git a/Xresources b/Xresources index e2648ab..5ab7e22 100644 --- a/Xresources +++ b/Xresources @@ -1,5 +1,5 @@ ! rofi -rofi.font: Iosevka Regular 8 +rofi.font: Iosevka Nerd Font Regular 8 rofi.padding: 12 rofi.separator-style: none rofi.bw: 2 @@ -20,8 +20,8 @@ urxvt*cursorBlink: false urxvt*urgentOnBell: true urxvt*urlLauncher: firefox urxvt*termName: rxvt-unicode-256color -urxvt*font: xft:Iosevka:Regular:size=8 -urxvt*boldFont: xft:Iosevka:Bold:size=8 +urxvt*font: xft:Iosevka Nerd Font:Regular:size=8,xft:Siji:Regular:size=8 +urxvt*boldFont: xft:Iosevka Nerd Font:Bold:size=8,xft:Siji:Regular:size=8 ! Colors urxvt*depth: 32 diff --git a/config.fish b/config.fish index 70f3b47..8cb6101 100644 --- a/config.fish +++ b/config.fish @@ -35,8 +35,6 @@ set -x PATH $HOME/.local/bin $PATH set -x PATH $HOME/.npm-packages/bin $PATH set -x PATH /usr/local/opt/python/libexec/bin $PATH -# Nix TODO - # Keychain if status --is-interactive # TODO Take this out when keychain fixes this bug diff --git a/logitech_linux_mouse.sh b/logitech_linux_mouse.sh new file mode 100755 index 0000000..db3ed81 --- /dev/null +++ b/logitech_linux_mouse.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +for id in `xinput --list|grep 'Logitech Gaming Mouse G502'|perl -ne 'while (m/id=(\d+)/g){print "$1\n";}'`; do + xinput set-prop $id "Device Accel Velocity Scaling" 1 + xinput set-prop $id "Device Accel Constant Deceleration" 1.2 + xinput set-button-map $id 1 2 3 5 4 # "natural" scrolling +done diff --git a/polybar b/polybar index 41f3bb7..5c23101 100644 --- a/polybar +++ b/polybar @@ -42,31 +42,16 @@ padding-right = 2 module-margin-left = 2 module-margin-right = 2 - font-0 = Iosevka:fontformat=truetype:size=8;0 -font-1 = fixed:pixelsize=10;1 -font-2 = unifont:fontformat=truetype:size=8:antialias=false;0 -font-3 = siji:pixelsize=10;1 +font-1 = siji:pixelsize=10;1 modules-left = workspace xwindow modules-center = modules-right = filesystem volume xkeyboard memory cpu wlan eth battery temperature date powermenu tray-position = right -tray-padding = 2 -;tray-transparent = true -;tray-background = #0063ff - -;wm-restack = bspwm -;wm-restack = i3 - -;override-redirect = true - -;scroll-up = bspwm-desknext -;scroll-down = bspwm-deskprev - -;scroll-up = i3wm-wsnext -;scroll-down = i3wm-wsprev +tray-padding = 0 +; tray-background = ${root.background} [module/xwindow] type = internal/xwindow @@ -306,13 +291,7 @@ menu-2-1-exec = menu-open-0 [settings] screenchange-reload = true -;compositing-background = xor -;compositing-background = screen -;compositing-foreground = source -;compositing-border = over [global/wm] -margin-top = 5 -margin-bottom = 5 - -; vim:ft=dosini +margin-top = 0 +margin-bottom = 0 diff --git a/spacemacs b/spacemacs index 4876d88..89cbc9b 100644 --- a/spacemacs +++ b/spacemacs @@ -69,7 +69,7 @@ values." xkcd spotify finance - emoji + ;; emoji ;; disable until https://github.com/syl20bnr/emacs-emoji-cheat-sheet-plus/issues/5 is fixed ;; (geolocation :variables ;; geolocation-enable-osx-location-service-support t ;; geolocation-enable-weather-forecast t) @@ -125,7 +125,7 @@ values." :repo "codefalling/vue-mode"))) ;; A list of packages and/or extensions that will not be install and loaded. - dotspacemacs-excluded-packages '(toxi-theme) + dotspacemacs-excluded-packages '(toxi-theme wolfram-mode) ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that ;; are declared in a layer which is not a member of ;; the list `dotspacemacs-configuration-layers'. (default t) @@ -200,8 +200,8 @@ values." ;; size to make separators look not too crappy. ;; dotspacemacs-default-font '("Source Code Pro" ;; dotspacemacs-default-font '("PragmataPro" - dotspacemacs-default-font '("Iosevka" - :size 13 + dotspacemacs-default-font '("Iosevka Nerd Font" + :size 12 :weight normal :width normal :powerline-scale 1.0) diff --git a/vimrc b/vimrc index 6ad3b92..4390cf4 100644 --- a/vimrc +++ b/vimrc @@ -250,3 +250,4 @@ nmap g :Goyo " Airline let g:airline#extensions#tabline#enabled = 1 +let g:airline_powerline_fonts = 1 diff --git a/xmonad.hs b/xmonad.hs index fe6e4cb..095079d 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -10,7 +10,7 @@ import System.Taffybar.Hooks.PagerHints (pagerHints) lightBlue = "#66aaff" main = xmonad $ docks $ ewmh $ pagerHints defaultConfig - { terminal = "urxvt" + { terminal = "urxvtc" , modMask = mod4Mask , workspaces = [ "1", "2", "3" ] , borderWidth = 2 @@ -21,6 +21,7 @@ main = xmonad $ docks $ ewmh $ pagerHints defaultConfig , startupHook = do spawn "pkill polybar; polybar top &" spawn "compton" + spawn "~/dotfiles/logitech_linux_mouse.sh" spawn "xsetroot -solid black -cursor_name left_ptr" spawn "feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg" }