Gentoo changesHEADmastermain

16 files changed, 21 insertions, 113 deletions

diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
new file mode 100644
index 0000000..e13157f
--- /dev/null
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -0,0 +1,6 @@
+import:
+  - ~/.config/alacritty/themes/themes/alabaster_dark.yaml
+font:
+  size: 7.0
+  normal:
+    family: terminus
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 2a034c3..d7e202f 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -1,9 +1,6 @@
 
 super + i
-	termite
-
-super + shift + i
-	termite --class float
+	alacritty
 
 # program launcher
 super + d
diff --git a/bspwm/.launchxvm b/bspwm/.launchxvm
new file mode 100755
index 0000000..8037b5c
--- /dev/null
+++ b/bspwm/.launchxvm
@@ -0,0 +1,3 @@
+
+sxhkd &
+exec bspwm
diff --git a/bspwm/.xinitrc b/bspwm/.xinitrc
deleted file mode 100644
index 5623a4b..0000000
--- a/bspwm/.xinitrc
+++ /dev/null
@@ -1,9 +0,0 @@
-
-export LOPTS="panel wallpaper composer gnome-keyring jpinput"
-export WALLCONFIG="$HOME/Pictures/rand/walls/config.yaml"
-# Launch other stuff
-source ~/.xprofile
-source ~/Scripts/xlaunchrc
-
-# sxhkd &
-exec xmonad 2>&1 | tee /tmp/vm.log
diff --git a/scripts/Scripts/lc b/scripts/Scripts/lc
index dba58f0..ed590e2 100755
--- a/scripts/Scripts/lc
+++ b/scripts/Scripts/lc
@@ -18,10 +18,10 @@ handle_stuff() {
 	fi
 # POWER COMMANDS
 	if [ "$1" = "suspend" ]; then
-		systemctl suspend
+		loginctl suspend
 	fi
 	if [ "$1" = "poweroff" ]; then
-		poweroff
+		loginctl poweroff
 	fi
 	if [ "$1" = "lock" ]; then
         $HOME/Scripts/lock.sh
diff --git a/vim-core/.config/nvim/init.vim b/vim-core/.config/nvim/init.vim
index c0f06f0..d60060a 100644
--- a/vim-core/.config/nvim/init.vim
+++ b/vim-core/.config/nvim/init.vim
@@ -57,6 +57,7 @@ filetype plugin indent on    " required
 
     " Persistent undo
     set undofile
+    set undodir=$HOME/.vimundo
 
     set autoread
 
@@ -117,7 +118,6 @@ filetype plugin indent on    " required
 
 " Highlightning And colors{{{
     set termguicolors
-    colorscheme PaperColor
 
 " Spell check
     set spelllang=en,da
diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim
index 7beab6d..e8841a9 100644
--- a/vim-extra/.config/nvim/extra.vim
+++ b/vim-extra/.config/nvim/extra.vim
@@ -28,7 +28,7 @@
 
 " }}}
 
-colorscheme PaperColor
+" colorscheme PaperColor
 
 " Treesitter {{{
 " lua << EOF
diff --git a/vim-extra/.vim/extra.vim b/vim-extra/.vim/extra.vim
deleted file mode 120000
index 3e61a92..0000000
--- a/vim-extra/.vim/extra.vim
+++ /dev/null
@@ -1 +0,0 @@
-../.config/nvim/extra.vim
\ No newline at end of file
diff --git a/xinit/.Xmodmap b/xinit/.Xmodmap
deleted file mode 100644
index 26a7912..0000000
--- a/xinit/.Xmodmap
+++ /dev/null
@@ -1,9 +0,0 @@
-clear lock
-clear control
-keycode 66 = Control_R
-add control = Control_R Control_L
-
-remove mod1 = Alt_L
-keycode 64 = Super_L
-
-keycode 94 = Alt_L
diff --git a/xinit/.xbindkeysrc b/xinit/.xbindkeysrc
deleted file mode 100644
index 70cb4d1..0000000
--- a/xinit/.xbindkeysrc
+++ /dev/null
@@ -1,76 +0,0 @@
-# For the benefit of emacs users: -*- shell-script -*-
-###########################
-# xbindkeys configuration #
-###########################
-#
-# Version: 1.8.7
-#
-# If you edit this file, do not forget to uncomment any lines
-# that you change.
-# The pound(#) symbol may be used anywhere for comments.
-#
-# To specify a key, you can use 'xbindkeys --key' or
-# 'xbindkeys --multikey' and put one of the two lines in this file.
-#
-# The format of a command line is:
-#    "command to start"
-#       associated key
-#
-#
-# A list of keys is in /usr/include/X11/keysym.h and in
-# /usr/include/X11/keysymdef.h
-# The XK_ is not needed.
-#
-# List of modifier:
-#   Release, Control, Shift, Mod1 (Alt), Mod2 (NumLock),
-#   Mod3 (CapsLock), Mod4, Mod5 (Scroll).
-#
-
-# The release modifier is not a standard X modifier, but you can
-# use it if you want to catch release events instead of press events
-
-# By defaults, xbindkeys does not pay attention with the modifiers
-# NumLock, CapsLock and ScrollLock.
-# Uncomment the lines above if you want to pay attention to them.
-
-#keystate_numlock = enable
-#keystate_capslock = enable
-#keystate_scrolllock= enable
-
-# Examples of commands:
-
-#"xbindkeys_show" 
-#  control+shift + q
-
-# set directly keycode (here control + f with my keyboard)
-#"xterm"
-#  c:41 + m:0x4
-
-# specify a mouse button
-#"xterm"
-#  control + b:2
-
-"~/Scripts/volume softmute"
-    Shift + Shift_R + Release
-
-"~/Scripts/volume softunmute"
-    Shift_R
-
-#"xterm -geom 50x20+20+20"
-#   Shift+Mod2+alt + s
-#
-## set directly keycode (here control+alt+mod2 + f with my keyboard)
-#"xterm"
-#  alt + c:0x29 + m:4 + mod2
-#
-## Control+Shift+a  release event starts rxvt
-#"rxvt"
-#  release+control+shift + a
-#
-## Control + mouse button 2 release event starts rxvt
-#"rxvt"
-#  Control + b:2 + Release
-
-##################################
-# End of xbindkeys configuration #
-##################################
diff --git a/xinit/.xprofile b/xinit/.xprofile
index b8a34a0..b5ac0fc 100755
--- a/xinit/.xprofile
+++ b/xinit/.xprofile
@@ -4,6 +4,7 @@ export TERM=termite
 export TERMINAL=termite
 
 export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
+export PATH="${PATH}:$HOME/.cargo/bin"
 
 export XKB_DEFAULT_LAYOUT=us
 export XKB_DEFAULT_VARIANT=altgr-intl
diff --git a/xinit/.xsession b/xinit/.xsession
index 16e4717..0fdd65b 100755
--- a/xinit/.xsession
+++ b/xinit/.xsession
@@ -1,3 +1,3 @@
-$HOME/Scripts/xlaunchrc
 
-exec i3
+source ~/Scripts/xlaunchrc
+exec ~/.launchxvm
diff --git a/xinit/.zprofile b/xinit/.zprofile
deleted file mode 100644
index b78f84a..0000000
--- a/xinit/.zprofile
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	exec startx
-fi
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index 15ce2d0..dc6f35b 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -47,7 +47,6 @@ do
             xcompmgr &
             ;;
         gnome-keyring)
-            dbus-update-activation-environment --systemd DISPLAY &
             eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
             ;;
         screensaver)
diff --git a/xinitrc_sample b/xinitrc_sample
index 535287f..9355fa1 100644
--- a/xinitrc_sample
+++ b/xinitrc_sample
@@ -1,8 +1,7 @@
 
-export LOPTS="gnome-keyring jpinput"
+export LOPTS="gnome-keyring panel"
 export WALLCONFIG="$HOME/Pictures/Rand/walls/config.yaml"
 # Launch other stuff
 source ~/.xprofile
-source ~/Scripts/xlaunchrc
 
-exec ~/.launchxvm
+exec dbus-launch --exit-with-session ~/.xsession
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 48b93f5..10d85fa 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -80,8 +80,10 @@ bindkey "^I" expand-or-complete-with-dots
 
 # Shift-tab
 zmodload zsh/complist
+bindkey -e
 bindkey -M menuselect '^[[Z' reverse-menu-complete
 
+
 #
 # Keybinding
 #
@@ -159,5 +161,4 @@ function gotos {
     fi
 }
 
-source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh