M flake.lock → flake.lock

@@ -68,6 +68,64 @@ "type": "tarball",
         "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1737701679,
+        "narHash": "sha256-obXnyI4AND03Eh6EgUwqG9o8YrQleiKoGRIVfw8ZClw=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "52d45f71b06afe12efc34bf2d9bfe32bfa16cecd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736614405,
+        "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.01",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737697331,
+        "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1737569578,
@@ -84,6 +142,22 @@ "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1737569578,
+        "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "47addd76727f42d351590c905d9d1905ca895b82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1728241625,
@@ -103,6 +177,7 @@ },
     "root": {
       "inputs": {
         "lix": "lix",
+        "niri": "niri",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
@@ -119,6 +194,39 @@ },
       "original": {
         "owner": "nix-systems",
         "repo": "default",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730166465,
+        "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.5",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736487362,
+        "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
         "type": "github"
       }
     }

M flake.nix → flake.nix

@@ -8,6 +8,11 @@ lix = {
       url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs =
     {
@@ -15,6 +20,7 @@ self,
       nixpkgs,
       nixpkgs-unstable,
       lix,
+      niri,
       ...
     }@inputs:
     {
@@ -42,6 +48,8 @@ ];
               })
             */
 
+            niri.nixosModules.niri
+
             lix.nixosModules.default
 
             (
@@ -59,7 +67,6 @@
             ./profiles/runestone/hardware-configuration.nix
             ./profiles/runestone/base.nix
             ./profiles/runestone/desktop.nix
-            ./profiles/runestone/grafana-prometheus.nix
           ];
         };
 
@@ -88,7 +95,7 @@ ./profiles/common/desktop.nix
 
             ./profiles/opal/hardware-configuration.nix
             ./profiles/opal/base.nix
-            ./profiles/runestone/gnome.nix # TODO: replace with a nice wayland twm or something
+            ./profiles/runestone/desktop.nix # TODO: replace with a nice wayland twm or something
           ];
         };
       };

M profiles/runestone/desktop.nix → profiles/runestone/desktop.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   services.xserver.desktopManager.gnome.enable = true;
 
@@ -7,6 +7,13 @@ services.displayManager.autoLogin = {
     enable = true;
     user = "charlotte";
   };
+
+  programs.niri.enable = true;
+  environment.systemPackages =
+    (with pkgs; [
+      fuzzel
+      wireplumber
+    ]);
 
   programs.kdeconnect.enable = true;
   programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;

D profiles/runestone/grafana-prometheus.nix

@@ -1,41 +0,0 @@
-{ config, ... }:
-{
-  services.grafana = {
-    enable = true;
-
-    settings.server = {
-      http_addr = "0.0.0.0";
-      http_port = 2342;
-    };
-  };
-
-  services.prometheus.enable = true;
-  services.prometheus.exporters.node = {
-    enable = true;
-    port = 9092;
-    enabledCollectors = [ "systemd" ];
-  };
-  services.prometheus.scrapeConfigs = [
-    {
-      job_name = "runestone";
-      static_configs = [
-        {
-          targets = [
-            "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
-          ];
-        }
-      ];
-    }
-    {
-      job_name = "anchor";
-      scrape_interval = "1s";
-      static_configs = [
-        {
-          targets = [
-            "anchor.bunny-hops.ts.net:6009"
-          ];
-        }
-      ];
-    }
-  ];
-}