diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..8392d15
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..29963da
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.direnv/
diff --git a/README.md b/README.md
index 068c72e..7916918 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ home-manager switch --flake .#laptop --extra-experimental-features "nix-command
 
 Configure the following:
 
-* synthing
+* syncthing
 * gpg
 
 In case ssh does not work work do
diff --git a/flake.nix b/flake.nix
index 9fb542e..c4b002a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
     formatter.${system} = pkgs.alejandra;
 
     commonModules = [
-      ./common
+      ./systems/common
 
       {
         _module.args.wallpaper = wallpaper.packages.${system}.default;
@@ -85,7 +85,7 @@
 
         modules =
           [
-            ./pc
+            ./systems/pc
           ]
           ++ self.commonModules;
       };
@@ -95,10 +95,16 @@
 
         modules =
           [
-            ./laptop
+            ./systems/laptop
           ]
           ++ self.commonModules;
       };
     };
+
+    devShells.${system}.default = pkgs.mkShellNoCC {
+      packages = [
+        pkgs.dconf2nix
+      ];
+    };
   };
 }
diff --git a/common/bash.nix b/systems/common/bash.nix
similarity index 100%
rename from common/bash.nix
rename to systems/common/bash.nix
diff --git a/common/default.nix b/systems/common/default.nix
similarity index 100%
rename from common/default.nix
rename to systems/common/default.nix
diff --git a/common/direnv.nix b/systems/common/direnv.nix
similarity index 100%
rename from common/direnv.nix
rename to systems/common/direnv.nix
diff --git a/common/firefox.nix b/systems/common/firefox.nix
similarity index 100%
rename from common/firefox.nix
rename to systems/common/firefox.nix
diff --git a/common/fonts.nix b/systems/common/fonts.nix
similarity index 100%
rename from common/fonts.nix
rename to systems/common/fonts.nix
diff --git a/common/git.nix b/systems/common/git.nix
similarity index 100%
rename from common/git.nix
rename to systems/common/git.nix
diff --git a/common/gnome.nix b/systems/common/gnome.nix
similarity index 86%
rename from common/gnome.nix
rename to systems/common/gnome.nix
index 0204ea0..8621a9c 100644
--- a/common/gnome.nix
+++ b/systems/common/gnome.nix
@@ -99,5 +99,14 @@
     "org/gnome/nautilus/preferences" = {
       show-image-thumbnails = "always";
     };
+
+    "org/gnome/Weather" = {
+      locations = "[<(uint32 2, <('Vienna', 'LOWW', true, [(0.83979426423570236, 0.2891428852314914)], [(0.84124869946126679, 0.28565222672750273)])>)>]";
+    };
+
+    "org/gnome/shell/weather" = {
+      automatic-location = true;
+      locations = "[<(uint32 2, <('Vienna', 'LOWW', true, [(0.83979426423570236, 0.2891428852314914)], [(0.84124869946126679, 0.28565222672750273)])>)>]";
+    };
   };
 }
diff --git a/common/gpg.nix b/systems/common/gpg.nix
similarity index 100%
rename from common/gpg.nix
rename to systems/common/gpg.nix
diff --git a/common/mpv.nix b/systems/common/mpv.nix
similarity index 100%
rename from common/mpv.nix
rename to systems/common/mpv.nix
diff --git a/common/nvim/cmp.lua b/systems/common/nvim/cmp.lua
similarity index 100%
rename from common/nvim/cmp.lua
rename to systems/common/nvim/cmp.lua
diff --git a/common/nvim/colors.lua b/systems/common/nvim/colors.lua
similarity index 100%
rename from common/nvim/colors.lua
rename to systems/common/nvim/colors.lua
diff --git a/common/nvim/default.nix b/systems/common/nvim/default.nix
similarity index 100%
rename from common/nvim/default.nix
rename to systems/common/nvim/default.nix
diff --git a/common/nvim/fugitive.lua b/systems/common/nvim/fugitive.lua
similarity index 100%
rename from common/nvim/fugitive.lua
rename to systems/common/nvim/fugitive.lua
diff --git a/common/nvim/keybinds.lua b/systems/common/nvim/keybinds.lua
similarity index 100%
rename from common/nvim/keybinds.lua
rename to systems/common/nvim/keybinds.lua
diff --git a/common/nvim/lspconfig.lua b/systems/common/nvim/lspconfig.lua
similarity index 100%
rename from common/nvim/lspconfig.lua
rename to systems/common/nvim/lspconfig.lua
diff --git a/common/nvim/telescope.lua b/systems/common/nvim/telescope.lua
similarity index 100%
rename from common/nvim/telescope.lua
rename to systems/common/nvim/telescope.lua
diff --git a/common/nvim/treesitter.lua b/systems/common/nvim/treesitter.lua
similarity index 100%
rename from common/nvim/treesitter.lua
rename to systems/common/nvim/treesitter.lua
diff --git a/common/nvim/undotree.lua b/systems/common/nvim/undotree.lua
similarity index 100%
rename from common/nvim/undotree.lua
rename to systems/common/nvim/undotree.lua
diff --git a/common/packages.nix b/systems/common/packages.nix
similarity index 100%
rename from common/packages.nix
rename to systems/common/packages.nix
diff --git a/common/thunderbird.nix b/systems/common/thunderbird.nix
similarity index 100%
rename from common/thunderbird.nix
rename to systems/common/thunderbird.nix
diff --git a/common/vscode.nix b/systems/common/vscode.nix
similarity index 100%
rename from common/vscode.nix
rename to systems/common/vscode.nix
diff --git a/laptop/default.nix b/systems/laptop/default.nix
similarity index 100%
rename from laptop/default.nix
rename to systems/laptop/default.nix
diff --git a/pc/default.nix b/systems/pc/default.nix
similarity index 100%
rename from pc/default.nix
rename to systems/pc/default.nix