Add kagami-air-m1

home/common-linux.nix

@@ -6,14 +6,18 @@ with lib; {
   ];
   config = (mkIf (strings.hasSuffix "linux" pkgs.system) {
     home.packages = with pkgs; [
-      vivaldi
       psmisc # killall and friends
 
-      mpv # for anki
-      pkgs.unstable.anki-bin
-
       pinentry-gnome
-    ];
+    ] ++ (
+    	if pkgs.system == "x86-64_linux"
+    	then [
+          vivaldi
+          mpv # for anki
+          pkgs.unstable.anki-bin
+    	]
+    	else []
+    );
 
     ## Gnome-keyring
     services.gnome-keyring = {

home/kakoune/kak.nix

@@ -3,10 +3,32 @@
 let
   kakounePkg =
     pkgs.kakoune.override {
-      kakoune = pkgs.kakoune-unwrapped.overrideAttrs (oldAttrs: {
+      kakoune = with lib; pkgs.unstable.gcc11Stdenv.mkDerivation rec {
+        pname = "kakoune-unwrapped";
         version = "r${builtins.substring 0 6 pkgs.sources.kakoune.rev}";
         src = pkgs.sources.kakoune;
-      });
+        makeFlags = ["debug=no" "PREFIX=${placeholder "out"}"];
+
+        preConfigure = ''
+          export version="v${version}";
+        '';
+
+        enableParallelBuilding = true;
+
+        doInstallCheck = true;
+        installCheckPhase = ''
+          $out/bin/kak -ui json -e "kill 0"
+        '';
+
+        postInstall = ''
+          # make share/kak/autoload a directory
+          cd "$out/share/kak"
+          autoload_target=$(readlink autoload)
+          rm autoload
+          mkdir autoload
+          ln -s --relative "$autoload_target" autoload
+        '';
+      };
     };
 
   kak-lsp = pkgs.libs.crane.buildPackage {

home/macbook-nixos.nix

@@ -0,0 +1,72 @@
+{ pkgs, config, lib, ... }:
+
+{
+  imports = [
+    # Common configuration
+    ./common.nix
+    # We use our own firefox
+    # ./firefox.nix
+    # osu!
+    # ./osu.nix
+  ];
+
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "nki";
+  home.homeDirectory = "/home/nki";
+
+  # More packages
+  home.packages = (with pkgs; [
+    # CLI stuff
+    python
+    zip
+    # TeX
+    texlive.combined.scheme-full
+
+    # Java & sbt
+    openjdk11
+    sbt
+  ]);
+
+  # Graphical set up
+  # linux.graphical.type = "wayland";
+  # linux.graphical.wallpaper = ./images/wallpaper_0.png;
+  # Enable sway
+  # programs.my-sway.enable = true;
+  # programs.my-sway.fontSize = 14.0;
+  # programs.my-sway.terminal = "${config.programs.kitty.package}/bin/kitty";
+  # Keyboard support
+  # wayland.windowManager.sway.config = {
+  #   input."1278:34:HHKB-Hybrid_3_Keyboard".xkb_layout = "jp";
+  #   input."1:1:AT_Translated_Set_2_keyboard" = {
+  #     xkb_options = "ctrl:swapcaps";
+  #     xkb_layout = "us";
+  #   };
+  # };
+  # Kitty
+  nki.programs.kitty = {
+    enable = true;
+    fontSize = 16;
+  };
+
+  # Multiple screen setup
+  # services.kanshi = {
+    # enable = true;
+    # profiles.undocked.outputs = [{ criteria = "LVDS-1"; }];
+    # profiles.docked-hdmi.outputs = [
+      # { criteria = "LVDS-1"; status = "disable"; }
+      # { criteria = "HDMI-A-1"; }
+    # ];
+  # };
+
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  home.stateVersion = "21.05";
+}
+