add keyring, seahorse and libsecret

.editorconfig

@@ -7,6 +7,7 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
+indent_size = 2
 
 # Matches multiple files with brace expansion notation
 [*.{sh,py,yml}]

README.md

@@ -9,6 +9,7 @@ New version as of dec 2021:
 [![dotfiles](media/dotfiles4.jpg)](https://raw.githubusercontent.com/Mastermindzh/dotfiles/master/media/dotfiles4.jpg)
 
 Older versions:
+
 - [dotfiles](media/dotfiles3.png)
 - [dotfiles](media/dotfiles.png)
 - [dotfiles2](media/dotfiles2.png)
@@ -25,7 +26,7 @@ Older versions:
 | Terminal         | xfce4-terminal                                                         |
 | Editor           | nano                                                                   |
 | Code editor      | vscode / jetbrains stuff                                               |
-| Browser          | Chromium                                                               |
+| Browser          | Firefox                                                                |
 | File manager     | If I have to use one ... Nautilus                                      |
 | Music            | Tidal through [Tidal-hifi](https://github.com/Mastermindzh/tidal-hifi) |
 |                  |                                                                        |

config/ranger/rc.conf

@@ -1,32 +0,0 @@
-set preview_images true
-set confirm_on_delete true
-set column_ratios 1,3,4
-set viewmode miller
-set unicode_ellipsis true
-
-set preview_files true
-set preview_directories true
-set collapse_preview true
-
-# git stuff
-set vcs_aware false
-set vcs_backend_git enabled
-
-# Which files should be hidden? (regular expression)
-set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$
-
-# Show hidden files? You can toggle this by typing 'zh'
-set show_hidden false
-
-# Draw borders around columns? (separators, outline, both, or none)
-# Separators are vertical lines between columns.
-# Outline draws a box around all the columns.
-# Both combines the two.
-set draw_borders both
-
-# KEY config
-map <delete> delete
-map <esc> quit
-map <C-c> copy
-map <C-x> cut
-map <C-v> paste

config/ranger/rifle.conf

@@ -1,84 +0,0 @@
-# vim: ft=cfg
-#
-# This is the configuration file of "rifle", ranger's file executor/opener.
-# Each line consists of conditions and a command.  For each line the conditions
-# are checked and if they are met, the respective command is run.
-#
-# Syntax:
-#   <condition1> , <condition2> , ... = command
-#
-# The command can contain these environment variables:
-#   $1-$9 | The n-th selected file
-#   $@    | All selected files
-#
-# If you use the special command "ask", rifle will ask you what program to run.
-#
-# Prefixing a condition with "!" will negate its result.
-# These conditions are currently supported:
-#   match <regexp> | The regexp matches $1
-#   ext <regexp>   | The regexp matches the extension of $1
-#   mime <regexp>  | The regexp matches the mime type of $1
-#   name <regexp>  | The regexp matches the basename of $1
-#   path <regexp>  | The regexp matches the absolute path of $1
-#   has <program>  | The program is installed (i.e. located in $PATH)
-#   env <variable> | The environment variable "variable" is non-empty
-#   file           | $1 is a file
-#   directory      | $1 is a directory
-#   number <n>     | change the number of this command to n
-#   terminal       | stdin, stderr and stdout are connected to a terminal
-#   X              | $DISPLAY is not empty (i.e. Xorg runs)
-#
-# There are also pseudo-conditions which have a "side effect":
-#   flag <flags>  | Change how the program is run. See below.
-#   label <label> | Assign a label or name to the command so it can
-#                 | be started with :open_with <label> in ranger
-#                 | or `rifle -p <label>` in the standalone executable.
-#   else          | Always true.
-#
-# Flags are single characters which slightly transform the command:
-#   f | Fork the program, make it run in the background.
-#     |   New command = setsid $command >& /dev/null &
-#   r | Execute the command with root permissions
-#     |   New command = sudo $command
-#   t | Run the program in a new terminal.  If $TERMCMD is not defined,
-#     | rifle will attempt to extract it from $TERM.
-#     |   New command = $TERMCMD -e $command
-# Note: The "New command" serves only as an illustration, the exact
-# implementation may differ.
-# Note: When using rifle in ranger, there is an additional flag "c" for
-# only running the current file even if you have marked multiple files.
-
-#-------------------------------------------
-# Websites
-#-------------------------------------------
-ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
-ext x?html?, has chromium,         X, flag f = chromium -- "$@"
-
-#--------------------------------------------
-# Video/Audio with a GUI
-#-------------------------------------------
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video|audio, has vlc,      X, flag f = vlc -- "$@"
-
-#-------------------------------------------
-# Documents
-#-------------------------------------------
-ext pdf, has evince,   X, flag f = evince -- "$@"
-ext pdf, has mupdf,    X, flag f = mupdf "$@"
-
-ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
-
-#-------------------------------------------
-# Image Viewing:
-#-------------------------------------------
-mime ^image, has eog,       X, flag f = eog -- "$@"
-mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
-mime ^image, has gimp,      X, flag f = gimp -- "$@"
-
-#-------------------------------------------
-# Text files
-#-------------------------------------------
-ext xml|json|csv|tex|py|pl|rb|js|sh|php|md|ovpn|txt|cfg|conf  = nano -- "$@"
-
-# The very last action, so that it's never triggered accidentally, is to execute a program:
-mime application/x-executable = "$1"

config/ranger/scope.sh

@@ -1,159 +0,0 @@
-#!/usr/bin/env bash
-
-set -o noclobber -o noglob -o nounset -o pipefail
-IFS=$'\n'
-
-## If the option `use_preview_script` is set to `true`,
-## then this script will be called and its output will be displayed in ranger.
-## Meanings of exit codes:
-## code | meaning    | action of ranger
-## -----+------------+-------------------------------------------
-## 0    | success    | Display stdout as preview
-## 1    | no preview | Display no preview at all
-## 2    | plain text | Display the plain content of the file
-## 3    | fix width  | Don't reload when width changes
-## 4    | fix height | Don't reload when height changes
-## 5    | fix both   | Don't ever reload
-## 6    | image      | Display the image `$IMAGE_CACHE_PATH` points to as an image preview
-## 7    | image      | Display the file directly as an image
-
-## Script arguments
-FILE_PATH="${1}"         # Full path of the highlighted file
-PV_WIDTH="${2}"          # Width of the preview pane (number of fitting characters)
-PV_HEIGHT="${3}"         # Height of the preview pane (number of fitting characters)
-IMAGE_CACHE_PATH="${4}"  # Full path that should be used to cache image preview
-PV_IMAGE_ENABLED="${5}"  # 'True' if image previews are enabled, 'False' otherwise.
-
-FILE_EXTENSION="${FILE_PATH##*.}"
-FILE_EXTENSION_LOWER="$(printf "%s" "${FILE_EXTENSION}" | tr '[:upper:]' '[:lower:]')"
-
-## Settings
-HIGHLIGHT_SIZE_MAX=262143  # 256KiB
-HIGHLIGHT_TABWIDTH=${HIGHLIGHT_TABWIDTH:-8}
-HIGHLIGHT_STYLE=${HIGHLIGHT_STYLE:-pablo}
-HIGHLIGHT_OPTIONS="--replace-tabs=${HIGHLIGHT_TABWIDTH} --style=${HIGHLIGHT_STYLE} ${HIGHLIGHT_OPTIONS:-}"
-PYGMENTIZE_STYLE=${PYGMENTIZE_STYLE:-autumn}
-
-handle_extension() {
-    case "${FILE_EXTENSION_LOWER}" in
-        # ## Archive
-        # a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\
-        # rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)
-        #     atool --list -- "${FILE_PATH}" && exit 5
-        #     bsdtar --list --file "${FILE_PATH}" && exit 5
-        #     exit 1;;
-        # rar)
-        #     ## Avoid password prompt by providing empty password
-        #     unrar lt -p- -- "${FILE_PATH}" && exit 5
-        #     exit 1;;
-        # 7z)
-        #     ## Avoid password prompt by providing empty password
-        #     7z l -p -- "${FILE_PATH}" && exit 5
-        #     exit 1;;
-
-        ## PDF
-        pdf)
-            ## Preview as text conversion
-            pdftotext -l 10 -nopgbrk -q -- "${FILE_PATH}" - | fmt -w "${PV_WIDTH}" && exit 5
-            mutool draw -F txt -i -- "${FILE_PATH}" 1-10 | fmt -w "${PV_WIDTH}" && exit 5
-            exiftool "${FILE_PATH}" && exit 5
-            exit 1;;
-
-        ## OpenDocument
-        odt|ods|odp|sxw)
-            ## Preview as text conversion
-            odt2txt "${FILE_PATH}" && exit 5
-            exit 1;;
-
-        ## HTML
-        htm|html|xhtml)
-            ## Preview as text conversion
-            w3m -dump "${FILE_PATH}" && exit 5
-            ;; # Continue with next handler on failure
-        ## JSON
-        json)
-            jq --color-output . "${FILE_PATH}" && exit 5
-            ;;
-    esac
-}
-
-handle_image() {
-    ## Size of the preview if there are multiple options or it has to be
-    ## rendered from vector graphics. If the conversion program allows
-    ## specifying only one dimension while keeping the aspect ratio, the width
-    ## will be used.
-    local DEFAULT_SIZE="1920x1080"
-
-    local mimetype="${1}"
-    case "${mimetype}" in
-        ## Image
-        image/*)
-            local orientation
-            orientation="$( identify -format '%[EXIF:Orientation]\n' -- "${FILE_PATH}" )"
-            ## If orientation data is present and the image actually
-            ## needs rotating ("1" means no rotation)...
-            if [[ -n "$orientation" && "$orientation" != 1 ]]; then
-                ## ...auto-rotate the image according to the EXIF data.
-                convert -- "${FILE_PATH}" -auto-orient "${IMAGE_CACHE_PATH}" && exit 6
-            fi
-
-            ## `w3mimgdisplay` will be called for all images (unless overriden
-            ## as above), but might fail for unsupported types.
-            exit 7;;
-
-    esac
-}
-
-handle_mime() {
-    local mimetype="${1}"
-    case "${mimetype}" in
-        ## Text
-        text/* | */xml)
-            ## Syntax highlight
-            if [[ "$( stat --printf='%s' -- "${FILE_PATH}" )" -gt "${HIGHLIGHT_SIZE_MAX}" ]]; then
-                exit 2
-            fi
-            if [[ "$( tput colors )" -ge 256 ]]; then
-                local pygmentize_format='terminal256'
-                local highlight_format='xterm256'
-            else
-                local pygmentize_format='terminal'
-                local highlight_format='ansi'
-            fi
-            env HIGHLIGHT_OPTIONS="${HIGHLIGHT_OPTIONS}" highlight \
-                --out-format="${highlight_format}" \
-                --force -- "${FILE_PATH}" && exit 5
-            pygmentize -f "${pygmentize_format}" -O "style=${PYGMENTIZE_STYLE}"\
-                -- "${FILE_PATH}" && exit 5
-            exit 2;;
-
-        ## Image
-        image/*)
-            ## Preview as text conversion
-            # img2txt --gamma=0.6 --width="${PV_WIDTH}" -- "${FILE_PATH}" && exit 4
-            exiftool "${FILE_PATH}" && exit 5
-            exit 1;;
-
-        ## Video and audio
-        video/* | audio/*)
-            mediainfo "${FILE_PATH}" && exit 5
-            exiftool "${FILE_PATH}" && exit 5
-            exit 1;;
-    esac
-}
-
-handle_fallback() {
-    echo '----- File Type Classification -----' && file --dereference --brief -- "${FILE_PATH}" && exit 5
-    exit 1
-}
-
-
-MIMETYPE="$( file --dereference --brief --mime-type -- "${FILE_PATH}" )"
-if [[ "${PV_IMAGE_ENABLED}" == 'True' ]]; then
-    handle_image "${MIMETYPE}"
-fi
-handle_extension
-handle_mime "${MIMETYPE}"
-handle_fallback
-
-exit 1

config/sddm/default.conf

@@ -0,0 +1,128 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+Relogin=false
+
+# Name of session file for autologin session (if empty try last logged in)
+#Session=
+
+# Username for autologin session
+#User=mastermindzh
+
+[General]
+# Halt command
+HaltCommand=/usr/bin/systemctl poweroff
+
+# Input method module
+InputMethod=
+
+# Comma-separated list of Linux namespaces for user session to enter
+Namespaces=
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+Numlock=none
+
+# Reboot command
+RebootCommand=/usr/bin/systemctl reboot
+
+[Theme]
+# Current theme name
+Current=chili
+
+# Cursor theme used in the greeter
+CursorTheme=
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+FacesDir=/usr/share/sddm/faces
+
+# Font used in the greeter
+Font=
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+[Users]
+# Default $PATH for logged in users
+DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+HideShells=
+
+# Comma-separated list of users that should not be listed
+HideUsers=root
+
+# Maximum user id for displayed users
+MaximumUid=60513
+
+# Minimum user id for displayed users
+MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+RememberLastSession=true
+
+# Remember the last successfully logged in user
+RememberLastUser=true
+
+# When logging in as the same user twice, restore the original session, rather than create a new one
+ReuseSession=true
+
+[Wayland]
+# Enable Qt's automatic high-DPI scaling
+EnableHiDPI=false
+
+# Path to a script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Directory containing available Wayland sessions
+SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+SessionLogFile=.local/share/sddm/wayland-session.log
+
+[X11]
+# Path to a script to execute when starting the display server
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+
+# Path to a script to execute when stopping the display server
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+
+# Enable Qt's automatic high-DPI scaling
+EnableHiDPI=false
+
+# The lowest virtual terminal number that will be used.
+MinimumVT=1
+
+# Arguments passed to the X server invocation
+ServerArguments=-nolisten tcp
+
+# Path to X server binary
+ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/Xsession
+
+# Directory containing available X sessions
+SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+SessionLogFile=.local/share/sddm/xorg-session.log
+
+# Path to the Xauthority file
+UserAuthFile=.Xauthority
+
+# Path to xauth binary
+XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+XephyrPath=/usr/bin/Xephyr

dependencies/aur.txt

@@ -18,3 +18,4 @@ dotnet-host-bin
 sysmontask
 keychain
 nomachine
+chili-sddm-theme

dependencies/pacman.txt

@@ -24,7 +24,6 @@ networkmanager
 eog
 python
 python-pip
-gdm
 neofetch
 git
 scrot
@@ -65,7 +64,6 @@ flameshot
 otf-font-awesome
 openvpn
 networkmanager-openvpn
-ranger
 w3m
 system-config-printer
 nautilus 
@@ -87,3 +85,8 @@ blueman
 pulseaudio-bluetooth
 bluez
 bluez-libs
+sddm
+polkit-gnome
+gnome-keyring
+libsecret
+seahorse

i3/config

@@ -130,7 +130,6 @@ bindsym $mod+d exec "rofi -show run"
 bindsym $mod+Tab exec "rofi -show"
 bindsym $mod+s exec "rofi -show ssh"
 bindsym $mod+n exec $vpnmanager
-bindsym $mod+shift+v exec "rofi -modi 'clipboard:greenclip print' -show clipboard -run-command '{cmd}'"
 
 ############################################
 #    Media keys                            #
@@ -232,7 +231,6 @@ for_window [class="Sysmontask"] resize set 930 665
 #    Workspace specific tools              #
 #       Use xprop to determine class       #
 ############################################
-assign [class="Franz"] $workspace9
 assign [class="Enpass-Desktop"] $workspace12
 assign [class="VirtualBox Machine"] $workspace11
 
@@ -240,7 +238,8 @@ assign [class="VirtualBox Machine"] $workspace11
 assign [class="MongoDB Compass"] $workspace8
 assign [class="robo3t"] $workspace8
 assign [class="Mysql-workbench-bin"] $workspace8
-assign [class="sqlops"] $workspace8
+assign [class="azuredatastudio"] $workspace8
+assign [class="beekeeper"] $workspace8
 
 ############################################
 #    i3-gaps                               #
@@ -255,6 +254,7 @@ gaps inner 10
 bindsym $mod+Shift+plus gaps inner all plus 5
 bindsym $mod+Shift+minus gaps inner all minus 5
 bindsym $mod+Shift+Home gaps inner all set 10
+bindsym $mod+Shift+a border normal
 
 # Smart borders (draw borders around container only if it is not the only container on this workspace)
 smart_borders on
@@ -307,10 +307,8 @@ mode "$mode_gaps_outer" {
 ############################################
 exec --no-startup-id i3-msg 'workspace $workspace2; exec xfce4-terminal' && i3-msg 'workspace $workspace1'
 exec --no-startup-id i3-msg 'workspace $workspace12; exec enpass'
+exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id nm-applet
 exec_always feh --bg-scale $(find ~/Pictures/wallpapers/ -type f -name "*" | shuf -n 1)
 exec /usr/bin/compton
 exec /bin/bash ~/.config/i3/scripts/startup.sh
-exec --no-startup-id greenclip daemon
-
-bindsym $mod+Shift+a border normal

install.sh

@@ -38,7 +38,7 @@ ask() {
 
 # delete target, create dirs if they don't exist yet and finally symlink the dir
 function linkDir {
-	rm -rf "$2";
+  rm -rf "$2"
   mkdir -p "${2%/*}"
   ln -sf "$1" "$2"
 }
@@ -84,7 +84,6 @@ function install_config {
   linkDir "$PWD"/config/notify-osd/notify-osd ~/.notify-osd
   linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal
   linkDir "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/.config
-	linkDir "$PWD"/config/ranger ~/.config/
 
   # link user files
   ln -sf "$PWD"/bash/.bashrc ~/.bashrc
@@ -110,7 +109,7 @@ function install_config {
   sudo ln -sf "$PWD"/config/package-managers/pacman.conf /etc/pacman.conf
   sudo ln -sf "$PWD"/config/package-managers/makepkg.conf /etc/makepkg.conf
   sudo ln -sf "$PWD"/config/ntp.conf /etc/ntp.conf
-	sudo ln -sf "$PWD"/bash/Completion /etc/bash_completion.d
+  sudo ln -sf "$PWD"/bash/Completion/ /etc/bash_completion.d
 
   # create empty .custom alias file
   echo "" >~/.custom
@@ -133,7 +132,6 @@ function install_dependencies {
   fileToList dependencies/npm.txt | xargs sudo npm install -g
 }
 
-
 # =======================================
 # User output functions
 # =======================================
@@ -177,7 +175,6 @@ function computer {
   echo ""
 }
 
-
 # =======================================
 # Main loop
 # =======================================
@@ -203,9 +200,13 @@ if ask "Do you want to install the fonts?" Y; then
   install_fonts
 fi
 
-# ask to enable gdm
+# ask to enable the display manager
-if ask "Do you want to enable GDM?" Y; then
+if ask "Do you want to enable sddm?" Y; then
-    sudo systemctl enable gdm.service
+  sudo systemctl set-default graphical.target
+  sudo systemctl enable sddm.service
+  sudo mkdir -p "/etc/sddm.conf.d/"
+  curl "http://gravatar.com/avatar/$(echo -n "info@rickvanlieshout.com" | md5sum - | cut -d' ' -f1)?s=1024" | sudo tee /usr/share/sddm/faces/mastermindzh.face.icon >/dev/null
+  sudo ln -sf "$PWD"/config/sddm/default.conf /etc/sddm.conf.d/
 fi
 
 clear
@@ -227,4 +228,4 @@ select opt in "$PWD/computers"/*; do
 done
 clear
 
-echo "Enjoy using my rice! Do not forget to select i3 in GDM :)"
+echo "Enjoy using my rice! Do not forget to select i3 in sddm :)"