Add htop to monolith

flake.nix

@@ -2,16 +2,20 @@
   description = "Nettika's NixOS Configurations";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    shelvacu.url = "git+https://git.uninsane.org/shelvacu/nix-stuff";
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
       secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
-  in {
+    in
+    {
       nixosModules = {
         common = import ./modules/common.nix;
+        prompt = import ./modules/prompt.nix;
         server = import ./modules/server.nix;
+        zerotier = import ./modules/zerotier.nix;
       };
 
       nixosConfigurations = {
@@ -25,6 +29,11 @@
           modules = [ ./hosts/monolith ];
           specialArgs = { inherit self inputs secrets; };
         };
+        quasar = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [ ./hosts/quasar ];
+          specialArgs = { inherit self inputs secrets; };
+        };
       };
     };
 }

hosts/marauder/backup.nix

@@ -1,11 +1,5 @@
 { pkgs, config, secrets, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    restic
-    libnotify
-    backblaze-b2
-  ];
-
   systemd.services = {
     notify-backup-b2-failed = {
       description = "Notify on failed backup to B2";
@@ -20,14 +14,14 @@
       script = "notify-send -u critical \"Backup to B2 failed\" \"$(journalctl -u restic-backups-b2 -n 5 -o cat)\"";
     };
     restic-backups-b2 = {
-      onFailure = ["notify-backup-b2-failed.service"];
+      onFailure = [ "notify-backup-b2-failed.service" ];
     };
   };
 
   environment.etc = {
     "restic-env".text = ''
-      export B2_ACCOUNT_ID="${secrets.b2.accountId}"
+      B2_ACCOUNT_ID="${secrets.b2.accountId}"
-      export B2_ACCOUNT_KEY="${secrets.b2.accountKey}"
+      B2_ACCOUNT_KEY="${secrets.b2.accountKey}"
     '';
     "restic-password".text = secrets.restic.password;
   };
@@ -39,14 +33,9 @@
       repository = "b2:marauder-backup";
       passwordFile = "/etc/restic-password";
       paths = [
-        "${config.users.users.nettika.home}/Desktop"
         "${config.users.users.nettika.home}/Documents"
-        "${config.users.users.nettika.home}/Music"
+        "${config.users.users.nettika.home}/Artwork"
-        "${config.users.users.nettika.home}/Pictures"
         "${config.users.users.nettika.home}/Projects"
-        "${config.users.users.nettika.home}/Public"
-        "${config.users.users.nettika.home}/Templates"
-        "${config.users.users.nettika.home}/Videos"
       ];
       pruneOpts = [
         "--keep-daily 7"

hosts/marauder/default.nix

@@ -1,11 +1,18 @@
-{ self, pkgs, inputs, secrets, ... }:
+{ self, pkgs, inputs, ... }:
 {
   imports = [
     self.nixosModules.common
+    self.nixosModules.prompt
+    self.nixosModules.zerotier
     ./backup.nix
+    ./dev.nix
+    ./printing.nix
   ];
 
-  networking.hostName = "marauder";
+  networking = {
+    hostName = "marauder";
+    firewall.enable = false;
+  };
 
   fileSystems = {
     "/" = {
@@ -34,7 +41,7 @@
         "sd_mod"
       ];
     };
-    kernelModules = ["kvm-amd"];
+    kernelModules = [ "kvm-amd" ];
     kernelParams = [ "amd_pstate=active" ];
   };
 
@@ -44,7 +51,7 @@
     opengl = {
       enable = true;
       driSupport32Bit = true;
-      extraPackages = [pkgs.vaapiVdpau];
+      extraPackages = [ pkgs.vaapiVdpau ];
     };
     nvidia.prime = {
       offload = {
@@ -56,41 +63,40 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
+  environment = {
+    systemPackages = [
+      inputs.shelvacu.packages.x86_64-linux.sm64coopdx
+    ] ++ (with pkgs; [
       # Chat clients
       discord
+      slack
       element-desktop
       telegram-desktop
 
       # Browsers
       firefox
-
+      filezilla
-    # Coding
-    vscode
 
       # Art and 3D
       inkscape
+      gimp
+      krita
       openscad-unstable
       bambu-studio
 
       # Multimedia
       vlc
+      ffmpeg
+      (callPackage ./ffcheck.nix { })
 
-    # Productivity
+      # Misc
       obsidian
-  ];
+      intiface-central
-
+      prismlauncher
-  programs.bash = {
+      blender
-    promptInit = ''
+      mullvad-vpn
-      PS1="\[\e]0;\u@\h: \w\a\]" # window title
+      qbittorrent
-      PS1+="\n"
+    ]);
-      PS1+="\$(printf \"%*s\" \$((\$COLUMNS + 9)) \"\[\e[1;33m\]\$(git branch --show-current 2>/dev/null)\")" # git branch
-      PS1+="\[\e[1G\]" # move cursor to beginning of line
-      PS1+="💜" # prompt symbol
-      PS1+="\[\033[1;$((UID ? 32 : 31))m\]" # prompt color
-      PS1+="[\u@\h:\w]\\$"
-      PS1+="\[\033[0m\] " # reset color
-    '';
   };
 
   programs.steam = {
@@ -99,9 +105,26 @@
     dedicatedServer.openFirewall = true;
   };
 
+  programs.ssh.extraConfig = ''
+    Host quasar
+      HostName consortium.chat
+      IdentityFile ~/.ssh/LightsailDefaultKey-us-west-2.pem
+
+    Host monolith
+      HostName 10.243.210.154
+
+    Host fennbox
+      HostName 10.243.109.199
+      User fenn
+  '';
+
+  programs.nix-ld = {
+    enable = true;
+  };
+
   services.xserver = {
     enable = true;
-    videoDrivers = ["nvidia"];   
+    videoDrivers = [ "nvidia" ];
     desktopManager = {
       cinnamon.enable = true;
       xterm.enable = false;
@@ -120,8 +143,14 @@
     enable = true;
   };
 
+  services.mullvad-vpn = {
+    enable = true;
+    package = pkgs.mullvad-vpn; # Include GUI
+  };
+
+  promptEmoji = "💜";
+
   time.timeZone = "America/Los_Angeles";
 
   system.stateVersion = "24.05";
 }
-

hosts/marauder/dev.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  environment.variables = {
+    VISUAL = "code --wait";
+  };
+
+  environment.systemPackages = with pkgs; [
+    vscode
+    kotlin
+    rustup
+    pyenv
+    gcc
+    nixd
+    nixpkgs-fmt
+  ];
+
+  programs.direnv = {
+    enable = true;
+  };
+}

hosts/marauder/ffcheck.nix

@@ -0,0 +1,3 @@
+{ writeShellScriptBin, ffmpeg }: writeShellScriptBin "ffcheck" ''
+  ${ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null -
+''

hosts/marauder/printing.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    system-config-printer
+  ];
+
+  services.printing = {
+    enable = true;
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+}

hosts/monolith/default.nix

@@ -1,14 +1,17 @@
-{ self, pkgs, secrets, ... }:
+{ self, pkgs, ... }:
 {
   imports = [
     self.nixosModules.common
+    self.nixosModules.prompt
     self.nixosModules.server
+    self.nixosModules.zerotier
     ./dns.nix
   ];
 
   networking = {
     hostName = "monolith";
     hostId = "44551c32";
+    firewall.allowedTCPPorts = [ 8000 ];
   };
 
   fileSystems = {
@@ -37,6 +40,53 @@
     supportedFilesystems = [ "zfs" ];
   };
 
+  environment.systemPackages = with pkgs; [
+    rclone
+    beets
+    flac
+    screen
+    rustup
+    gcc
+    (callPackage ../marauder/ffcheck.nix { })
+    htop
+  ];
+
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  services.navidrome = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+      Address = "0.0.0.0";
+      MusicFolder = "/library/music";
+      Scanner.GroupAlbumReleases = "true";
+      ScanSchedule = "0";
+    };
+  };
+
+  systemd = {
+    services.reboot = {
+      description = "Reboot the system";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.systemd}/bin/systemctl reboot";
+      };
+    };
+    timers.reboot = {
+      description = "Reboot the system every two hours";
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnBootSec = "6h";
+        Persistent = true;
+      };
+    };
+  };
+
+  promptEmoji = "🏰";
+
   time.timeZone = "America/Los_Angeles";
 
   system.stateVersion = "24.05";

hosts/monolith/dns.nix

@@ -3,22 +3,16 @@
   systemd.services.update-dns = {
     serviceConfig.Type = "oneshot";
     description = "Update the leaf.ninja DNS records";
-    path = with pkgs; [ curl jq ];
+    path = with pkgs; [ curl ];
     script = ''
       public_ip=$(curl -s https://ifconfig.me/ip)
       endpoint="https://api.gandi.net/v5/livedns/domains/leaf.ninja/records"
-      curl -s \
+      curl \
         -X PUT \
         -H "Authorization: Bearer ${secrets.gandi.token}" \
         -H "Content-Type: application/json" \
         -d "{\"rrset_values\":[\"$public_ip\"]}" \
-        "$ENDPOINT/%2A/A" | jq
+        $endpoint/ostiary/A
-      curl -s \
-        -X PUT \
-        -H "Authorization: Bearer ${secrets.gandi.token}" \
-        -H "Content-Type: application/json" \
-        -d "{\"rrset_values\":[\"$public_ip\"]}" \
-        "$ENDPOINT/%40/A" | jq
     '';
   };
 

hosts/quasar/default.nix

@@ -0,0 +1,54 @@
+{ self, modulesPath, pkgs, config, secrets, ... }:
+{
+  imports = [
+    "${modulesPath}/virtualisation/amazon-image.nix"
+    self.nixosModules.common
+    self.nixosModules.prompt
+    self.nixosModules.server
+  ];
+
+  networking = {
+    hostName = "quasar";
+    domain = "consortium.chat";
+    firewall.allowedTCPPorts = [ 80 443 ];
+  };
+
+  services.postgresql = {
+    enable = true;
+  };
+
+  services.caddy = {
+    enable = true;
+    virtualHosts = {
+      "${config.networking.domain}".extraConfig = ''
+        reverse_proxy localhost:8008
+        header Strict-Transport-Security "max-age=63072000; includeSubDomains;"
+      '';
+      "matrix.${config.networking.domain}".extraConfig = ''
+        reverse_proxy /_matrix/* localhost:8008
+        reverse_proxy /_synapse/client/* localhost:8008
+      '';
+      "admin.${config.networking.domain}".extraConfig = ''
+        root * ${pkgs.synapse-admin}
+        file_server
+      '';
+    };
+  };
+
+  services.matrix-synapse = {
+    enable = true;
+    settings = {
+      server_name = config.networking.domain;
+      serve_server_wellknown = true;
+      registration_shared_secret = secrets.synapse."consortium.chat".registration-shared-secret;
+      macaroon_secret_key = secrets.synapse."consortium.chat".macaroon-secret-key;
+      form_secret = secrets.synapse."consortium.chat".form-secret;
+    };
+  };
+
+  promptEmoji = "🌟";
+
+  time.timeZone = "America/Los_Angeles";
+
+  system.stateVersion = "24.05";
+}

modules/common.nix

@@ -1,9 +1,11 @@
-{ pkgs, secrets, ... }:
+{ pkgs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
+    substituters = [ "https://nixcache.shelvacu.com" ];
+    trusted-public-keys = [ "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM=" ];
     trusted-users = [ "@wheel" ];
   };
 
@@ -14,6 +16,10 @@
 
   security.sudo.wheelNeedsPassword = false;
 
+  environment.variables = {
+    EDITOR = "nano";
+  };
+
   programs.git = {
     enable = true;
     lfs.enable = true;
@@ -35,11 +41,6 @@
     '';
   };
 
-  services.zerotierone = {
-    enable = true;
-    joinNetworks = secrets.zerotier.networks;
-  };
-
   environment.systemPackages = with pkgs; [
     git-crypt
     jq

modules/prompt.nix

@@ -0,0 +1,10 @@
+{ lib, config, ... }:
+{
+  options.promptEmoji = lib.mkOption {
+    type = lib.types.str;
+  };
+
+  config.programs.bash.promptInit = ''
+    PS1="\[\e]0;\u@\h: \w\a\]\n${config.promptEmoji} \[\033[1;$((UID ? 32 : 31))m\]\w \\$\[\033[0m\] "
+  '';
+}

modules/zerotier.nix

@@ -0,0 +1,7 @@
+{ secrets, ... }:
+{
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = secrets.zerotier.networks;
+  };
+}