wip

test-vm: Add WHIB backend
2024-12-01 13:39:11 +01:00 · 2024-12-01 10:22:45 +01:00 · 2024-12-01 10:22:05 +01:00 · 2024-12-01 10:20:11 +01:00 · 2024-12-01 10:20:11 +01:00 · 2024-12-01 10:20:11 +01:00
10 changed files with 110 additions and 82 deletions
--- a/config-manager/default.nix
+++ b/config-manager/default.nix
@@ -33,7 +33,7 @@ let

                update() {
                  echo -e "\033[0;31mUPDATING FLAKE\033[0m"
-                  nix flake update ${flakePath}
+                  nix flake update --flake ${flakePath}
                }

                switch() {
--- a/flake.lock
+++ b/flake.lock
@@ -47,18 +47,17 @@
    },
    "emacs-overlay": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1730513067,
-        "narHash": "sha256-0MHc5yR4qmQK4O8MzraisT3gnv907fn813Qb2J134CU=",
+        "lastModified": 1732784553,
+        "narHash": "sha256-S3PiqgTS8ST07ihFDL2cPExoxHcd9I8ITecpgMz+s4M=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "6afb2183cef03dcfce47c3bf22b2d44ded54ace0",
+        "rev": "fb81e75180369a888db920df8f6097fbf2f603e9",
        "type": "github"
      },
      "original": {
@@ -67,24 +66,6 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -113,11 +94,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730490306,
-        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
+        "lastModified": 1732793095,
+        "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
+        "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
        "type": "github"
      },
      "original": {
@@ -133,11 +114,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729224425,
-        "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
+        "lastModified": 1730743354,
+        "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
+        "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2",
        "type": "github"
      },
      "original": {
@@ -153,11 +134,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728371783,
-        "narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=",
+        "lastModified": 1732782112,
+        "narHash": "sha256-8rxzWGOVyijmE2ojWJxPEWqtUQ7i/lA5TvLoklwI4qw=",
        "owner": "viperML",
        "repo": "nh",
-        "rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d",
+        "rev": "24293d624556d32bd502c440b352e4fef4eeab6d",
        "type": "github"
      },
      "original": {
@@ -183,11 +164,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1730537918,
-        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
+        "lastModified": 1732483221,
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
        "type": "github"
      },
      "original": {
@@ -199,11 +180,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "lastModified": 1732521221,
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
        "type": "github"
      },
      "original": {
@@ -215,11 +196,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1730327045,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "lastModified": 1732632634,
+        "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30",
        "type": "github"
      },
      "original": {
@@ -279,21 +260,6 @@
        "type": "github"
      }
    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "whib-backend": {
      "inputs": {
        "nixpkgs": [
@@ -301,8 +267,8 @@
        ]
      },
      "locked": {
-        "lastModified": 1731143140,
-        "narHash": "sha256-pLxBnIgcAJxvbMglXbeSI5/yxSR0RfFgNW7eQ7oNFR8=",
+        "lastModified": 1733056232,
+        "narHash": "sha256-TlGxaIEzV+4dithjWT4xtl/yOgayHIqZqj7okKufF8E=",
        "path": "/home/alex/code/own/whib",
        "type": "path"
      },
--- a/hosts/pinwheel/modules/emacs/config.org
+++ b/hosts/pinwheel/modules/emacs/config.org
@@ -604,7 +604,8 @@ Setup prefix for keybindings.
 #+BEGIN_SRC emacs-lisp
  (setq
   js-indent-level 2
-   js2-basic-offset 2)
+   js2-basic-offset 2
+   indent-tabs-mode nil)

  (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode))
 #+END_SRC
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -42,6 +42,13 @@ in
          workspace = 9, monitor:eDP-1
          workspace = 10, monitor:eDP-1

+          workspace = w[tv1], gapsout:0, gapsin:0
+          workspace = f[1], gapsout:0, gapsin:0
+          windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
+          windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
+          windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
+          windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
+
          exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
        '';

@@ -84,7 +91,6 @@ in

          dwindle = {
            force_split = 2;
-            no_gaps_when_only = 1;
          };

          bind =
--- a/hosts/pinwheel/modules/vm/default.nix
+++ b/hosts/pinwheel/modules/vm/default.nix
@@ -17,7 +17,10 @@ in
  config = lib.mkIf enabled {
    virtualisation = {
      spiceUSBRedirection.enable = true; # Allow redirecting USB to the VM
-      libvirtd.enable = true;
+      libvirtd = {
+        enable = true;
+        qemu.vhostUserPackages = [ pkgs.virtiofsd ];
+      };
    };

    users.users.alex = {
--- a/hosts/pinwheel/modules/work/default.nix
+++ b/hosts/pinwheel/modules/work/default.nix
@@ -16,24 +16,39 @@ in
      GITHUB_TOKEN = "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-github-token.path})";
    };

-    home.packages = [
-      # (pkgs.callPackage ./pants.nix { inherit (pkgs) system; })
-      (pkgs.callPackage ./syb-cli.nix { })
+    home.packages =
+      let
+        intellij = (
+          pkgs.jetbrains.idea-ultimate.overrideAttrs (
+            final: prev: {
+              version = "2024.2.4";
+              src = pkgs.fetchurl {
+                url = "https://download.jetbrains.com/idea/ideaIU-${final.version}.tar.gz";
+                sha256 = "8411fda793a20356a4982e4f18f6691839d8a471e2081ab6d8cc78b3f8b02532";
+              };
+            }
+          )
+        );
+      in
+      [
+        # (pkgs.callPackage ./pants.nix { inherit (pkgs) system; })
+        # (pkgs.callPackage ./syb-cli.nix { })

-      (pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea-ultimate [ "ideavim" ])
-      (pkgs.google-cloud-sdk.withExtraComponents [
-        pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
-      ])
+        (pkgs.jetbrains.plugins.addPlugins intellij [ "ideavim" ])

-      pkgs.graphite-cli
+        (pkgs.google-cloud-sdk.withExtraComponents [
+          pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
+        ])

-      pkgs.postman
-      pkgs.grpcurl
+        pkgs.graphite-cli

-      # for `radio`
-      pkgs.go-mockery
-      pkgs.golangci-lint
-    ];
+        pkgs.postman
+        pkgs.grpcurl
+
+        # for `radio`
+        pkgs.go-mockery
+        pkgs.golangci-lint
+      ];

    programs.go = lib.mkIf goEnabled {
      goPrivate = [ "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-go-private.path})" ];
--- a/hosts/test-vm/configuration.nix
+++ b/hosts/test-vm/configuration.nix
@@ -36,6 +36,8 @@
    # Resize terminal to host terminal size
    environment.loginShellInit = ''
      ${pkgs.xterm}/bin/resize
+
+      echo alias 'sd' can be used to shutdown the VM
    '';

    environment.interactiveShellInit = ''
--- a/hosts/test-vm/whib-backend.nix
+++ b/hosts/test-vm/whib-backend.nix
@@ -1,4 +1,5 @@
 {
+  pkgs,
  lib,
  config,
  ...
@@ -14,6 +15,8 @@ in
  };

  config = lib.mkIf enabled {
+    environment.systemPackages = [ pkgs.gnupg ];
+
    services.whib-backend = {
      enable = true;
      domain = "whib-backend.local";
@@ -24,6 +27,18 @@ in

      postgres = {
        password = "postgrespassword";
+
+        backup = {
+          gpgPassphraseFile = ./whib-gpgPassfile;
+
+          backblazeBucket = "whib-postgres-backups";
+          backblazeKeyID = "003867c33cd1a9b0000000003";
+          backblazeKey = "K003+GUNG0lwTOMS5EheKC9YzgxFzuU";
+        };
+      };
+
+      grafana = {
+        password = "granfanapassword";
      };
    };

@@ -38,15 +53,35 @@ in

        forwardPorts = [
          {
+            # Service API
            from = "host";
            host.port = 8080;
            guest.port = 8080;
          }
          {
+            # Service Metrics
+            from = "host";
+            host.port = 8181;
+            guest.port = 8181;
+          }
+          {
+            # Postgres
            from = "host";
            host.port = 5432;
            guest.port = 5432;
          }
+          {
+            # Grafana
+            from = "host";
+            host.port = 3000;
+            guest.port = 3000;
+          }
+          {
+            # Prometheus
+            from = "host";
+            host.port = 9090;
+            guest.port = 9090;
+          }
        ];
      };
    };
--- a/hosts/test-vm/whib-gpgPassfile
+++ b/hosts/test-vm/whib-gpgPassfile
@@ -0,0 +1 @@
+abc123
--- a/secrets/pinwheel/work-github-token.age
+++ b/secrets/pinwheel/work-github-token.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
-> ssh-ed25519 vxPbZg Bmvy3//fQLVj/L4NPxOJ97lZi3mnr4JRYd4LMsQhZFo
-AUKgDUPbXxY9hdvw/p227xJs1zy97bZdzSq+dU8SvjI
-> ssh-ed25519 +oNaHQ GLTMdsKIZZQBuTUQGfNvow1vawla7/MHIBHMzeIjp1w
-HcbCdXR0TkTe7MxctOubSCB00zc2LD8mmQsluhYxIMs
--- jg1CbPpvJyFLXfpizH6ibgJ8Fil8lsxjpysOk2QOJks
-<05><>W7L<>g)]<5D><><EFBFBD><EFBFBD><6;U<><1C>\<5C><> <20><><EFBFBD>E<EFBFBD>
-r<EFBFBD><EFBFBD><01>A<EFBFBD><41><EFBFBD>'<06>8|<7C>xX<78><58><EFBFBD>jޜ<6A>=#Tùήէ<>/
+-> ssh-ed25519 vxPbZg kPlQg/h4GOsYY4xhXBt7tf3FKpRLKcCWJ++qzFyEW0U
+HPEO63dlU+IxFyRH11bBRDi0mCeW8CGgMChm6s62JHs
+-> ssh-ed25519 +oNaHQ uVezQzhewJvvudpJHCqFDRikj/J4tJXN85ESjkXoJjU
+cGUGizHtXZ/d+vO9jVoURNC19vHo77rXq5Cnd4cRwUU
+--- DtoPmQklXZeD4zDS/wJvQhx26S8kM2S64Rf9R+AlO2Y
+'<1B>r<EFBFBD>|j<><6A>.<2E>ɭ<EFBFBD><C9AD><EFBFBD>{<7B>A<><41>_4<5F><34>q<EFBFBD>M<EFBFBD>mE7<><37>پ<EFBFBD>
Author	SHA1	Message	Date
Alexander Heldt	19a0c3d97d	wip	2024-12-01 13:39:11 +01:00
Alexander Heldt	189cd4fe35	wip	2024-12-01 10:22:45 +01:00
Alexander Heldt	b19d28c442	test-vm: Add `WHIB backend`	2024-12-01 10:22:05 +01:00
Alexander Heldt	105aed70b4	Update README with documentation about the `test-vm`	2024-12-01 10:20:11 +01:00
Alexander Heldt	506f0574de	test-vm: Resize terminal to host terminal size	2024-12-01 10:20:11 +01:00
Alexander Heldt	943db9b011	test-vm: Add alias of shutting down the VM	2024-12-01 10:20:11 +01:00
Alexander Heldt	045bfd269b	test-vm: Auto login `a` user and assume its `sudo`	2024-12-01 10:20:11 +01:00
Alexander Heldt	b922b286b4	test-vm: Increase disk size	2024-12-01 10:20:11 +01:00
Alexander Heldt	5ab0ac4828	pinwheel: Add volume sharing for `vm`s	2024-11-28 18:26:28 +01:00
Alexander Heldt	a3133defeb	config-manager: Fix `--update`	2024-11-28 18:25:55 +01:00
Alexander Heldt	94e35677a6	pinwheel: Fix `hyprland` "smart gaps"	2024-11-28 18:25:38 +01:00
Alexander Heldt	bdb8df947f	Update flake inputs	2024-11-28 18:25:27 +01:00
Alexander Heldt	52567105ff	pinwheel: Update `work` github token	2024-11-25 08:47:50 +01:00
Alexander Heldt	f8b39ee30c	pinwheel: Set `intellij` version to `2024.2.4` in for `work`	2024-11-24 19:08:59 +01:00
Alexander Heldt	c80e053c1c	pinwheel: Indent `js` code in `emacs` with spaces	2024-11-21 08:55:25 +01:00