diff --git a/flake.lock b/flake.lock
index e4bdbd0..048575d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,24 +1,5 @@
 {
   "nodes": {
-    "barcode-reader": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1636602745,
-        "narHash": "sha256-oCpDOT83cQwIz1frgZwhl+g5uzQIOvHfYglbqF7OZ5g=",
-        "owner": "mrVanDalo",
-        "repo": "barcode-reader",
-        "rev": "7ffb09892cd67186b2cb33f001bfe27e1acd6e5d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrVanDalo",
-        "repo": "barcode-reader",
-        "type": "github"
-      }
-    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -183,26 +164,6 @@
       }
     },
     "disko_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717032306,
-        "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
-    "disko_3": {
       "inputs": {
         "nixpkgs": [
           "nixos-anywhere",
@@ -224,28 +185,6 @@
         "type": "github"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-fmt",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1637475807,
-        "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -262,22 +201,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -320,21 +243,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1634851050,
-        "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -349,22 +257,7 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1637014545,
-        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -382,7 +275,7 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_3": {
       "locked": {
         "lastModified": 1631561581,
         "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@@ -397,22 +290,7 @@
         "type": "github"
       }
     },
-    "flake-utils_6": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_7": {
+    "flake-utils_4": {
       "inputs": {
         "systems": "systems_2"
       },
@@ -463,47 +341,9 @@
         "type": "github"
       }
     },
-    "grocy-scanner": {
-      "inputs": {
-        "barcode-reader": "barcode-reader",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1637608833,
-        "narHash": "sha256-mjbNI3AKFA8O/kjUlzP0t3e9oI5SmU5/49aHPcwssZw=",
-        "owner": "mrVanDalo",
-        "repo": "grocy-scanner",
-        "rev": "7ae77b0881a993e0a91623341327f15e40564e48",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrVanDalo",
-        "repo": "grocy-scanner",
-        "type": "github"
-      }
-    },
-    "haskellTar": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1657046996,
-        "narHash": "sha256-gDxF+1L0sMzwogCCTGtiYnPgZMIg5fTWV8d062F7iR0=",
-        "owner": "haskell",
-        "repo": "tar",
-        "rev": "dbf8c995153c8a80450724d9f94cf33403740c80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "repo": "tar",
-        "rev": "dbf8c995153c8a80450724d9f94cf33403740c80",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1717052710,
@@ -563,8 +403,8 @@
     },
     "landingpage": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1709213960,
@@ -580,24 +420,6 @@
         "type": "github"
       }
     },
-    "nixinate": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1708891350,
-        "narHash": "sha256-VOQrKK7Df/IVuNki+NshVuGkTa/Tw0GigPjWcZff6kk=",
-        "owner": "matthewcroughan",
-        "repo": "nixinate",
-        "rev": "452f33c60df5b72ad0858f5f2cf224bdf1f17746",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matthewcroughan",
-        "repo": "nixinate",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1712450863,
@@ -631,11 +453,11 @@
     },
     "nixos-anywhere": {
       "inputs": {
-        "disko": "disko_3",
+        "disko": "disko_2",
         "flake-parts": "flake-parts_2",
         "nixos-images": "nixos-images_2",
         "nixos-stable": "nixos-stable",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_3",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
@@ -754,41 +576,20 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1636416043,
-        "narHash": "sha256-Esz9X97OeAsNoJUVuqlCu2LDWcyLE24huUonhOY3JGw=",
-        "owner": "nixos",
+        "lastModified": 1716509168,
+        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db6044d5debaff0749420c3553d1b89fc6c5c5f8",
+        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-fmt": {
-      "inputs": {
-        "fenix": "fenix",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710146057,
-        "narHash": "sha256-GLZNcoQT3AWGg1ZINKOgHcD1/LgDStI6hZbfsisjOgM=",
-        "owner": "nix-community",
-        "repo": "nixpkgs-fmt",
-        "rev": "f048515c9a98d7e2e4b034ec77641acc8a58098d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs-fmt",
-        "type": "github"
-      }
-    },
     "nixpkgs-legacy_2105": {
       "locked": {
         "lastModified": 1659914493,
@@ -885,39 +686,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1716968199,
-        "narHash": "sha256-vYbYTeWF4YMKYu6lHLQH+OagpubB9aZ1+V630h6qJr4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c598bbfe379934e8f379bc474cc1914a7c34fbdc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1716509168,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1645527175,
         "narHash": "sha256-WeewqaO48sCctiN+iwgZZEJRU29Si7vHHoLCINAvuk8=",
@@ -932,23 +701,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1702310776,
         "narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=",
@@ -964,7 +717,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1716769173,
         "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
@@ -980,7 +733,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1701263465,
         "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
@@ -996,7 +749,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1632855891,
         "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=",
@@ -1010,7 +763,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1716651315,
         "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=",
@@ -1026,10 +779,26 @@
         "type": "github"
       }
     },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1716968199,
+        "narHash": "sha256-vYbYTeWF4YMKYu6lHLQH+OagpubB9aZ1+V630h6qJr4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c598bbfe379934e8f379bc474cc1914a7c34fbdc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "overviewer": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_7",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_5",
         "pandoc_template": "pandoc_template"
       },
       "locked": {
@@ -1085,8 +854,8 @@
     },
     "polygon-art": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_8"
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1688766095,
@@ -1136,18 +905,14 @@
     "root": {
       "inputs": {
         "clan-core": "clan-core",
-        "disko": "disko_2",
         "flake-parts": "flake-parts",
-        "grocy-scanner": "grocy-scanner",
         "home-manager": "home-manager",
         "home-manager-utils": "home-manager-utils",
         "kmonad": "kmonad",
         "landingpage": "landingpage",
-        "nixinate": "nixinate",
         "nixos-anywhere": "nixos-anywhere",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_6",
-        "nixpkgs-fmt": "nixpkgs-fmt",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
         "nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
         "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
@@ -1159,30 +924,12 @@
         "private_assets": "private_assets",
         "retiolum": "retiolum",
         "secrets": "secrets",
-        "smoke": "smoke",
         "sops-nix": "sops-nix_2",
         "srvos": "srvos",
         "stylix": "stylix",
         "taskshell": "taskshell"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1637439871,
-        "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=",
-        "owner": "rust-analyzer",
-        "repo": "rust-analyzer",
-        "rev": "4566414789310acb2617543f4b50beab4bb48e06",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-analyzer",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "secrets": {
       "flake": false,
       "locked": {
@@ -1200,29 +947,6 @@
         "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-secrets.git"
       }
     },
-    "smoke": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_6",
-        "haskellTar": "haskellTar",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1716644244,
-        "narHash": "sha256-lfEK+c21gRJVr5PHvv5GkNhhXlB9HSxsAUfFHyeWUs4=",
-        "owner": "SamirTalwar",
-        "repo": "smoke",
-        "rev": "cbaa95cb293df39422d19588b05f16b98623eed5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SamirTalwar",
-        "repo": "smoke",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1249,7 +973,7 @@
     },
     "sops-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
@@ -1268,7 +992,7 @@
     },
     "srvos": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1717058062,
@@ -1293,7 +1017,7 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
@@ -1348,7 +1072,7 @@
     },
     "taskshell": {
       "inputs": {
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index a8dee09..cae495c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,50 +30,49 @@
       url = "github:nix-community/home-manager";
       #inputs.nixpkgs.follows = "nixpkgs";
     };
+
     polygon-art = {
       url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
     };
+
     sops-nix.url = "github:Mic92/sops-nix";
+
     home-manager-utils = {
       url = "github:mrvandalo/home-manager-utils";
       inputs.home-manager.follows = "home-manager";
     };
-    nixpkgs-fmt = {
-      url = "github:nix-community/nixpkgs-fmt";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    grocy-scanner = {
-      url = "github:mrVanDalo/grocy-scanner";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
     permown = {
       url = "github:mrVanDalo/module.permown";
       #url = "git+file:///home/palo/dev/nixos/permown";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     private_assets = {
       #url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
       url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
       flake = true;
     };
+
     retiolum = {
       url = "github:Mic92/retiolum";
       #url = "git+file:///home/palo/dev/nixos/retiolum";
     };
+
     srvos.url = "github:nix-community/srvos";
+
     landingpage = {
       #url = "git+file:///home/palo/dev/landingpage";
       url = "github:mrVanDalo/landingpage";
     };
+
+    # todo: mabye use https://github.com/jtroo/kanata instead
+    # fixme: kmonad crashes every now and than and the keyboard is not usable anymore.
     kmonad = {
       url = "github:kmonad/kmonad?dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixinate.url = "github:matthewcroughan/nixinate";
+
     stylix = {
       #url = "github:danth/stylix?ref=35cab8eb76c1d3672b2b290a64f357847c30d090";
       #url = "github:danth/stylix/release-23.11";
@@ -81,32 +80,34 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    smoke = {
-      url = github:SamirTalwar/smoke;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
+    # smoke test framwork to trigger tests (enable if I  want to use it for real)
+    #smoke = {
+    #  url = github:SamirTalwar/smoke;
+    #  inputs.nixpkgs.follows = "nixpkgs";
+    #};
+
+    # had to override it to  remove colors
     taskshell = {
       url = "github:mrvandalo/taskshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # my  own tool
     overviewer.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/overviewer.git?ref=main";
   };
 
   outputs =
     inputs@{ self
     , clan-core
-    , disko
     , flake-parts
-    , grocy-scanner
     , home-manager
     , home-manager-utils
     , kmonad
     , landingpage
-    , nixinate
     , nixos-anywhere
     , nixos-hardware
     , nixpkgs
-    , nixpkgs-fmt
     , nixpkgs-legacy_2105
     , nixpkgs-legacy_2205
     , nixpkgs-legacy_2211
@@ -118,7 +119,6 @@
     , private_assets
     , retiolum
     , secrets
-    , smoke
     , sops-nix
     , srvos
     , stylix
@@ -159,7 +159,6 @@
               kmonad = kmonad.packages.${system}.kmonad;
               tasksh = taskshell.packages.${system}.tasksh;
               overviewer = overviewer.packages.${system}.overviewer;
-              smoke = smoke.packages.${system}.default;
             })
             (import ./nixos/pkgs)
           ];
@@ -182,11 +181,14 @@
           nixpkgs.hostPlatform = meta.system;
           clanCore.facts.secretStore = "password-store";
 
-
           imports = modules ++ defaultModules ++ [
             ./nixos/machines/${name}/configuration.nix
-            (sopsModule name)
-            {
+            # sops configuration
+            ({ lib, ... }: {
+              sops.defaultSopsFile = lib.mkForce "${secrets}/secrets/${name}.yaml";
+            })
+            # clan core configuration
+            ({ pkgs, ... }: {
               imports = [
                 # this magically adds all my machines in the zero tier network
                 # and makes the controller accept them.
@@ -196,17 +198,20 @@
                 inputs.clan-core.clanModules.static-hosts
               ];
               clan.static-hosts.topLevelDomain = "gummybear";
-            }
+              environment.systemPackages = [
+                clan-core.packages.${pkgs.system}.clan-cli
+              ];
+            })
           ];
         };
 
       defaultModules = [
+        # make flake inputs accessiable in NixOS
         {
-          # todo : find out what this is?
-          # make flake inputs accessiable in NixOS
           _module.args.self = self;
           _module.args.inputs = self.inputs;
         }
+        # configure nix
         ({ pkgs, ... }:
           {
             nix.settings.substituters = [ "https://cache.nixos.org/" ];
@@ -215,26 +220,20 @@
             # no channesl needed this way
             nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
           })
+        # some modules I always use
+        permown.nixosModules.permown
+        kmonad.nixosModules.default
+        # some default things I always want
         ({ pkgs, ... }: {
           boot.tmp.useTmpfs = lib.mkDefault true;
           environment.systemPackages = [
-            nixpkgs-fmt.defaultPackage.${pkgs.system}
-            clan-core.packages.${pkgs.system}.clan-cli
-          ];
-          imports = [
-            permown.nixosModules.permown
-            #disko.nixosModules.disko
-            kmonad.nixosModules.default
-            grocy-scanner.nixosModule
+            pkgs.nixpkgs-fmt
           ];
         })
       ];
 
-      homeManagerModules = { pkgs, config, ... }: {
-        imports = [
-          home-manager.nixosModules.home-manager
-          stylix.nixosModules.stylix
-        ];
+      stylixModules = { pkgs, config, ... }: {
+        imports = [ stylix.nixosModules.stylix ];
         stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
         stylix.image = ./nixos/assets/wallpaper.png;
         stylix.fonts = {
@@ -256,7 +255,17 @@
           };
           sizes.popups = 15;
         };
+        # todo: remove this if not needed anymore
+        #home-manager.sharedModules = [
+        #  { stylix.targets.bemenu.enable = false; }
+        #];
 
+      };
+
+      homeManagerModules = { pkgs, config, ... }: {
+        imports = [
+          home-manager.nixosModules.home-manager
+        ];
         home-manager.extraSpecialArgs = {
           inherit private_assets;
           assets = ./nixos/assets;
@@ -265,17 +274,8 @@
         home-manager.useUserPackages = true;
         home-manager.backupFileExtension = "backup";
         home-manager.sharedModules = [
-          #doom-emacs-nix.hmModule
           home-manager-utils.hmModule
-          { stylix.targets.bemenu.enable = false; }
         ];
-        home-manager.users.mainUser.home.stateVersion = "22.11";
-        home-manager.users.root.home.stateVersion = "22.11";
-      };
-
-      sopsModule = name: { lib, ... }: {
-        #imports = [ sops-nix.nixosModules.sops ];
-        sops.defaultSopsFile = lib.mkForce "${secrets}/secrets/${name}.yaml";
       };
 
     in
@@ -304,6 +304,7 @@
             modules = [
               nixos-hardware.nixosModules.lenovo-thinkpad-x220
               homeManagerModules
+              stylixModules
               { home-manager.users.mainUser.gui.enable = true; }
               {
                 home-manager.users.mainUser = import ./nixos/homes/tina;
@@ -311,14 +312,11 @@
               }
               # todo : strange overrides, this should be an option kinda an be changed on another level (the homes/<name> folders or something)
               ({ lib, ... }: {
-                home-manager.users = {
-                  mainUser = {
+                home-manager.sharedModules = [
+                  {
                     programs.atuin.enable = lib.mkForce false;
-                  };
-                  root = {
-                    programs.atuin.enable = lib.mkForce false;
-                  };
-                };
+                  }
+                ];
               })
               {
                 clanCore.machineDescription = "LaLaptop";
@@ -334,6 +332,7 @@
               retiolum.nixosModules.retiolum
               private_assets.nixosModules.cream
               homeManagerModules
+              stylixModules
               { home-manager.users.mainUser.gui.enable = true; }
               {
                 home-manager.users.mainUser = import ./nixos/homes/palo;
@@ -351,7 +350,7 @@
             modules = [
               nixos-hardware.nixosModules.framework-13th-gen-intel
               homeManagerModules
-
+              stylixModules
               { home-manager.users.mainUser.gui.enable = true; }
               {
                 home-manager.users.mainUser = import ./nixos/homes/palo;
@@ -368,6 +367,7 @@
             host = "chungus.private";
             modules = [
               homeManagerModules
+              stylixModules
               retiolum.nixosModules.retiolum
               private_assets.nixosModules.chungus
               #srvos.nixosModules.server
@@ -394,6 +394,7 @@
                 };
               }
               homeManagerModules
+              stylixModules
               srvos.nixosModules.hardware-hetzner-online-intel
               srvos.nixosModules.server
               srvos.nixosModules.mixins-terminfo
diff --git a/nixos/homes/palo/default.nix b/nixos/homes/palo/default.nix
index 6afddc6..6cbfd6d 100644
--- a/nixos/homes/palo/default.nix
+++ b/nixos/homes/palo/default.nix
@@ -2,7 +2,6 @@
 
   imports = [
     ../common
-    #./doom-emacs.nix
     ./editor.nix
     ./git.nix
     ./gpg.nix
diff --git a/nixos/homes/root/default.nix b/nixos/homes/root/default.nix
index ddd8947..bf5a89b 100644
--- a/nixos/homes/root/default.nix
+++ b/nixos/homes/root/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
     ../common
-    # todo : this must be optional, sometimes I don't want to compile the whole emacs eco system.
-    #../palo/doom-emacs.nix
   ];
   gui.enable = false;
 
+  home.stateVersion = "22.11";
+
 }
diff --git a/nixos/homes/tina/default.nix b/nixos/homes/tina/default.nix
index 817b5f0..132b4f1 100644
--- a/nixos/homes/tina/default.nix
+++ b/nixos/homes/tina/default.nix
@@ -7,4 +7,6 @@
     ./packages.nix
     ./kde.nix
   ];
+
+  home.stateVersion = "22.11";
 }