feat: fork config to enable alice migration

alice/default.nix

@@ -0,0 +1,28 @@
+_: let
+  password = "$y$j9T$g/a4KaQ5VitWI9ZtAh9i3/$wjejk5W8LMc0gaVgw69kwrKLqBgZ95ekaOl/GaTOZVC";
+in {
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  # Don't change!
+  system.stateVersion = "23.05";
+  home-manager.users.buffet.home.stateVersion = "23.05";
+
+  users.users.buffet.hashedPassword = password;
+  users.users.root.hashedPassword = password;
+
+  networking.hostName = "alice";
+
+  services.tlp = {
+    enable = true;
+
+    settings = {
+      START_CHARGE_THRESH_BAT0 = 75;
+      STOP_CHARGE_THRESH_BAT0 = 80;
+
+      START_CHARGE_THRESH_BAT1 = 75;
+      STOP_CHARGE_THRESH_BAT1 = 80;
+    };
+  };
+}

common.nix

@@ -1,19 +1,21 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  agenix,
-  home-manager,
-  nur,
-  ...
-}: let
-  password = "$6$FHwMlUwmRdAsPqS4$4XND0L0EEVf2Mhc/tvo6y3ZLIrMTOlsIZrG3w69EeXvtVZhdeNyoDOkPNIe.GBB8.PrchuUKDacqbvcvyuPkt0";
-in {
   imports = [
-    agenix.nixosModules.default
+    ./programs/bash.nix
-    home-manager.nixosModule
+    ./programs/borg.nix
-    nur.nixosModules.nur
+    ./programs/cargo.nix
-    ./impermanence.nix
+    ./programs/firefox.nix
-    ./programs
+    ./programs/foot.nix
-    ./system.nix
+    ./programs/git.nix
+    ./programs/gpg.nix
+    ./programs/ime.nix
+    ./programs/lsd.nix
+    ./programs/mako.nix
+    ./programs/newsboat.nix
+    ./programs/nvim.nix
+    ./programs/pipewire.nix
+    ./programs/sbcl.nix
+    ./programs/sioyek.nix
+    ./programs/sway.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -22,12 +24,10 @@ in {
   ];
 
   fonts.fonts = with pkgs; [
-    (nerdfonts.override {fonts = ["Go-Mono"];})
     apl386
     dejavu_fonts
     noto-fonts
     noto-fonts-cjk
-    source-han-serif
   ];
 
   home-manager.users.buffet = {
@@ -105,11 +105,8 @@ in {
       "uinput"
       "wheel"
     ];
-    hashedPassword = password;
   };
 
-  users.users.root.hashedPassword = password;
-
   systemd.coredump.enable = true;
 
   hardware = {
@@ -133,7 +130,6 @@ in {
       enableNotifications = true;
     };
 
-    tlp.enable = true;
     upower.enable = true;
     systembus-notify.enable = true;
   };

fanya/default.nix

@@ -0,0 +1,18 @@
+_: let
+  password = "$6$FHwMlUwmRdAsPqS4$4XND0L0EEVf2Mhc/tvo6y3ZLIrMTOlsIZrG3w69EeXvtVZhdeNyoDOkPNIe.GBB8.PrchuUKDacqbvcvyuPkt0";
+in {
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  # Don't change!
+  system.stateVersion = "22.05";
+  home-manager.users.buffet.home.stateVersion = "22.05";
+
+  users.users.buffet.hashedPassword = password;
+  users.users.root.hashedPassword = password;
+
+  networking.hostName = "fanya";
+
+  services.tlp.enable = true;
+}

flake.nix

@@ -68,24 +68,37 @@
   };
 
   outputs = {
-    nixpkgs,
+    agenix,
+    home-manager,
+    nur,
     nixpkgs-unstable,
+    nixpkgs,
     ...
   } @ args: {
-    nixosConfigurations.fanya = let
+    nixosConfigurations = let
-      system = "x86_64-linux";
+      mkSystem = system: module:
-      overlay-unstable = final: prev: {
-        unstable = nixpkgs-unstable.legacyPackages.${prev.system};
-      };
-    in
         nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = args;
-        modules = [
+          modules = let
-          ./fanya.nix
+            overlay-unstable = final: prev: {
+              unstable = nixpkgs-unstable.legacyPackages.${prev.system};
+            };
+          in [
+            module
 
+            agenix.nixosModules.default
+            home-manager.nixosModule
+            nur.nixosModules.nur
+            ./common.nix
+            ./impermanence.nix
+            ./system.nix
             (_: {nixpkgs.overlays = [(import ./overlay args) overlay-unstable];})
           ];
         };
+    in {
+      alice = mkSystem "x86_64-linux" ./alice;
+      fanya = mkSystem "x86_64-linux" ./fanya;
+    };
   };
 }

programs/default.nix

@@ -1,20 +0,0 @@
-_: {
-  imports = [
-    ./bash.nix
-    ./borg.nix
-    ./cargo.nix
-    ./firefox.nix
-    ./foot.nix
-    ./git.nix
-    ./gpg.nix
-    ./ime.nix
-    ./lsd.nix
-    ./mako.nix
-    ./newsboat.nix
-    ./nvim.nix
-    ./pipewire.nix
-    ./sbcl.nix
-    ./sioyek.nix
-    ./sway.nix
-  ];
-}

system.nix

@@ -3,18 +3,9 @@
   nixpkgs-unstable,
   ...
 }: {
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # Don't change!
-  system.stateVersion = "22.05";
-  home-manager.users.buffet.home.stateVersion = "22.05";
-
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  #boot.tmpOnTmpfs = true;
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
@@ -27,12 +18,6 @@
   };
 
   networking = {
-    useDHCP = false;
-    interfaces = {
-      enp0s25.useDHCP = true;
-      wlp3s0.useDHCP = true;
-    };
-    hostName = "fanya";
     networkmanager.enable = true;
     nameservers = ["1.1.1.1"];
   };

theme.nix

@@ -2,7 +2,6 @@
   light = false;
 
   font = {
-    #family = "GoMono Nerd Font";
     family = "APL386 Unicode";
     size = 7;
   };