mastodon

flake.nix

@@ -2,9 +2,9 @@
   description = "nix configuration for my servers + other stuff";
 
   inputs = {
-    nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-24.11";
-    };
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     darwin = {
       url = "github:LnL7/nix-darwin/nix-darwin-24.11";
@@ -56,6 +56,7 @@
     nil-lsp,
     home-manager,
     nix-homebrew,
+    nixpkgs-unstable,
     ...
   } @ inputs: let
     lib = nixpkgs.lib // home-manager.lib;
@@ -74,6 +75,12 @@
           inherit system;
         });
 
+    importUnstable = system:
+      import nixpkgs-unstable {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
     deployPkgs = forEachSupportedSystem (
       {
         pkgs,
@@ -137,11 +144,12 @@
 
     # Config for my servers
     nixosConfigurations = {
-      ashokan = lib.nixosSystem {
+      ashokan = lib.nixosSystem rec {
         system = "aarch64-linux";
 
         specialArgs = {
           inherit inputs;
+          unstable = importUnstable system;
         };
 
         modules = [
@@ -160,11 +168,12 @@
           ./home/henrikvt
         ];
       };
-      barnegat = lib.nixosSystem {
+      barnegat = lib.nixosSystem rec {
         system = "x86_64-linux";
 
         specialArgs = {
           inherit inputs;
+          pkgs-unstable = importUnstable system;
         };
 
         modules = [

home/henrikvt/ghostty.txt

@@ -7,5 +7,7 @@ shell-integration = zsh
 theme = catppuccin-mocha
 window-inherit-working-directory = true
 working-directory = home
+term = xterm-256color
 keybind = cmd+r=reload_config
-term = xterm-256color
+keybind = cmd+q=quit
+keybind = cmd+w=close_surface

home/henrikvt/home.nix

@@ -32,17 +32,19 @@
       magic-wormhole
       glab
       python3
+      nyancat
+      moon-buggy
+      sl
+      cowsay
     ];
 
     shellAliases = {
       cat = "${pkgs.bat}/bin/bat -p";
-      less = "${pkgs.bat}/bin/bat --style plain";
       lzg = "${pkgs.lazygit}/bin/lazygit";
     };
 
     sessionVariables = {
       EDITOR = "nvim";
-      # VISUAL = "nvim";
     };
   };
 
@@ -94,7 +96,8 @@
         ];
       };
 
-      profileExtra = builtins.readFile ./.zprofile.zsh;
+      profileExtra = builtins.readFile ./zprofile.zsh;
+      initExtra = builtins.readFile ./zshrc.zsh;
     };
 
     # Prompt

home/henrikvt/.zprofile.zsh → home/henrikvt/zprofile.zsh

@@ -20,3 +20,14 @@ alias ptop='ceiling_divide $LINES 4; clear_rows $ceiling_result'
 alias pmid='ceiling_divide $LINES 2; clear_rows $ceiling_result'
 # Clear 3/4th
 alias pdown='ceiling_divide $((3*LINES)) 4; clear_rows $ceiling_result'
+
+# Get the git ssh url of a github repo using gh cli
+if command -v "gh" &> /dev/null; then
+  function ghurl() {
+	  gh repo view --json sshUrl --jq .sshUrl $1 | cat
+  }
+fi
+
+if command -v "rbenv" &> /dev/null; then
+	eval "$(rbenv init -)"
+fi

home/henrikvt/zshrc.zsh

@@ -0,0 +1,4 @@
+# If fnm is present (ie running `fnm` returns 0), eval it
+if command -v "fnm" &> /dev/null; then
+  eval "$(fnm env)"
+fi

machines/darwin/default.nix

@@ -41,6 +41,9 @@ in {
 
   home.henrikvt.enable = true;
 
+  # Show hidden files in Finder always
+  system.defaults.finder.AppleShowAllFiles = true;
+
   # Force the nix daemon to run
   services.nix-daemon.enable = lib.mkForce true;
 }

machines/darwin/pepacton/default.nix

@@ -16,29 +16,36 @@
       qrcp
       ninvaders
       statix
+      yt-dlp
+      wrangler
+      pipes
     ];
   };
 
-  environment.shellAliases = {
-    rebuild = "darwin-rebuild switch --flake /Users/henrikvt/Desktop/Code/projects/nixmachines#pepacton && omz reload";
-    # ghostty = "$GHOSTTY_BIN_DIR/ghostty";
-    tailscale = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
-    ytdl = "ytdlp";
-    home = "cd ~";
-    nvm = "fnm";
-  };
-
   environment = {
-    systemPath = ["\"/Users/henrikvt/Library/Application Support/JetBrains/Toolbox/scripts\"" "$GHOSTTY_BIN_DIR" "$HOME/.bun/bin"];
+    shellAliases = {
+      rebuild = "darwin-rebuild switch --flake /Users/henrikvt/Desktop/Code/projects/nixmachines#pepacton && omz reload";
+      reload = "omz reload";
+      tailscale = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
+      ytdl = "yt-dlp";
+      home = "cd ~";
+      nvm = "fnm";
+      pn = "pnpm";
+    };
+    systemPackages = with pkgs; [ncurses];
+    # systemPath = ["$JETBRAINS_BIN_DIR" "$GHOSTTY_BIN_DIR" "$HOME/.bun/bin"];
     variables = {
       EDITOR = "nvim";
       _ZO_DATA_DIR = "/Users/henrikvt/.zoxide";
       _ZO_EXCLUDE_DIRS = "$HOME:$HOME/wpilib/**/*";
-      JETBRAINS_BIN_DIR = "\"/Users/henrikvt/Library/Application Support/JetBrains/Toolbox/scripts\"";
+      JETBRAINS_BIN_DIR = "$HOME/Library/Application\ Support/JetBrains/Toolbox/scripts";
+      FNM_COREPACK_ENABLED = "true";
+      FNM_RESOLVE_ENGINES = "true";
     };
   };
 
   home-manager.users.henrikvt = {
+    home.sessionPath = ["$GHOSTTY_BIN_DIR" "$HOME/.bun/bin" "$JETBRAINS_BIN_DIR"];
     programs.git.extraConfig = {
       user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICM+1ip8IBO+sK8J7cOwEtA/ba+tTtPHUGYC/KW6mppU";
       gpg.format = "ssh";
@@ -61,10 +68,28 @@
     autoMigrate = true;
   };
 
-  networking.hostName = "pepacton";
+  networking = {
+    hostName = "pepacton";
+    search = [
+      "reindeer-porgy.ts.net"
+      "unicycl.ing"
+    ];
+    knownNetworkServices = [
+      "USB 10/100/1G/2.5G LAN"
+      "Thunderbolt Bridge"
+      "Wi-Fi"
+      "iPhone USB"
+      "Tailscale"
+      "UniFi Teleport"
+      "Mullvad"
+    ];
+  };
 
   # Enable GitHub TUI Dashboard (doesn't work on some systems)
-  home.henrikvt.ghDash = true;
+  home.henrikvt = {
+    ghDash = true;
+    ghostty = true;
+  };
 
   nixpkgs.hostPlatform = "aarch64-darwin";
   # ======================== DO NOT CHANGE THIS ========================

machines/nixos/ashokan/default.nix

@@ -54,7 +54,6 @@
     secretsDir = ../../../secrets;
     chownPodman = file: {
       inherit file;
-      owner = "mastodon";
       group = "podman";
       mode = "0400";
     };
@@ -67,21 +66,6 @@
     mastodonAREncryptionEnvVars = chownPodman "${secretsDir}/mastodonAREncryptionEnvVars.age";
   };
 
-  svcs.traefik = {
-    enable = true;
-    environmentFiles = [config.age.secrets.cfDnsApiToken.path];
-  };
-
-  svcs.mastodon = {
-    enable = true;
-    configureTraefik = true;
-    secretKeyBaseEnvFile = config.age.secrets.mastodonSecretKeyBase.path;
-    otpSecretEnvFile = config.age.secrets.mastodonOtpSecret.path;
-    vapidKeysEnvFile = config.age.secrets.mastodonVapidKeys.path;
-    smtpPasswordEnvFile = config.age.secrets.mastodonSmtpPassword.path;
-    activeRecordEncryptionEnvFile = config.age.secrets.mastodonAREncryptionEnvVars.path;
-  };
-
   # ======================== DO NOT CHANGE THIS ========================
   system.stateVersion = "23.11";
   # ======================== DO NOT CHANGE THIS ========================

machines/nixos/ashokan/services/default.nix

@@ -5,4 +5,15 @@
     enable = true;
     environmentFiles = [config.age.secrets.cfDnsApiToken.path];
   };
+
+  svcs.mastodon = {
+    enable = true;
+    configureTraefik = true;
+
+    secretKeyBaseEnvFile = config.age.secrets.mastodonSecretKeyBase.path;
+    otpSecretEnvFile = config.age.secrets.mastodonOtpSecret.path;
+    vapidKeysEnvFile = config.age.secrets.mastodonVapidKeys.path;
+    smtpPasswordEnvFile = config.age.secrets.mastodonSmtpPassword.path;
+    activeRecordEncryptionEnvFile = config.age.secrets.mastodonAREncryptionEnvVars.path;
+  };
 }