refactor: lib, flake.nix

hosts/android/magicant/default.nix

@@ -0,0 +1,44 @@
+{ pkgs, ... }: {
+  environment = {
+    packages = with pkgs; [
+      vim
+      git
+      openssh
+      # toybox
+      dig
+      man
+      gnupg
+      curl
+      deadnix
+      statix
+      nixpgks-fmt
+      nvd
+    ];
+
+    etcBackupExtension = ".bak";
+    extraOutputsToInstall = [
+      "doc"
+      "info"
+      "devdoc"
+    ];
+    motd = null;
+  };
+
+  android-integration = {
+    termux-open.enable = true;
+    xdg-open.enable = true;
+    termux-open-url.enable = true;
+    termux-reload-settings.enable = true;
+    termux-setup-storage.enable = true;
+  };
+
+  # Backup etc files instead of failing to activate generation if a file already exists in /etc
+
+  # Read the changelog before changing this value
+  system.stateVersion = "23.05";
+
+  # Set up nix for flakes
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+}

hosts/home-manager/default/default.nix

@@ -1,7 +1,7 @@
 { self, inputs, outputs, config, ... }:
 {
 
-  imports = builtins.attrValues outputs.homeManagerModules;
+  imports = outputs.homeModules ++ outputs.mixedModules ++ (builtins.attrValues outputs.homeManagerModules);
 
   nixpkgs = {
     overlays = [ outputs.overlays.default ];
@@ -27,29 +27,6 @@
     isLaptop = true;
     isNixos = false;
     wallpaper = self + /wallpaper/surfacewp.png;
-    temperatureHwmon = {
-      isAbsolutePath = true;
-      path = "/sys/devices/platform/thinkpad_hwmon/hwmon/";
-      input-filename = "temp1_input";
-    };
-    monitors = {
-      main = {
-        name = "California Institute of Technology 0x1407 Unknown";
-        mode = "1920x1080"; # TEMPLATE
-        scale = "1";
-        position = "2560,0";
-        workspace = "2:二";
-        output = "eDP-1";
-      };
-    };
-    inputs = {
-      "1:1:AT_Translated_Set_2_keyboard" = {
-        xkb_layout = "us";
-        xkb_options = "grp:win_space_toggle";
-        xkb_variant = "altgr-intl";
-      };
-    };
-    keybindings = { };
   };
 
 }

hosts/home/default/default.nix

@@ -0,0 +1,55 @@
+{ self, inputs, outputs, config, ... }:
+{
+
+  imports = builtins.attrValues outputs.homeManagerModules;
+
+  nixpkgs = {
+    overlays = [ outputs.overlays.default ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  services.xcape = {
+    enable = true;
+    mapExpression = {
+      Control_L = "Escape";
+    };
+  };
+
+  programs.zsh.initExtra = "
+  export GPG_TTY=\"$(tty)\"
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  gpgconf --launch gpg-agent
+        ";
+
+  swarselsystems = {
+    isLaptop = true;
+    isNixos = false;
+    wallpaper = self + /wallpaper/surfacewp.png;
+    temperatureHwmon = {
+      isAbsolutePath = true;
+      path = "/sys/devices/platform/thinkpad_hwmon/hwmon/";
+      input-filename = "temp1_input";
+    };
+    monitors = {
+      main = {
+        name = "California Institute of Technology 0x1407 Unknown";
+        mode = "1920x1080"; # TEMPLATE
+        scale = "1";
+        position = "2560,0";
+        workspace = "2:二";
+        output = "eDP-1";
+      };
+    };
+    inputs = {
+      "1:1:AT_Translated_Set_2_keyboard" = {
+        xkb_layout = "us";
+        xkb_options = "grp:win_space_toggle";
+        xkb_variant = "altgr-intl";
+      };
+    };
+    keybindings = { };
+  };
+
+}