From cabf188ae487120d4b9ac1fe21fff45403a787b4 Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Mon, 24 Aug 2026 01:09:49 -0400
Subject: various fixes to guix

---
 users/ryan/linux.nix | 65 +++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

(limited to 'users/ryan/linux.nix')

diff --git a/users/ryan/linux.nix b/users/ryan/linux.nix
index 5e6d767..3935de5 100644
--- a/users/ryan/linux.nix
+++ b/users/ryan/linux.nix
@@ -6,31 +6,36 @@
 
   home.username = "ryan";
   home.homeDirectory = "/home/ryan";
-  home.stateVersion = "23.11"; # Please read the comment before changing.
 
   nixpkgs.config.allowUnfree = true;
 
-  xdg.configFile."nix/nix.conf".text = "experimental-features = nix-command flakes\n";
-  xdg.configFile."nix/registry.json".text = builtins.toJSON {
-    version = 2;
-    flakes = [
-      {
-        from = { type = "indirect"; id = "nixpkgs"; };
-        to = {
-          type = "path";
-          path = inputs.nixpkgs.outPath;
-          lastModified = inputs.nixpkgs.lastModified;
-          narHash = inputs.nixpkgs.narHash;
-        };
-      }
-    ];
-  };
-
   fonts.fontconfig.enable = true;
   fonts.fontconfig.defaultFonts = {
     monospace = [ "DejaVu Sans Mono" ];
-    sansSerif = [ "DejaVu Sans" ];
-    serif = [ "DejaVu Serif" ];
+    sansSerif = [ "Noto Sans" "DejaVu Sans" ];
+    serif = [ "Noto Serif" "DejaVu Serif" ];
+  };
+
+  gtk = {
+    enable = true;
+    font = {
+      name = "Noto Sans";
+      size = 10;
+    };
+    theme = {
+      name = "Adwaita";
+      package = pkgs.gnome-themes-extra;
+    };
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+    };
+    colorScheme = "dark";
+  };
+
+  qt = {
+    enable = true;
+    platformTheme.name = "gtk3";
   };
 
   home.pointerCursor = {
@@ -47,6 +52,7 @@
   wayland.windowManager.hyprland = {
     enable = true;
     package = pkgs.hyprland;
+    configType = "hyprlang";
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
     extraConfig = builtins.readFile ./linux/hypr/hyprland.conf;
   };
@@ -60,6 +66,7 @@
     "hypr/scripts" = { source = ./linux/hypr/scripts; recursive = true; };
     "hypr/family_guy.mp4".source = ./linux/hypr/family_guy.mp4;
     "hypr/subwaysurfer.webm".source = ./linux/hypr/subwaysurfer.webm;
+    "wallpapers".source = ../../files/Wallpapers;
 
     "waybar" = { source = ./linux/waybar; recursive = true; };
     "alacritty" = { source = ./linux/alacritty; recursive = true; };
@@ -103,26 +110,16 @@
     waybar
     fuzzel
 
-    nerd-fonts.anonymice
-    nerd-fonts.monofur
-    nerd-fonts.lilex
-    nerd-fonts.fira-code
     noto-fonts
     dejavu_fonts
     liberation_ttf
     noto-fonts-cjk-sans
     noto-fonts-color-emoji
 
-    # hyprlock built by nix needs Guix's PAM/fontconfig libs preloaded to run
-    # under the Guix system profile - same interop hack as before.
-    (pkgs.writeScriptBin "hyprlock" ''
-      #! ${pkgs.bash}/bin/bash
-      export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD"
-      exec ${pkgs.hyprlock}/bin/hyprlock "$@"
-    '')
-
-    # Guix's mesa doesn't match nixpkgs', so GL apps built by nix need nixGL.
-    inputs.nixgl.packages.${pkgs.system}.nixGLIntel
-    inputs.clipboard-sync.packages.${pkgs.system}.default
+    inputs.clipboard-sync.packages.${pkgs.stdenv.hostPlatform.system}.default
+
+    # hyprlock itself is provided by the host-specific module (e.g.
+    # linux/guix.nix wraps it with an LD_PRELOAD shim; a plain NixOS host
+    # would just add pkgs.hyprlock here instead).
   ];
 }
-- 
cgit v1.3.1