Tweaks and leftover bits

nixos/overlays/default.nix

@@ -0,0 +1,12 @@
+# The following is taken from: https://nixos-and-flakes.thiscute.world/nixpkgs/overlays
+
+# import all nix files in the current folder, and execute them with args as parameters
+# The return value is a list of all execution results, which is the list of overlays
+
+args:
+# execute and import all overlay files in the current directory with the given args
+builtins.map
+  (f: (import (./. + "/${f}") args))  # execute and import the overlay file
+  (builtins.filter          # find all overlay files in the current directory
+    (f: f != "default.nix")
+    (builtins.attrNames (builtins.readDir ./.)))

nixos/users/tdpeuter/default.nix

@@ -25,7 +25,8 @@ in {
     users.users.tdpeuter = {
       description = "Tibo De Peuter";
       isNormalUser = true;
-      extraGroups = [ 
+      extraGroups = config.sisyphus.users.wantedGroups ++ [
+        config.users.groups.input.name
         config.users.groups.keys.name
         config.users.groups.networkmanager.name
         config.users.groups.wheel.name
@@ -36,8 +37,7 @@ in {
 
     fonts.fonts = with pkgs; [
       corefonts             # Calibri for Uni
-      font-awesome_5        # Dependency of Vifm config
+      font-awesome          # Dependency of Vifm & zsh config
-      font-awesome          # Dependency of zsh
       letter                # Personal font
       noto-fonts-cjk        # Dependency of Zellij config
       noto-fonts            # Dependency of Zellij config
@@ -83,6 +83,9 @@ in {
           zsh
           zsh-autosuggestions
           zsh-syntax-highlighting
+
+          # SMB
+          cifs-utils psmisc
         ]) ++ (with pkgs-unstable; [
           mpv
           obsidian

nixos/users/tdpeuter/dotfiles.nix

@@ -70,7 +70,7 @@ in {
             source = ../../../stow/zellij/.config/zellij;
           };
           ".oh-my-zsh" = {
-            enable = (builtins.elem pkgs.zsh installedPkgs);
+            enable = true;
             source = "${pkgs.oh-my-zsh}/share/oh-my-zsh";
             recursive = true;
           };

stow/vifm/.config/vifm/vifmrc

@@ -257,7 +257,8 @@ filextype {*.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm},<image/*>
         \ shotwell,
         \ gwenview &,
 fileviewer {*.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm},<image/*>
-         \ chafa,
+         \ kitten icat %f,
+         \ chafa %f,
          \ identify %f,
 
 " OpenRaster