infrastructure

commit d7c0bd8a279377e1d0a8bc9c3a22b0761ed4a3f0
parent 6c444e18ceeb3106f08aacc12a03c3ff43e7ca14
Author: Silas Brack <silasbrack@gmail.com>
Date:   Sat, 16 May 2026 23:21:31 +0200

feat: replace hyprland with niri

Diffstat:
M
hosts/gaia/configuration.nix
 | 
36
++++++++++++++++++------------------
M
hosts/gaia/home.nix
 | 
29
++---------------------------
M
hosts/gaia/hyprland.nix
 | 
2
++

3 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/hosts/gaia/configuration.nix b/hosts/gaia/configuration.nix
@@ -97,20 +97,13 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  programs.hyprland.enable = true;
-  services.greetd = {
-    enable = true;
-    settings = {
-      initial_session = {
-        command = "${pkgs.hyprland}/bin/Hyprland";
-        user = "silas";
-      };
-      default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
-        user = "greeter";
-      };
-    };
-  };
+  services.displayManager.ly.enable = true;
+
+  programs.niri.enable = true;
+  security.polkit.enable = true; # polkit
+  services.gnome.gnome-keyring.enable = true; # secret service
+  security.pam.services.swaylock = {};
+  programs.waybar.enable = true; # top bar
 
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -139,10 +132,8 @@
       nerd-fonts.iosevka
       # font-bitstream-type1
       ibm-plex
-      # source-sans
       merriweather
       libertinus
-      # noto-fonts
       paratype-pt-sans
     ];
     fontconfig = {
@@ -162,7 +153,7 @@
             <alias>
               <family>math</family>
               <prefer>
-                <family>Libertinus</family>
+                <family>Libertinus Math</family>
               </prefer>
             </alias>
           </fontconfig>
@@ -225,6 +216,7 @@
       feh
       # ffmpeg
       firefox
+      foot
       fzf
       # gcc
       # gimp
@@ -234,7 +226,7 @@
       # inkscape
       # isync
       jq
-      kitty
+      # kitty
       # kiwix
       # lazygit
       ledger
@@ -283,6 +275,14 @@
     hyprlock
     hypridle
     wl-clipboard
+    #
+    alacritty fuzzel swaylock mako swayidle
+    xwayland-satellite
+    cliphist # for hyprland clipboard history
+    grim # for hyprland screenshotting
+    pamixer # audio control
+    slurp # for hyprland screenshotting
+    swappy # for hyprland screenshotting
   ];
 
   programs.vim = {
diff --git a/hosts/gaia/home.nix b/hosts/gaia/home.nix
@@ -10,9 +10,6 @@
       ...
     }:
     {
-      imports = [
-        ./hyprland.nix
-      ];
       home.stateVersion = "24.11";
       home.shellAliases = {
         paperless-manage = "sudo -u paperless /var/lib/paperless/paperless-manage";
@@ -32,6 +29,7 @@
 
       programs.emacs = {
         enable = true;
+        package = pkgs.emacs-pgtk;
         extraConfig = builtins.readFile ./init.el;
         extraPackages = ep: [
           ep.magit
@@ -66,7 +64,7 @@
 
       programs.git = {
         enable = true;
-        extraConfig = {
+        settings = {
           "gitea.git.fnarglebeast.com/api/v1".user = "silas";
         };
         settings = {
@@ -83,17 +81,6 @@
         };
       };
 
-      programs.kitty = {
-        enable = true;
-        shellIntegration = {
-          enableBashIntegration = true;
-        };
-        settings = {
-          font_family = "Iosevka Nerd Font";
-          font_size = 16;
-        };
-      };
-
       programs.firefox = {
 	      enable = true;
 	      profiles = {
@@ -107,18 +94,6 @@
 
               # Don't let websites override my font choices
               "browser.display.use_document_fonts" = 0;
-
-              # My preferred fonts (Latin / Western European scripts)
-              "font.name.serif.x-western"      = "Merriweather";
-              "font.name.sans-serif.x-western" = "IBM Plex Sans";
-              "font.name.monospace.x-western"  = "JetBrains Mono";
-
-              # Whether the page's default ("body" with no font-family) is serif or sans-serif
-              "font.default.x-western" = "sans-serif";
-
-              # # Optional: default sizes
-              # "font.size.variable.x-western" = 16;
-              # "font.size.monospace.x-western" = 14;
 	          };
 	          search = {
 	            force = true;
diff --git a/hosts/gaia/hyprland.nix b/hosts/gaia/hyprland.nix
@@ -7,6 +7,8 @@
 
 {
   home.packages = with pkgs; [
+
+
     cliphist # for hyprland clipboard history
     grim # for hyprland screenshotting
     pamixer # audio control