Merge branch 'master' of https://github.com/mastermindzh/dotfiles

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to date versioning.
 
+## [2022-08-03]
+
+- Fixed i3lock re-using the last image
+- Set up /etc/environment sharing
+- Added in greenclip again
+- added after install and syncLocalSettings.json
+
 ## [2022-07-26]
 
 - Added `vers=2.1` to `mount.cifs` command in [mounts.sh](./bash/mounts.sh) to fix an [upstream bug](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.18.y&id=ca83f50b43a099345e61950f74c4d9eb81c765fe)

README.md

@@ -25,7 +25,7 @@ Older versions:
 | OS               | Arch Linux                                                             |
 | Terminal         | xfce4-terminal                                                         |
 | Editor           | nano                                                                   |
-| Code editor      | vscode / jetbrains stuff                                               |
+| Code editor      | vscode                                                                 |
 | Browser          | Firefox                                                                |
 | File manager     | If I have to use one ... Nautilus                                      |
 | Music            | Tidal through [Tidal-hifi](https://github.com/Mastermindzh/tidal-hifi) |
@@ -49,3 +49,7 @@ Some things are handled by window class/title or have custom resolutions set, th
 ## getting icons
 
 Copy/paste icons from this url: [https://fontawesome.com/v5/cheatsheet](https://fontawesome.com/v5/cheatsheet)
+
+## after-install
+
+After install read [./docs/afterinstall.md](./docs/afterinstall.md)

config/code/syncLocalSettings.json

@@ -0,0 +1,35 @@
+{
+  "ignoreUploadFiles": [
+    "state.*",
+    "syncLocalSettings.json",
+    ".DS_Store",
+    "sync.lock",
+    "projects.json",
+    "projects_cache_vscode.json",
+    "projects_cache_git.json",
+    "projects_cache_svn.json",
+    "gpm_projects.json",
+    "gpm-recentItems.json"
+  ],
+  "ignoreUploadFolders": [
+    "workspaceStorage",
+    "History",
+    "globalStorage",
+    "GlobalStorage"
+  ],
+  "ignoreExtensions": [],
+  "gistDescription": "Visual Studio Code Settings Sync Gist",
+  "downloadPublicGist": false,
+  "supportedFileExtensions": [
+    "json",
+    "code-snippets"
+  ],
+  "openTokenLink": true,
+  "disableUpdateMessage": false,
+  "githubEnterpriseUrl": null,
+  "askGistDescription": false,
+  "customFiles": {},
+  "hostName": null,
+  "universalKeybindings": false,
+  "autoUploadDelay": 20
+}

config/environment

@@ -0,0 +1,7 @@
+#
+# This file is parsed by pam_env module
+#
+# Syntax: simple "KEY=VAL" pairs on separate lines
+#
+XCURSOR_THEME="Adwaita"
+EDITOR="nano"

config/greenclip.toml

@@ -0,0 +1,10 @@
+[greenclip]
+  blacklisted_applications = []
+  enable_image_support = true
+  history_file = "/home/mastermindzh/.cache/greenclip.history"
+  image_cache_directory = "/tmp/greenclip"
+  max_history_length = 25
+  max_selection_size_bytes = 0
+  static_history = []
+  trim_space_from_selection = true
+  use_primary_selection_as_input = false

dependencies/aur.txt

@@ -22,3 +22,4 @@ chili-sddm-theme
 robo3t-bin
 dive
 gnome-text-editor
+greenclip

docs/afterinstall.md

@@ -0,0 +1,20 @@
+# after install
+
+<!-- toc -->
+
+- [Set up vscode settings sync + globalstorage](#set-up-vscode-settings-sync--globalstorage)
+
+<!-- tocstop -->
+
+## Set up vscode settings sync + globalstorage
+
+After setting up settings sync make sure that the "ignoreUploadFolders" in [~/.config/Code/User/syncLocalSettings.json](~/.config/Code/User/syncLocalSettings.json) includes "globalstorages":
+
+```sh
+  "ignoreUploadFolders": [
+    "workspaceStorage",
+    "History",
+    "globalStorage",
+    "GlobalStorage"
+  ],
+```

i3/config

@@ -132,6 +132,7 @@ 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                            #
@@ -316,3 +317,4 @@ 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

i3/scripts/i3lock.sh

@@ -4,7 +4,7 @@ icon="$HOME/.config/i3/icons/lock.png"
 tmpbg='/tmp/screen.png'
 
 # detect whether tidal is running
-isPlaying=$(~/.config/i3/scripts/tidal-cli.sh status);
+isPlaying=$(~/.config/i3/scripts/tidal-cli.sh status)
 
 scrot "$tmpbg"
 convert "$tmpbg" -scale 10% -scale 1000% "$tmpbg"
@@ -15,15 +15,15 @@ convert "$tmpbg" "$icon" -gravity center -composite -matte "$tmpbg"
 
 # check whether the lockscreen is being activated because of a suspend
 if [[ $* == *--suspend ]]; then
-    # if it is, simply lock without no-fork
+  # if it is, simply lock without no-fork
-    i3lock -f -i "$tmpbg";
+  i3lock -f -i "$tmpbg"
 else
-    # if it isn't suspended, enable no-fork
+  # if it isn't suspended, enable no-fork
-    i3lock -n -f -i "$tmpbg";
+  i3lock -n -f -i "$tmpbg"
-
-    # if tidal was playing before we locked, resume.
-    if [ $isPlaying == "playing" ]; then
-        ~/.config/i3/scripts/tidal-cli.sh play
-    fi;
 
+  # if tidal was playing before we locked, resume.
+  if [ $isPlaying == "playing" ]; then
+    ~/.config/i3/scripts/tidal-cli.sh play
+  fi
+  rm -rf $tmpbg
 fi

install.sh

@@ -93,6 +93,7 @@ function install_config {
   ln -sf "$PWD"/config/gtk-3.0/settings.ini ~/.gtkrc-2.0.mine
   ln -sf "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/settings.ini
   ln -sf "$PWD"/config/mimeapps.list ~/.config/mimeapps.list
+  ln -sf "$PWD"/config/greenclip.toml ~/.config/greenclip.toml
 
   mkdir -p ~/.config/rofi
   ln -sf "$PWD"/config/rofi/rofi.rasi ~/.config/rofi/config.rasi
@@ -110,11 +111,15 @@ function install_config {
   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"/config/environment /etc/environment
 
   # create empty .custom alias file
   echo "" >~/.custom
   echo "" >~/.variables
 
+  # files to be copied once
+  cp "$PWD"/config/code/syncLocalSettings.json ~/.config/Code/User/
+
   # system fixes
   echo fs.inotify.max_user_watches=524288 | sudo tee /etc/sysctl.d/40-max-user-watches.conf && sudo sysctl --system
   mkdir -p ~/Pictures/Screenshots