diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix
index b2bbe5f3..5564ac9d 100644
--- a/configuration/hosts/samhain/configuration.nix
+++ b/configuration/hosts/samhain/configuration.nix
@@ -11,7 +11,7 @@
     ../../profiles/network
     ../../profiles/yubikey
   ];
-
+  
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -20,6 +20,40 @@
 
   networking.useDHCP = false;
   networking.interfaces.enp34s0.useDHCP = true;
+  networking.firewall.allowPing = true;
+  networking.firewall.allowedTCPPorts = [ 445 139 9091 ];
+  networking.firewall.allowedUDPPorts = [ 137 138 ];
+
+  services.transmission.enable = true;
+  
+  services.samba = {
+    enable = true;
+    securityType = "user";
+    extraConfig = ''
+      workgroup = WORKGROUP
+      server string = smbnix
+      netbios name = smbnix
+      security = user 
+      #use sendfile = yes
+      #max protocol = smb2
+      hosts allow = 192.168.1. localhost
+      hosts deny = 0.0.0.0/0
+      guest account = nobody
+      map to guest = bad user
+    '';
+    shares = {
+      public = {
+        path = "/var/lib/transmission/Downloads";
+        browseable = "yes";
+        "read only" = "no";
+        "guest ok" = "yes";
+        "create mask" = "0644";
+        "directory mask" = "0755";
+        "force user" = "transmission";
+        "force group" = "transmission";
+      };
+    };
+  };
 
   system.stateVersion = "20.09";
 
diff --git a/configuration/profiles/common/default.nix b/configuration/profiles/common/default.nix
index 0169f555..8aa434f3 100644
--- a/configuration/profiles/common/default.nix
+++ b/configuration/profiles/common/default.nix
@@ -41,7 +41,6 @@ in {
     smartmontools
     lm_sensors
     htop
-    neovim
     ripgrep
     git
     wget
diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix
index 80ce401f..1d21c88b 100644
--- a/configuration/profiles/desktop/default.nix
+++ b/configuration/profiles/desktop/default.nix
@@ -13,6 +13,7 @@ in {
       pkgs.mumble
       unstable.pkgs.syncplay
       unstable.pkgs.youtube-dl
+      pkgs.transmission-gtk
       pkgs.jdk11
       pkgs.lm_sensors
       pkgs.discord
@@ -20,8 +21,8 @@ in {
       pkgs.dino
       pkgs.nitrogen
       pkgs.terminator
-      pkgs.kdeconnect
       pkgs.appimage-run
+      pkgs.scrot
       pkgs.gimp
       pkgs.vscode
       pkgs.neofetch
@@ -34,6 +35,11 @@ in {
       '';
     };
 
+    services.kdeconnect = {
+      enable = true;
+      indicator = true;
+    };
+
     gtk = {
       enable = true;
       iconTheme = {
@@ -50,6 +56,15 @@ in {
   fonts.fontconfig.enable = true;
   fonts.fonts = [ pkgs.nerdfonts pkgs.corefonts ];
 
+  networking.firewall = {
+    allowedTCPPortRanges = [
+      { from = 1714; to = 1764; }
+    ];
+    allowedUDPPortRanges = [
+      { from = 1714; to = 1764; }
+    ];
+  };
+
   sound.enable = true;
   hardware.pulseaudio.enable = true;
   hardware.opengl.enable = true;