Merge remote-tracking branch 'origin/master'

.gitignore

@@ -24,3 +24,4 @@ gotools
 /dotfiles/emacs.d/*.sqlite
 /dotfiles/config/gtk-3.0/colors.css
 /dotfiles/emacs.d/.cache/
+/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf

dotfiles/config/htop/htoprc

@@ -1,9 +1,10 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1 
+fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=47
 sort_direction=1
-hide_threads=0
+tree_sort_key=47
+tree_sort_direction=1
 hide_kernel_threads=1
 hide_userland_threads=1
 shadow_other_users=0
@@ -12,15 +13,25 @@ show_program_path=1
 highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=0
-tree_view=0
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+tree_view=1
+tree_view_always_by_pid=0
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_zero=0
+cpu_count_from_one=1
+show_cpu_usage=1
+show_cpu_frequency=0
 update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
+enable_mouse=1
 delay=15
-left_meters=AllCPUs Memory Swap 
-left_meter_modes=1 1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2 
+left_meters=AllCPUs Memory Swap
+left_meter_modes=1 1 1
+right_meters=Tasks LoadAverage Uptime
+right_meter_modes=2 2 2
+hide_function_bar=0

dotfiles/lib/bin/git_sync_directory.sh

@@ -1,22 +1,30 @@
 #!/usr/bin/env zsh
 
-echo "Syncing $1"
+#!/usr/bin/env bash
+
+echo "Syncing $2 at $1 with a default sync interval of $3"
+
+# Initialize the directory
+if [ ! -d  "$1" ]; then
+   base="$(dirname $1)"
+   mkdir -p "$base"
+   cd "$base"
+   git clone "$2" "$(basename $1)"
+fi
+
 cd "$1"
 
-counter=0
 while true; do
-	changedFile=$(inotifywait ./ -r -e modify,move,create,delete --format "%w%f" --exclude '\.git' -t 60 2>/dev/null)
+	changedFile=$(
+		inotifywait ./ -r -e modify,move,create,delete \
+			--format "%w%f" --exclude '\.git' -t $3 2>/dev/null
+	)
 	if [ -z "$changedFile" ]
 	then
-		counter=$((counter+1))
-		if [ $counter -gt 4 ]; then
-			git-sync
-			counter=0
-		else
-			git-sync > /dev/null
-		fi
+		echo "Syncing due to timeout"
+		git-sync -n -s
 	else
 		echo "Syncing for: $changedFile"
-		{ git check-ignore "$changedFile" > /dev/null; } || git-sync
+		{ git check-ignore "$changedFile" > /dev/null; } || git-sync -n -s
 	fi
 done

dotfiles/lib/login/exports.sh

@@ -24,8 +24,6 @@ dircolors_file="$HOME/.dircolors"
 
 [ ! -z "$SHELL" ] && test -r $dircolors_files  && eval "$(dircolors $dircolors_file)" && eval $(dircolors)
 
-export GO15VENDOREXPERIMENT=1
-
 if [[ $TERM == "dumb" ]]; then
     export PS1='$ '
 fi

nixos/base.nix

@@ -32,6 +32,7 @@
   environment.etc."ipsec.secrets".text = ''
     include ipsec.d/ipsec.nm-l2tp.secrets
   '';
+
   networking.networkmanager = {
     enable = true;
     enableStrongSwan = true;

nixos/essential.nix

@@ -18,6 +18,7 @@ in
   environment.systemPackages = with pkgs; [
     python-with-my-packages
 
+    alacritty
     emacs
     firefox
     vlc
@@ -74,6 +75,8 @@ in
     gitFull
     htop
     ncdu
+    lsof
+    tzupdate
     rcm
     ripgrep
     silver-searcher

nixos/flake.lock

@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1626168714,
-        "narHash": "sha256-LivElv4aPfojh8HxJy6VAmDAf7zA40S7jGGSV7+wLvg=",
+        "lastModified": 1626317009,
+        "narHash": "sha256-rx+U8lQM+gu072VQsa63DEHtR4IVQ1zA/Fg4CpDUsVc=",
         "owner": "IvanMalison",
         "repo": "home-manager",
-        "rev": "557c159dfaf17eff3bd55ad6e8433bf59f40fab0",
+        "rev": "bc44222fe944712ba4e5065119f77eeb540937e3",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1626063113,
-        "narHash": "sha256-a05n5l8lqUF/Jlr66SKf01WXtmNPaQGLur3dTVhu/PI=",
+        "lastModified": 1626311920,
+        "narHash": "sha256-6kZKVvYEbsYioboSgLZD6AKDqI6SnnurUattCWsAsmY=",
         "owner": "IvanMalison",
         "repo": "nixpkgs",
-        "rev": "61f1957543827cf21b8c1ee999495289518e9361",
+        "rev": "db3b4f84cb0aeab66cce1ab0ce8f51e7f4f864f1",
         "type": "github"
       },
       "original": {
@@ -94,7 +94,7 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=",
+        "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
         "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },
@@ -105,7 +105,7 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=",
+        "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
         "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },

nixos/home-manager.nix

@@ -4,7 +4,9 @@
     preferStatusNotifierItems = true;
     windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad";
     profileExtra = ''
+      load_xkb_map.sh
       export ROFI_SYSTEMD_TERM="alacritty -e"
+      . "$HOME/.lib/login.sh"
     '';
   };
 
@@ -41,7 +43,6 @@
 
   # notifyosd
   # skippyxd
-  # volnoti
 
   services.kdeconnect = {
     enable = true;
@@ -65,4 +66,27 @@
   };
 
   services.xsettingsd.enable = true;
+
+  services.volnoti.enable = true;
+
+  services.git-sync = {
+    enable = true;
+    repositories = [
+      {
+        name = "config";
+        path = "/home/imalison/config";
+        uri = "git@bitbucket.org:ivanmalison/config.git";
+      }
+      {
+        name = "org";
+        path = "/home/imalison/org";
+        uri = "git@bitbucket.org:ivanmalison/org.git";
+      }
+      {
+        name = "password-store";
+        path = "/home/imalison/.password-store";
+        uri = "git@github.com:IvanMalison/.password-store.git";
+      }
+    ];
+  };
 }