diff --git a/.gitignore b/.gitignore index 2c81144..60dda3c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,9 @@ system/.config/mpv/restore-old-bindings.conf .zcompdump system/.config/pulse/* -!system/.config/pulse/default.pa \ No newline at end of file +!system/.config/pulse/default.pa + +system/.config/cmus/* +!system/.config/cmus/rc + +system/.config/polybar/scripts/gmail/credentials.json \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 754147a..314a9b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,5 +16,5 @@ Lint: - shellcheck ./system/.config/zsh/.zprofile - shellcheck ./system/.config/zsh/.zshrc - shellcheck ./system/.config/X11/xsetup - - shellcheck ./install.sh - - shellcheck ./post-install.sh + - shellcheck ./install + - shellcheck ./post-install diff --git a/README.md b/README.md index 1763223..6a62073 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,16 @@ While the configurations are based on my preferences and made my dotfiles public The installation is pretty straightforward using a couple of installation scripts. 1. Clone the repository -2. Run `./install.sh` +2. Run `./install` 3. Reboot the system -4. Run `./post-install.sh` +4. Run `./post-install` ## Keybindings -| Keybinding | Use | -| ------------------------------- | ------------------- | -| Super+1-9 | Switching workspace | +| Keybinding | Description | +| ------------------------------------------------ | -------------------------------- | +| Super+1-9 | Switching workspace | +| Super+Shift+1-9 | Move focused window to workspace | +| Super+G | Open game menu | ## Contents The list of my used arch packages are found inside `packages/packages.list`. @@ -25,6 +27,14 @@ The main content of this repository can be found in the `system` folder. It contains all configurations files, directories and scripts that mostly get symlinked by my install script. +### `etc/udev` +This folder contains my custom udev rules. They are moved to +`/etc/udev/rules.d/` by the installation script. + +### `etc/sudoers.d` +This folder contains my custom sudoers configuration. They are moved to +`/etc/sudoers.d` by the installation script. + ### `.config/autokey` This folder contains my phrases and scripts for [AutoKey](https://github.com/autokey/autokey). @@ -32,6 +42,10 @@ This folder contains my phrases and scripts for ### `.config/bat` This folder contains my configuration for [bat](https://github.com/sharkdp/bat) a replacement for cat. +### `.config/cmus` +This folder contains my [cmus](https://cmus.github.io/) +configuration. + ### `.config/compton` This folder contains my [compton](https://github.com/yshui/compton/releases) configuration. @@ -108,9 +122,5 @@ This file contains my QT4 configuration. ### `.local/bin` This folder contains a bunch of scripts that I use. Some of them are used by -Polybar or i3 and others are used directly and some like `utils.sh` contain -functions that I use in other scripts. - -### `udev` -This folder contains my custom udev rules. They are moved to -`/etc/udev/rules.d/` by the installation script. \ No newline at end of file +Polybar or i3 and others are used directly and some like `utils` contain +functions that I use in other scripts. \ No newline at end of file diff --git a/install.sh b/install similarity index 89% rename from install.sh rename to install index eaaebfa..022d742 100755 --- a/install.sh +++ b/install @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # # SCRIPT NAME: -# install.sh +# install # # AUTHOR: # Severin Kaderli @@ -12,8 +12,8 @@ # installs pacman packages and gives out the correct permissions to files. # # USAGE: -# ./install.sh -. ./system/.local/bin/utils.sh +# ./install +. ./system/.local/bin/utils ####################################### # Configuration variables @@ -26,12 +26,15 @@ DIRECTORIES=( "Build" "Downloads" "Projects" + "Videos" + "Images" ) # Array of files which should be symlinked in the home folder LINKED_FILES_HOME=( ".config/autokey" ".config/bat" + ".config/cmus" ".config/compton" ".config/cron" ".config/custom" @@ -115,8 +118,14 @@ do done print_header "Copy custom udev rules" -for file in ${SYSTEM_DIR}/udev/rules.d/*.rules +for file in ${SYSTEM_DIR}/etc/udev/rules.d/*.rules do copy_udev_rule "${file}" done sudo udevadm control --reload-rules + +print_header "Copy sudoers content" +for file in ${SYSTEM_DIR}/etc/sudoers.d/* +do + copy_sudoers_content "${file}" +done \ No newline at end of file diff --git a/post-install.sh b/post-install similarity index 85% rename from post-install.sh rename to post-install index 08f44b3..fd0226a 100755 --- a/post-install.sh +++ b/post-install @@ -1,19 +1,19 @@ -#!/bin/bash +#!/usr/bin/env bash # # SCRIPT NAME: -# post-install.sh +# post-install # # AUTHOR: # Severin Kaderli # # DESCRIPTION: # This is the post-install script for my dotfiles. It should be only run -# after install.sh has been run and the system has been rebooted. This script +# after install has been run and the system has been rebooted. This script # installs global npm packages. # # USAGE: -# ./post-install.sh -. ./system/.local/bin/utils.sh +# ./post-install +. ./system/.local/bin/utils ####################################### # Configuration variables diff --git a/system/.config/X11/xresources b/system/.config/X11/xresources index a34a102..eaa3e3f 100644 --- a/system/.config/X11/xresources +++ b/system/.config/X11/xresources @@ -22,4 +22,6 @@ rofi.seperator-style: solid rofi.opacity: 100 rofi.location: 2 rofi.yoffset: 35 -rofi.fixed-num-lines: false \ No newline at end of file +rofi.fixed-num-lines: false + +Sxiv.background: #000000 \ No newline at end of file diff --git a/system/.config/X11/xsetup b/system/.config/X11/xsetup index 8854f3a..795c3c4 100644 --- a/system/.config/X11/xsetup +++ b/system/.config/X11/xsetup @@ -31,4 +31,4 @@ xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources" # Start ibus #ibus-daemon -drx -. "${XDG_BIN_HOME}/resolution.sh" +. "${XDG_BIN_HOME}/resolution" diff --git a/system/.config/autokey/autokey.json b/system/.config/autokey/autokey.json index c172ce8..d783290 100644 --- a/system/.config/autokey/autokey.json +++ b/system/.config/autokey/autokey.json @@ -12,10 +12,10 @@ "interfaceType": "XRecord", "undoUsingBackspace": true, "windowDefaultSize": [ - 924, - 469 + 1872, + 962 ], - "hPanePosition": 232, + "hPanePosition": 472, "columnWidths": [ 150, 50, diff --git a/system/.config/autokey/autokey.json~ b/system/.config/autokey/autokey.json~ index 857a515..d783290 100644 --- a/system/.config/autokey/autokey.json~ +++ b/system/.config/autokey/autokey.json~ @@ -13,9 +13,9 @@ "undoUsingBackspace": true, "windowDefaultSize": [ 1872, - 301 + 962 ], - "hPanePosition": 470, + "hPanePosition": 472, "columnWidths": [ 150, 50, diff --git a/system/.config/autokey/data/Phrases/.E-Mail.json b/system/.config/autokey/data/Phrases/.E-Mail.json index 70f56b6..092d699 100644 --- a/system/.config/autokey/data/Phrases/.E-Mail.json +++ b/system/.config/autokey/data/Phrases/.E-Mail.json @@ -15,7 +15,7 @@ ], "backspace": true, "ignoreCase": false, - "immediate": true, + "immediate": false, "triggerInside": false, "wordChars": "[\\w]" }, diff --git a/system/.config/autokey/data/Scripts/.current_date.json b/system/.config/autokey/data/Scripts/.current_date.json index 1c2d16f..ae07d14 100644 --- a/system/.config/autokey/data/Scripts/.current_date.json +++ b/system/.config/autokey/data/Scripts/.current_date.json @@ -5,7 +5,7 @@ "modes": [ 1 ], - "usageCount": 12, + "usageCount": 19, "prompt": false, "omitTrigger": false, "showInTrayMenu": false, @@ -15,7 +15,7 @@ ], "backspace": true, "ignoreCase": false, - "immediate": true, + "immediate": false, "triggerInside": false, "wordChars": "[\\w]" }, diff --git a/system/.config/cmus/rc b/system/.config/cmus/rc new file mode 100644 index 0000000..11eeff6 --- /dev/null +++ b/system/.config/cmus/rc @@ -0,0 +1 @@ +set display_artist_sort_name=/home/severin/.local/bin/cmus-cover \ No newline at end of file diff --git a/system/.config/compton/compton.conf b/system/.config/compton/compton.conf index 907a8fe..888fb23 100644 --- a/system/.config/compton/compton.conf +++ b/system/.config/compton/compton.conf @@ -15,7 +15,7 @@ opacity-rule = [ "85:class_g = 'Nemo'" ]; -inactive-dim = 0.25; +#inactive-dim = 0.25; # Performance improvements unredir-if-possible = true; diff --git a/system/.config/cron/crontab b/system/.config/cron/crontab index 9fe056a..0ff3713 100644 --- a/system/.config/cron/crontab +++ b/system/.config/cron/crontab @@ -11,5 +11,10 @@ # This file is loaded on boot by crontab. # Synchronize Google Drive every 30 minutes -*/30 * * * * grive -d -p /home/severin/GoogleDrive/ >> /home/severin/.local/log/cron.log 2>&1 -*/5 * * * * /home/severin/.local/bin/sync_notes.sh >> /home/severin/.local/log/notes.log 2>&1 +*/30 * * * * grive -d -p $HOME/Documents/ >> $HOME/.local/log/cron.log + +# Sync pacman databases every 30 minutes +*/30 * * * * sudo $HOME/.local/bin/sync_package_databases >> $HOME/.local/log/cron.log + +# Synchronize notes every 5 minutes +*/5 * * * * $HOME/.local/bin/sync_notes >> $HOME/.local/log/cron.log diff --git a/system/.config/custom/aliases b/system/.config/custom/aliases index e9b1da5..420745e 100644 --- a/system/.config/custom/aliases +++ b/system/.config/custom/aliases @@ -32,6 +32,9 @@ alias pj="cd ~/Projects" # Alias to get to my Downloads folder alias dl="cd ~/Downloads" +# Alias to get to my Documents folder +alias doc="cd ~/Documents" + # Alias for opening my code editor alias e="code" diff --git a/system/.config/custom/env b/system/.config/custom/env index 55a7176..ab3eb9d 100644 --- a/system/.config/custom/env +++ b/system/.config/custom/env @@ -11,7 +11,7 @@ # # USAGE: # This script is sourced by .bashrc -. "${XDG_BIN_HOME}/utils.sh" +. "${XDG_BIN_HOME}/utils" # XDG Overrides for unsupported programs export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie" diff --git a/system/.config/gtk-3.0/bookmarks b/system/.config/gtk-3.0/bookmarks index f2dab30..34fb0bd 100644 --- a/system/.config/gtk-3.0/bookmarks +++ b/system/.config/gtk-3.0/bookmarks @@ -1,5 +1,5 @@ file:///home/severin/Downloads Downloads -file:///home/severin/GoogleDrive GoogleDrive +file:///home/severin/Documents Documents file:///home/severin/Projects Projects file:///home/severin/dotfiles dotfiles file:///home/severin/Notes Notes diff --git a/system/.config/i3/config b/system/.config/i3/config index 04c6b44..e16d9e2 100644 --- a/system/.config/i3/config +++ b/system/.config/i3/config @@ -10,18 +10,36 @@ # USAGE: # This file is automatically used by i3. +# Disable window titlebars and borders +for_window [class="^.*"] border pixel 0 + +# Gaps +gaps inner 25 +#gaps outer -10 + +new_window none + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:Noto Sans, Font Awesome 5 Free 15px + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + ############################################################################### # Modifiers # ############################################################################### set $mod Mod4 set $alt Mod1 + ############################################################################### # Outputs # ############################################################################### set $output1 HDMI-1 set $output2 eDP-1 + ############################################################################### # Workspaces # ############################################################################### @@ -49,29 +67,36 @@ workspace $workspace8 output $output1 workspace $workspace9 output $output2 workspace $workspace10 output $output2 -new_window none +# Assign applications to workspaces +assign [class="Google-chrome-beta"] $workspace1 +assign [instance="cmus"] $workspace10 +assign [class="Code"] $workspace3 +assign [class="Nemo"] $workspace4 +assign [class="discord"] $workspace5 +assign [class="Steam"] $workspace6 +assign [class="keepassxc"] $workspace8 +assign [class="vlc"] $workspace9 +assign [class="mpv"] $workspace9 +assign [class="Notable"] $workspace7 -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Noto Sans, Font Awesome 5 Free 15px ############################################################################### # Keybindings # ############################################################################### - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - # Start a terminal bindsym $mod+Return exec termite -c ~/.config/termite/config # Kill focused window bindsym $mod+Shift+q kill -# Rofi menus +# Open run menu bindsym $mod+R exec rofi -show run -lines 5 -bindsym $mod+G exec games.sh -bindsym $mod+F4 exec power.sh + +# Open game menu +bindsym $mod+G exec games + +# Open power menu +bindsym $mod+F4 exec power # Change focus bindsym $mod+Left focus left @@ -99,67 +124,57 @@ bindsym $mod+$alt+H move workspace to output left bindsym $mod+$alt+Right move workspace to output right bindsym $mod+$alt+L move workspace to output right -# split in horizontal orientation -#bindsym $mod+h split h - -# split in vertical orientation -bindsym $mod+v split v +# Toggle split orientation +bindsym $mod+T split toggle # Fullscreen toggle bindsym $mod+F11 fullscreen toggle # toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - - +bindsym $mod+Shift+Space floating toggle # Workspace switching bindsym $mod+1 workspace $workspace1 -bindsym $mod+2 workspace $workspace2 -bindsym $mod+3 workspace $workspace3 -bindsym $mod+4 workspace $workspace4 -bindsym $mod+5 workspace $workspace5 -bindsym $mod+6 workspace $workspace6 -bindsym $mod+7 workspace $workspace7 -bindsym $mod+8 workspace $workspace8 -bindsym $mod+9 workspace $workspace9 -bindsym $mod+0 workspace $workspace10 - bindsym $mod+KP_1 workspace $workspace1 +bindsym $mod+2 workspace $workspace2 bindsym $mod+KP_2 workspace $workspace2 +bindsym $mod+3 workspace $workspace3 bindsym $mod+KP_3 workspace $workspace3 +bindsym $mod+4 workspace $workspace4 bindsym $mod+KP_4 workspace $workspace4 +bindsym $mod+5 workspace $workspace5 bindsym $mod+KP_5 workspace $workspace5 +bindsym $mod+6 workspace $workspace6 bindsym $mod+KP_6 workspace $workspace6 +bindsym $mod+7 workspace $workspace7 bindsym $mod+KP_7 workspace $workspace7 +bindsym $mod+8 workspace $workspace8 bindsym $mod+KP_8 workspace $workspace8 +bindsym $mod+9 workspace $workspace9 bindsym $mod+KP_9 workspace $workspace9 +bindsym $mod+0 workspace $workspace10 bindsym $mod+KP_0 workspace $workspace10 # Moving container to workspace bindsym $mod+Shift+1 move container to workspace $workspace1 -bindsym $mod+Shift+2 move container to workspace $workspace2 -bindsym $mod+Shift+3 move container to workspace $workspace3 -bindsym $mod+Shift+4 move container to workspace $workspace4 -bindsym $mod+Shift+5 move container to workspace $workspace5 -bindsym $mod+Shift+6 move container to workspace $workspace6 -bindsym $mod+Shift+7 move container to workspace $workspace7 -bindsym $mod+Shift+8 move container to workspace $workspace8 -bindsym $mod+Shift+9 move container to workspace $workspace9 -bindsym $mod+Shift+0 move container to workspace $workspace10 - bindsym $mod+Shift+KP_1 move container to workspace $workspace1 +bindsym $mod+Shift+2 move container to workspace $workspace2 bindsym $mod+Shift+KP_2 move container to workspace $workspace2 +bindsym $mod+Shift+3 move container to workspace $workspace3 bindsym $mod+Shift+KP_3 move container to workspace $workspace3 +bindsym $mod+Shift+4 move container to workspace $workspace4 bindsym $mod+Shift+KP_4 move container to workspace $workspace4 +bindsym $mod+Shift+5 move container to workspace $workspace5 bindsym $mod+Shift+KP_5 move container to workspace $workspace5 +bindsym $mod+Shift+6 move container to workspace $workspace6 bindsym $mod+Shift+KP_6 move container to workspace $workspace6 +bindsym $mod+Shift+7 move container to workspace $workspace7 bindsym $mod+Shift+KP_7 move container to workspace $workspace7 +bindsym $mod+Shift+8 move container to workspace $workspace8 bindsym $mod+Shift+KP_8 move container to workspace $workspace8 +bindsym $mod+Shift+9 move container to workspace $workspace9 bindsym $mod+Shift+KP_9 move container to workspace $workspace9 +bindsym $mod+Shift+0 move container to workspace $workspace10 bindsym $mod+Shift+KP_0 move container to workspace $workspace10 # Restart i3 @@ -181,20 +196,14 @@ bindsym Escape mode "default" bindsym $mod+x mode "resize" -exec_always --no-startup-id $HOME/.config/polybar/launch.sh - -####################################### -# Custom keybinding -####################################### # Screen lock controls -#bindsym $mod+l exec --no-startup-id $XDG_BIN_HOME/screenlock.sh -bindsym XF86Sleep exec --no-startup-id $XDG_BIN_HOME/screenlock.sh +bindsym XF86Sleep exec --no-startup-id screenlock # Volume controls bindsym XF86AudioMute exec --no-startup-id pamixer -t bindsym $mod+m exec --no-startup-id pamixer -t -bindsym XF86AudioRaiseVolume exec --no-startup-id $XDG_BIN_HOME/increase_volume.sh -bindsym $mod+KP_Add exec --no-startup-id $XDG_BIN_HOME/increase_volume.sh +bindsym XF86AudioRaiseVolume exec --no-startup-id increase_volume +bindsym $mod+KP_Add exec --no-startup-id increase_volume bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 5 --allow-boost bindsym $mod+KP_Subtract exec --no-startup-id pamixer -d 5 --allow-boost @@ -212,21 +221,25 @@ bindsym XF86AudioPrev exec --no-startup-id cmus-remote -r bindsym $mod+Control+Left exec --no-startup-id cmus-remote -r +exec --no-startup-id "i3-msg 'workspace 10: ; append_layout /home/severin/.config/i3/workspace-10.json'" -####################################### -# Startup applications -####################################### -# Dunst -exec --no-startup-id dunst - -# Compton +############################################################################### +# Startup applications # +############################################################################### +# Start compton exec --no-startup-id compton -b -# Background-Image -exec_always --no-startup-id feh --randomize --bg-fill $HOME/GoogleDrive/02_Media/Images/01_Wallpaper/Desktop/* +# Start polybar +exec_always --no-startup-id $XDG_CONFIG_HOME/polybar/launch -# Monitor settings -exec_always --no-startup-id $XDG_BIN_HOME/resolution.sh +# Start dunst +exec --no-startup-id dunst + +# Set resolution +exec_always --no-startup-id resolution + +# Set wallpaper +exec_always --no-startup-id wallpaper # Other applications exec autokey-gtk @@ -238,23 +251,5 @@ exec nemo exec keepassxc exec notable exec termite -e cmus --name cmus - -# Assign programs to specific workspaces -### -assign [class="Google-chrome-beta"] $workspace1 -assign [instance="cmus"] $workspace10 -assign [class="Code"] $workspace3 -assign [class="Nemo"] $workspace4 -assign [class="discord"] $workspace5 -assign [class="Steam"] $workspace6 -assign [class="keepassxc"] $workspace8 -assign [class="vlc"] $workspace9 -assign [class="mpv"] $workspace9 -assign [class="Notable"] $workspace7 - -# Disable window titlebars and borders -for_window [class="^.*"] border pixel 0 - -# Gaps -gaps inner 25 -#gaps outer -10 +exec termite -e cava --name cava +exec sxiv -b -s f $HOME/.local/share/cmus/.cover \ No newline at end of file diff --git a/system/.config/i3/workspace-10.json b/system/.config/i3/workspace-10.json new file mode 100644 index 0000000..c15c16d --- /dev/null +++ b/system/.config/i3/workspace-10.json @@ -0,0 +1,96 @@ +[ +{ + "border": "none", + "floating": "auto_off", + "fullscreen_mode": 0, + "layout": "splith", + "percent": 1, + "type": "con", + "nodes": [ + { + "border": "none", + "floating": "auto_off", + "layout": "splith", + "percent": 1, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 434, + "width": 736, + "x": 0, + "y": 0 + }, + "name": "cmus v2.7.1", + "percent": 0.7, + "swallows": [ + { + "instance": "^cmus$" + } + ], + "type": "con" + }, + { + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.3, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 1080, + "width": 1920, + "x": 0, + "y": 0 + }, + "name": "sxiv", + "percent": 0.5, + "swallows": [ + { + "instance": "^sxiv$" + } + ], + "type": "con" + }, + { + "border": "none", + "floating": "auto_off", + "layout": "splith", + "percent": 0.5, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 434, + "width": 736, + "x": 0, + "y": 0 + }, + "name": "cava", + "percent": 1, + "swallows": [ + { + "instance": "^cava$" + } + ], + "type": "con" + } + ] + } + ] + } + ] + } + ] +} +] diff --git a/system/.config/polybar/config b/system/.config/polybar/config index a18d9b9..76160c2 100644 --- a/system/.config/polybar/config +++ b/system/.config/polybar/config @@ -28,7 +28,7 @@ monitor = HDMI-1 width = 100% height = ${settings.bar-height} offset-x = 0 -offset-y = 0 +offset-y = 0 font-0 = Noto Sans:pixelsize=12;3 font-1 = Noto Sans CJK JP:pixelsize=12;3 @@ -42,8 +42,8 @@ padding-right = 2 module-margin = 2 modules-left = i3 -modules-center = xwindow -modules-right = battery volume backlight wlan date power +modules-center = +modules-right = update gmail todo battery volume backlight wlan date power tray-position = none separator = | @@ -106,20 +106,53 @@ label-urgent-background = ${settings.background-color} label-urgent-padding = ${settings.padding} -####################################### -# Active window title -####################################### -[module/xwindow] -type = internal/xwindow +############################################################################### +# Update count # +############################################################################### +[module/update] +type = custom/script +exec = ${XDG_CONFIG_HOME}/polybar/scripts/update-count format =