diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index 5df44b3..0497302 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -56,10 +56,15 @@
     LC_TIME = systemSettings.locale;
   };
 
+  users.groups.${userSettings.username} = {
+    name = userSettings.username;
+    gid = 1000;
+  };
+
   users.users.${userSettings.username} = {
     isNormalUser = true;
     description = userSettings.name;
-    extraGroups = [ "networkmanager" "wheel" "input" "dialout" ];
+    extraGroups = [ "${userSettings.username}" "networkmanager" "wheel" "input" "dialout" ];
     packages = [];
     uid = 1000;
   };
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 4187d44..268cea6 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -42,6 +42,13 @@
   # Picom Compositor
   services.picom.enable = true;
 
+  # Night Light
+  services.redshift = {
+    enable = true;
+    package = pkgs.redshift;
+    executable = "/bin/redshift-gtk";
+  };
+
   environment.systemPackages = with pkgs; [
     # X11 Utilities
     arandr
diff --git a/system/utilities/default.nix b/system/utilities/default.nix
index 6824588..b3d109d 100644
--- a/system/utilities/default.nix
+++ b/system/utilities/default.nix
@@ -8,5 +8,6 @@
     ./gaming.nix
     ./backups.nix
     ./user-shell.nix
+    ./samba.nix
   ];
 }
diff --git a/system/utilities/miscellaneous.nix b/system/utilities/miscellaneous.nix
index bc4edf7..b0f1fa0 100644
--- a/system/utilities/miscellaneous.nix
+++ b/system/utilities/miscellaneous.nix
@@ -12,5 +12,7 @@
     home-manager
     tree
     btop
+    openssh
+    gh
   ];
 }
diff --git a/system/utilities/samba.nix b/system/utilities/samba.nix
new file mode 100644
index 0000000..da83a07
--- /dev/null
+++ b/system/utilities/samba.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, userSettings, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    cifs-utils
+    lxqt.lxqt-policykit # provides a default authentification client for policykit
+  ];
+
+  fileSystems."/mnt/fileserver" = {
+    device = "//192.168.12.5/fileserver";
+    fsType = "cifs";
+    options = let
+      # this line prevents hanging on network split
+      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+
+    in [
+      "${automount_opts},
+      credentials=/etc/nixos/smb-secrets,
+      ${config.users.users.${userSettings.username}.uid},
+      gid=${config.users.groups.${userSettings.username}.gid}"
+    ];
+    # Make sure to create `/etc/nixos/smb-secrets` with following content
+    # where domain can be optional
+    # username=<USERNAME>
+    # domain=<DOMAIN>
+    # password=<PASSWORD>
+  };
+
+  # Samba discovery of machines and shares
+  networking.firewall.extraCommands = ''iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns'';
+
+  # GVFS
+  services.gvfs.enable = true;
+}