diff --git a/README.md b/README.md index ac29222..b3cd6a0 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ + Editor: emacs (nvim as fallback) + File-Browser: ranger + Image-Viewer: sxiv -+ Launcher: dmenu ++ Launcher: [dmenu](https://github.com/crammk/dmenu) + Music: spotify + Pdf-Viewer: zathura with mupdf + Screenshots: Flameshot diff --git a/files/.config/i3/config b/files/.config/i3/config index 8e966a2..9fa1078 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -72,11 +72,7 @@ bindsym $mod+comma workspace prev bindsym $mod+period workspace next # dmenu -set $fg '#ffffff' -set $bg '#1C1B1D' -set $accent '#98c379' -set $font 'Product Sans:pixelsize=15' -bindsym $mod+d exec "dmenu_run -fn $font -nb $bg -sb $bg -nf $fg -sf $accent" +bindsym $mod+d exec "dmenu_run" # Screenhot bindsym $mod+Shift+s exec "flameshot gui" @@ -158,4 +154,4 @@ bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+0 move container to workspace number $ws10 # ============================== Startup -exec ~/scripts/run_on_startup.sh +#exec ~/scripts/run_on_startup.sh diff --git a/files/.config/polybar/config b/files/.config/polybar/config index 8d2d820..8081753 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -41,6 +41,7 @@ width = 100% padding-left = 3 padding-right = 3 + module-margin-left = 5 module-margin-center = 5 @@ -61,12 +62,12 @@ wm-restack = i3 modules-left = i3 spotify modules-center = date -modules-right = memory cpu volume sep +modules-right = volume sep [bar/laptop] inherit = bar/main -modules-right = memory cpu volume battery sep +modules-right = volume battery sep # ======================================== MODULES [module/i3] diff --git a/files/.xinitrc b/files/.xinitrc new file mode 100755 index 0000000..2f11dcb --- /dev/null +++ b/files/.xinitrc @@ -0,0 +1,46 @@ +#!/bin/bash +# +# ~/.xinitrc +# +# Executed by startx + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap + +# merge in defaults and keymaps +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs +# TODO: is this needed? +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi +#xset r rate 660 25 + +# keyboard layout +setxkbmap -layout za + +# start programs +fcitx -d & +nextcloud & +dunst & +picom & +nm-applet & + +# launch bar +$HOME/scripts/polybar.sh + +# wallpaper +feh --bg-scale $HOME/data/nextcloud/wallpaper/wallpaper.png +#asetroot $HOME/data/nextcloud/wallpaper/animated/current/ -t 50 & + +exec i3 diff --git a/files/.zshrc b/files/.zshrc index d8c0bc4..c32b9f8 100644 --- a/files/.zshrc +++ b/files/.zshrc @@ -41,6 +41,7 @@ export WINIT_UNIX_BACKEND=x11 # ============================== Aliases alias fontslist="fc-list :scalable=true:spacing=mono: family" alias fontscache="fc-cache -f -v" +alias accent="echo #98c379" alias hm="cd ~/dev/hm-aufgaben" diff --git a/files/linkdots.sh b/files/linkdots.sh index dd2d3f0..77d5537 100755 --- a/files/linkdots.sh +++ b/files/linkdots.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash VERBOSE=$1 @@ -14,7 +14,7 @@ mkdir -p $HOME/.emacs.d ln -sf $path/init.el $HOME/.emacs.d/init.el # Home directory -home_files=".bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources" +home_files=".bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources .xinitrc" for file in $home_files do ln -sf $path/$file $HOME/$file @@ -23,6 +23,10 @@ do fi done +# properly add startx files +chmod +x $HOME/.xinitrc +ln -s $HOME/.xinitrc $HOME/.xsession + # .config directory conf_files="alacritty dunst i3 nvim picom.conf polybar ranger zathura" for file in $conf_files diff --git a/files/scripts/run_on_startup.sh b/files/scripts/run_on_startup.sh index 076b3fa..ba3dd8f 100755 --- a/files/scripts/run_on_startup.sh +++ b/files/scripts/run_on_startup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # set keyboard layout setxkbmap -layout za @@ -11,10 +11,10 @@ picom & nm-applet & # adjust screens on nazarick -~/scripts/fix_screens.sh +$HOME/scripts/fix_screens.sh # launch polybar -~/scripts/polybar.sh & +$HOME/scripts/polybar.sh & # wallpaper feh --bg-scale $HOME/data/nextcloud/wallpaper/wallpaper.png