diff --git a/common/cli-packages.nix b/common/cli-packages.nix
index 36a5d99..8fac2f3 100644
--- a/common/cli-packages.nix
+++ b/common/cli-packages.nix
@@ -11,6 +11,7 @@
     htop
     killall
     ncdu
+    nixpkgs-fmt
     ranger
     tree
     vim
diff --git a/common/common.nix b/common/common.nix
index a812f73..8aacf8a 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -29,6 +29,7 @@
     enableRedistributableFirmware = true;
   };
 
+  programs.mosh.enable = true;
   services = {
     openssh.enable = true;
   };
@@ -59,6 +60,7 @@
     dates = "weekly";
     options = "--delete-older-than 7d";
   };
+  nix.autoOptimiseStore = true;
 
   environment.shellAliases = {
     nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
@@ -76,7 +78,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.05"; # Did you read the comment?
+  system.stateVersion = import ../version.nix;
 
 }
 
diff --git a/common/desktop.nix b/common/desktop.nix
index cdba40e..7643fba 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -6,7 +6,7 @@
 
 {
   imports = [
-      ./common.nix
+    ./common.nix
   ];
 
   networking = {
@@ -46,19 +46,22 @@
   hardware.steam-hardware.enable = true;
 
   # enable lockscreen
-
   programs.xss-lock = {
     enable = true;
     lockerCommand = "i3lock -c 000000";
   };
 
+  programs.droidcam.enable = true;
+
   environment.variables = {
     ZWEILI_ENVIRONMENT = "desktop";
   };
 
   environment.systemPackages = with pkgs; [
     arc-theme
+    calibre
     celluloid
+    digikam
     evince
     firefox
     gimp
@@ -70,7 +73,10 @@
     networkmanager-openvpn
     nitrogen
     pavucontrol
+    rapid-photo-downloader
+    remmina
     rofi
+    shotwell
     source-code-pro
     terminator
   ];
diff --git a/home-manager/common.nix b/home-manager/common.nix
index de16c6b..1333545 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -14,7 +14,7 @@
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "21.05";
+  home.stateVersion = import ../version.nix;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index af915e7..45c7f95 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
   imports = [
     ./common.nix
diff --git a/home-manager/ubuntu.nix b/home-manager/ubuntu.nix
index c04bcd3..16db02c 100644
--- a/home-manager/ubuntu.nix
+++ b/home-manager/ubuntu.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
   imports = [
     ./common.nix
diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix
index 4f965ae..1b14963 100644
--- a/home-manager/work-wsl.nix
+++ b/home-manager/work-wsl.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
   imports = [
     ./common.nix
diff --git a/version.nix b/version.nix
new file mode 100644
index 0000000..4fbd8a3
--- /dev/null
+++ b/version.nix
@@ -0,0 +1 @@
+"21.05"