Add support for aarch64-linux

README.md

@@ -21,6 +21,7 @@ Further the dotfiles include:
 ## Usage
 The dotfiles contain configuration for:
 - [harmonium](./hosts/harmonium) - Personal NixOS laptop setup
+- [organ](./hosts/organ) - ARM-based server
 - [nyckelharpa](./hosts/nyckelharpa) - Work MacOS setup
 - home-manager configurations for both systems
 

flake.nix

@@ -30,15 +30,16 @@
     formatter = lib.formatter;
 
     # home-manager configurations defined in a flake can be enabled by running
-    # $ nix run home-manager/master -- switch --flake dotfiles
-    # or in case of username mismatch, e.g. jakub vs jakub-macos
     # $ nix run home-manager/master -- switch --flake "dotfiles#jakub-macos"
-    homeConfigurations.jakub = lib.linuxHome ./users/jakub-linux;
+    homeConfigurations.jakub-x86 = lib.linuxHome-x86 ./users/jakub-linux;
+    homeConfigurations.jakub-arm64 = lib.linuxHome-arm64 ./users/jakub-linux;
     homeConfigurations.jakub-macos = lib.macosHome ./users/jakub-macos;
 
     # nixos configurations defined in a flake can be enabled by running
-    # $ nixos-rebuild switch --flake dotfiles
-    nixosConfigurations.harmonium = lib.nixosSystem ./hosts/harmonium;
+    # $ nixos-rebuild switch --flake dotfiles#harmonium
+    # $ nixos-rebuild switch --flake dotfiles#organ
+    nixosConfigurations.harmonium = lib.nixosSystem-x86 ./hosts/harmonium;
+    nixosConfigurations.organ = lib.nixosSystem-arm64 ./hosts/organ;
 
     # nix-darwin configurations defined in a flake can be enabled by running
     # $ darwin-rebuild build --flake dotfiles#nyckelharpa

hosts/organ/README.md

@@ -0,0 +1,6 @@
+![Organ](./organ.jpg)
+
+<sub><sup>Photo by <a href="https://unsplash.com/@haozlife?utm_content=creditCopyText&utm_medium=referral&utm_source=unsplash">Hao Zhang</a> on <a href="https://unsplash.com/photos/man-playing-brown-musical-instrument-dFpDCSECapg?utm_content=creditCopyText&utm_medium=referral&utm_source=unsplash">Unsplash</a></sup></sub>
+
+# organ
+ARM-based server running on Hetzner cloud

hosts/organ/default.nix

@@ -0,0 +1 @@
+{...}: {}

lib/README.md

@@ -3,8 +3,9 @@
 Library has two important functions:
 
 1. Moves configuration boilerplate out of the main `flake.nix` by providing
-   `macosHome`, `linuxHome`, `macosSystem` and `nixosSystem` functions to
-   define home-manager and system configurations
+   `macosHome`, `linuxHome-x86`, `linuxHome-arm64`, `macosSystem`,
+   `nixosSystem-x86` and `nixosSystem-arm64` functions to define home-manager
+   and system configurations
 
 2. Autoloads [`config.nix`](../config.nix) for all these configurations
 

lib/default.nix

@@ -8,10 +8,12 @@ inputs @ {
   self,
   ...
 }: let
-  linuxSystem = "x86_64-linux";
   macosSystem = "aarch64-darwin";
-  linuxPkgs = makePkgs linuxSystem;
+  linuxSystem-x86 = "x86_64-linux";
+  linuxSystem-arm64 = "aarch64-linux";
   macosPkgs = makePkgs macosSystem;
+  linuxPkgs-x86 = makePkgs linuxSystem-x86;
+  linuxPkgs-arm64 = makePkgs linuxSystem-arm64;
 
   makePkgs = system:
     import nixpkgs {
@@ -34,11 +36,11 @@ inputs @ {
       }
       // extra);
 
-  makeHome = pkgs: path:
+  makeHome = system: pkgs: path:
     home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
       extraSpecialArgs = {
-        inherit inputs;
+        inherit inputs system;
         # Make sure to keep library extensions from home-manager
         lib = makeLib pkgs home-manager.lib;
       };
@@ -57,12 +59,15 @@ inputs @ {
 in {
   formatter = {
     ${macosSystem} = macosPkgs.alejandra;
-    ${linuxSystem} = linuxPkgs.alejandra;
+    ${linuxSystem-x86} = linuxPkgs-x86.alejandra;
+    ${linuxSystem-arm64} = linuxPkgs-arm64.alejandra;
   };
 
-  macosHome = makeHome macosPkgs;
-  linuxHome = makeHome linuxPkgs;
+  macosHome = makeHome macosSystem macosPkgs;
+  linuxHome-x86 = makeHome linuxSystem-x86 linuxPkgs-x86;
+  linuxHome-arm64 = makeHome linuxSystem-arm64 linuxPkgs-arm64;
 
   macosSystem = makeSystem (nix-darwin.lib.darwinSystem) macosSystem macosPkgs;
-  nixosSystem = makeSystem (nixpkgs.lib.nixosSystem) linuxSystem linuxPkgs;
+  nixosSystem-x86 = makeSystem (nixpkgs.lib.nixosSystem) linuxSystem-x86 linuxPkgs-x86;
+  nixosSystem-arm64 = makeSystem (nixpkgs.lib.nixosSystem) linuxSystem-arm64 linuxPkgs-arm64;
 }

modules/common/aliases.nix

@@ -3,9 +3,26 @@
 {
   config,
   lib,
+  system,
   ...
 }: {
-  home.shellAliases = {
+  home.shellAliases = let
+    username = config.home.username;
+    dotfiles =
+      {
+        "x86_64-linux" = "/persist/dotfiles";
+        "aarch64-linux" = "/persist/dotfiles";
+        "aarch64-darwin" = "$HOME/.config/dotfiles";
+      }
+      .${system};
+    homeConfig =
+      {
+        "x86_64-linux" = "${username}-x86";
+        "aarch64-linux" = "${username}-arm64";
+        "aarch64-darwin" = "${username}-macos";
+      }
+      .${system};
+  in {
     cd = lib.mkIf config.programs.zoxide.enable "z";
     ls = "ls --color=tty";
     chx = "chmod +x";
@@ -30,5 +47,8 @@
 
     # Utils
     benchzsh = "hyperfine 'zsh -i -c exit' --warmup 1";
+    hm = "home-manager --flake \"${dotfiles}#${homeConfig}\"";
+    dots = "$EDITOR \"${dotfiles}\"";
+    zd = "cd \"${dotfiles}\"";
   };
 }

users/jakub-linux/default.nix

@@ -3,6 +3,7 @@
   inputs,
   lib,
   pkgs,
+  system,
   ...
 }: {
   imports = lib._.moduleImports [

users/jakub-macos/default.nix

@@ -36,9 +36,7 @@
     };
 
     shellAliases = {
-      hm = "home-manager --flake \"$HOME/.config/dotfiles#jakub-macos\"";
       dw = "darwin-rebuild --flake \"$HOME/.config/dotfiles\"";
-      dots = "$EDITOR ~/.config/dotfiles";
 
       # Work
       linear = "git checkout main && git pull && git checkout -b $(pbpaste)";