Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles

flake.lock

@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714377222,
-        "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=",
+        "lastModified": 1714679908,
+        "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49",
+        "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1714270547,
-        "narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=",
+        "lastModified": 1714534265,
+        "narHash": "sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0=",
         "owner": "ryantm",
         "repo": "nixpkgs-update",
-        "rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7",
+        "rev": "f368b504aa1d766c835c3a89ec24e86077a97272",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1714635257,
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {

home-manager/modules/packages.nix

@@ -54,8 +54,6 @@ in
         (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
         (callPackage ./../pkgs/extract.nix { inherit pkgs; })
         nixpkgs-fmt
-        toolbox
-        distrobox
         ddev
         act
         mkcert
@@ -79,6 +77,14 @@ in
         nodePackages.pnpm
         npm-check-updates
       ] ++ (
+        if (
+          !config.machine.isGeneric
+        ) then [
+          toolbox
+          distrobox
+        ] else
+          [ ]
+      ) ++ (
         if (
           config.machine.isGraphical
         ) then [