flake.lock

@@ -548,11 +548,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1776893458,
+        "lastModified": 1776522593,
-        "narHash": "sha256-/oT77s8xQGAr80mWV+zcRixZMOqU6AJBloC97xuGY34=",
+        "narHash": "sha256-HqQ8XQGv14TehBKL1IXF28wvbC6OCoHWvTOI/IdCA/8=",
         "ref": "refs/heads/main",
-        "rev": "2c370afe8ed3ea4c198f65246a32a8809c246fd6",
+        "rev": "d821500db7375ebb346aaa17c80dc25214165584",
-        "revCount": 524,
+        "revCount": 479,
         "type": "git",
         "url": "https://git.berlin.ccc.de/vinzenz/nova-shell"
       },

nixosConfigurations/damocles/android-dev.nix

@@ -1,43 +0,0 @@
-{ pkgs, ... }:
-let
-  androidComposition = pkgs.androidenv.composeAndroidPackages {
-    buildToolsVersions = [ "36.1.0" ];
-    platformVersions = [ "35" ];
-    includeNDK = false;
-    includeEmulator = false;
-    includeSystemImages = false;
-  };
-  androidSdk = androidComposition.androidsdk;
-in
-{
-  nixpkgs.config.android_sdk.accept_license = true;
-
-  allowedUnfreePackages = [
-    "android-sdk-cmdline-tools"
-    "android-sdk-platform-tools"
-    "android-sdk-tools"
-    "android-sdk-build-tools"
-    "android-sdk-platforms"
-
-    # wtf
-    "platform-tools"
-    "tools"
-    "build-tools"
-    "cmdline-tools"
-    "platforms"
-    "cmake" # android sdk repackage
-  ];
-
-  environment.systemPackages = with pkgs; [
-    androidSdk
-    gradle
-    kotlin
-    jdk21
-  ];
-
-  environment.variables = {
-    ANDROID_HOME = "${androidSdk}/libexec/android-sdk";
-    ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
-    JAVA_HOME = "${pkgs.jdk21}";
-  };
-}

nixosConfigurations/damocles/default.nix

@@ -1,7 +1,5 @@
 { pkgs, self, ... }:
 {
-  imports = [ ./android-dev.nix ];
-
   nixpkgs.overlays = [ self.overlays.unstable-packages ];
 
   boot.isContainer = true;
@@ -23,12 +21,4 @@
   };
 
   security.sudo.wheelNeedsPassword = false;
-
-  programs.nix-ld = {
-    enable = true;
-    libraries = with pkgs; [
-      stdenv.cc.cc.lib
-      zlib
-    ];
-  };
 }

nixosModules/global-settings-desktop.nix

@@ -35,25 +35,21 @@
       extraSpecialArgs = specialArgs;
       useGlobalPkgs = true;
       useUserPackages = true;
-      users = home-manager-users;
-      sharedModules = [
-        { home.stateVersion = "22.11"; }
-        # keep-sorted start
-        self.homeModules.git
-        self.homeModules.gnome-extensions
-        self.homeModules.nano
-        self.homeModules.templates
-        self.homeModules.zsh-basics
-        # keep-sorted end
-      ];
     };
 
     time.timeZone = "Europe/Berlin";
 
-    # on desktops, keep the device useable interactively during expensive builds
+    home-manager.sharedModules = [
-    nix = {
+      { home.stateVersion = "22.11"; }
-      daemonCPUSchedPolicy = "idle";
+      # keep-sorted start
-      daemonIOSchedClass = "idle";
+      self.homeModules.git
-    };
+      self.homeModules.gnome-extensions
+      self.homeModules.nano
+      self.homeModules.templates
+      self.homeModules.zsh-basics
+      # keep-sorted end
+    ];
+
+    home-manager.users = home-manager-users;
   };
 }