Start refactoring

- remove emacs
- remove inputs
- trying to speed up evaluation
- update inputs

hosts/default.nix

@@ -80,7 +80,7 @@
         in
           builtins.getFlake "github:NixOS/nixpkgs/${rev}";
         extraHmModules = [
-          inputs.ccrEmacs.hmModules.default
+          # inputs.ccrEmacs.hmModules.default
         ];
         vpn = {
           ip = "10.100.0.5";
@@ -107,7 +107,7 @@
           inputs.lix-module.nixosModules.default
         ];
         extraHmModules = [
-          inputs.ccrEmacs.hmModules.default
+          # inputs.ccrEmacs.hmModules.default
           "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
         ];
         secrets = {
@@ -132,8 +132,9 @@
           # inputs.hercules-ci-agent.nixosModules.agent-service
         ];
         extraHmModules = [
-          inputs.ccrEmacs.hmModules.default
+          # inputs.ccrEmacs.hmModules.default
           "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
+          inputs.vscode-server.nixosModules.home
         ];
         secrets = {
           "picard-wireguard-private-key" = {};
@@ -159,7 +160,6 @@
         };
         extraModules = with inputs; [
           disko.nixosModules.disko
-          arion.nixosModules.arion
           impermanence.nixosModules.impermanence
           # lix-module.nixosModules.default
           # inputs.hercules-ci-agent.nixosModules.agent-service;

hosts/deltaflyer/default.nix

@@ -1,9 +1,7 @@
 {
   fleetModules,
-  config,
   lib,
   pkgs,
-  fleetFlake,
   ...
 }: {
   imports =

hosts/module.nix

@@ -28,7 +28,7 @@ in {
           nixpkgs = lib.mkOption {
             description = "Used nixpkgs";
             type = lib.types.anything;
-            default = inputs.nixpkgsUnstable;
+            default = inputs.nixpkgs;
           };
           extraModules = lib.mkOption {
             description = "Extra NixOS modules";
@@ -64,7 +64,7 @@ in {
           nixpkgs = lib.mkOption {
             description = "Used nixpkgs";
             type = lib.types.anything;
-            default = inputs.nixpkgsUnstable;
+            default = inputs.nixpkgs;
           };
           extraModules = lib.mkOption {
             description = "Extra NixOS modules";
@@ -101,7 +101,7 @@ in {
           nixpkgs = lib.mkOption {
             description = "Used nixpkgs";
             type = lib.types.anything;
-            default = inputs.nixpkgsUnstable;
+            default = inputs.nixpkgs;
           };
           homeManager = lib.mkOption {
             description = "Used home-manager";
@@ -174,11 +174,7 @@ in {
             default = "ccr";
           };
         };
-        config.overlays = with inputs;
-          [
-            nur.overlay
-          ]
-          ++ cfg.overlays;
+        config.overlays = with inputs; cfg.overlays;
       }));
       default = {};
     };
@@ -260,7 +256,6 @@ in {
             fleetHmModules = builtins.map (moduleName: "${self.outPath}/hmModules/${moduleName}");
             fleetFlake = self;
             vpn = cfg.vpnExtra // (lib.mapAttrs (_: host: host.vpn) cfg.hosts);
-            inherit (flakePartsArgs.config.allSystems.${config.system}.allModuleArgs.config._module.args) inputs';
           };
         };
     };
@@ -291,7 +286,7 @@ in {
       internal = true;
       default = hostname: config:
         inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-          pkgs = inputs.nixpkgsUnstable.legacyPackages.aarch64-linux;
+          pkgs = inputs.nixpkgs.legacyPackages.aarch64-linux;
           modules = [
             ({
               lib,

hosts/mothership/default.nix

@@ -71,13 +71,6 @@
 
   environment.systemPackages = with pkgs; [waypipe];
 
-  home-manager.users.ccr.gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
-    };
-  };
   programs.dconf.enable = true;
 
   programs.mosh.enable = true;

hosts/picard/default.nix

@@ -29,7 +29,6 @@
       "printing"
       "pam"
       "wireguard-client"
-      "restic"
       "binfmt"
       "greetd"
       # "syncthing"
@@ -37,7 +36,7 @@
       "forgejo-runners"
       "teamviewer"
       # "macos-ventura"
-      # "sunshine"
+      "sunshine"
       "mount-rock5b"
       "adb"
       "guix"
@@ -58,7 +57,8 @@
       "shell"
       "element"
       "zmkbatx"
-      "emacs"
+      "tremotesf"
+      # "emacs"
       "firefox"
       "gpg"
       "mpv"
@@ -83,6 +83,7 @@
       "obs-studio"
       "calibre"
       "reinstall-magisk-on-lineage"
+      "vscode-server"
     ];
     extraGroups = [];
     backupPaths = [];
@@ -104,7 +105,18 @@
     "i2c-dev" # needed?
   ];
 
-  boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
+  # https://github.com/NixOS/nixpkgs/issues/328909
+  boot.extraModulePackages = [
+    (config.boot.kernelPackages.ddcci-driver.overrideAttrs (old: {
+      patches = [];
+      src = pkgs.fetchFromGitLab {
+        owner = "${old.pname}-linux";
+        repo = "${old.pname}-linux";
+        rev = "7853cbfc28bc62e87db79f612568b25315397dd0";
+        hash = "sha256-QImfvYzMqyrRGyrS6I7ERYmteaTijd8ZRnC6+bA9OyM=";
+      };
+    }))
+  ];
 
   systemd.services.ddcci = {
     serviceConfig.Type = "oneshot";

hosts/sisko/default.nix

@@ -37,17 +37,18 @@
       "garmin-collector"
       "restic"
       # "immich"
+      "atuin"
     ]
     ++ [
       ./disko.nix
     ];
 
   # boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8;
-  # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_testing;
-  boot.kernelPackages = let
-    pkgs = fleetFlake.inputs.nixpkgsUnstableForSisko.legacyPackages.aarch64-linux;
-  in
-    pkgs.linuxPackagesFor pkgs.linux_testing;
+  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_10;
+  # boot.kernelPackages = let
+  #   pkgs = fleetFlake.inputs.nixpkgsForSisko.legacyPackages.aarch64-linux;
+  # in
+  #   pkgs.linuxPackagesFor pkgs.linux_testing;
   # boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_9.override {
   #   argsOverride = {
   #     src = pkgs.fetchFromGitLab {