From 87eebcda72bda515390f48beb9b36a77c87a6fa8 Mon Sep 17 00:00:00 2001
From: ed209 <git@ed209.dev>
Date: Mon, 29 Dec 2025 11:51:00 -0500
Subject: [PATCH] chore: add some TODOs and minor fixes from community feedback

---
 flake.nix                       |  2 --
 home-manager/re.nix             | 15 ++++++++++++-
 hosts/iso/iso.nix               |  3 ++-
 hosts/sachiel/configuration.nix | 39 ++++++++-------------------------
 4 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/flake.nix b/flake.nix
index 966cb12..b97ce0f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,8 +77,6 @@
   outputs = {
     self,
     nixpkgs,
-    agenix,
-    disko,
     home-manager,
     nixos-generators,
     ...
diff --git a/home-manager/re.nix b/home-manager/re.nix
index 90479bb..0ebab3c 100644
--- a/home-manager/re.nix
+++ b/home-manager/re.nix
@@ -1,3 +1,16 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [ghidra ltrace radare2];
+  home.packages = with pkgs; [
+    # NOTE: this may be unnecessary on wayland
+    (pkgs.writeShellScriptBin "ghidra-highdpi-launcher" ''
+      exec ${lib.getLib ghidra}/lib/ghidra/support/launch.sh \
+        fg jdk Ghidra "" "\
+          -Dsun.java2d.opengl=true \
+          -Dsun.java2d.xrender=false \
+          -Dsun.java2d.uiScale=2 \
+        " ghidra.GhidraRun "$@"
+    '')
+    ghidra
+    ltrace
+    radare2
+  ];
 }
diff --git a/hosts/iso/iso.nix b/hosts/iso/iso.nix
index 52c6be5..c576e4a 100644
--- a/hosts/iso/iso.nix
+++ b/hosts/iso/iso.nix
@@ -7,8 +7,9 @@
   ...
 }: {
   imports = with inputs; [
-    "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
+    # "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
     # "${modulesPath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+    "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
     ../common/yubikey.nix
     home-manager.nixosModules.home-manager
     {
diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix
index 59e6fad..7ad7c49 100644
--- a/hosts/sachiel/configuration.nix
+++ b/hosts/sachiel/configuration.nix
@@ -29,7 +29,6 @@
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
     ./disko-config.nix
-    ../common/ldd.nix
     ../common/yubikey.nix
 
     # Import your generated (nixos-generate-config) hardware configuration
@@ -38,7 +37,8 @@
 
   age = with inputs; {
     identityPaths = ["${nix-secrets}/identities/age-tpm-identity-vm.txt"];
-    # FIXME: It'd be ideal if there was a way for each module could contribute to a list of pkgs
+    # TODO: Modulerize config by declare pkgs in a list as a module option, and
+    # have module implementation mkMerge  into the binpath
     ageBin = "PATH=$PATH:${lib.makeBinPath [pkgs.age-plugin-yubikey pkgs.age-plugin-tpm]} ${pkgs.age}/bin/age";
     secrets = {
       password.file = "${nix-secrets}/password.age";
@@ -143,18 +143,6 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
   # Configure keymap in X11
   # services.xserver.xkb = {
   #   layout = "us";
@@ -189,21 +177,10 @@
       Modeline "2880x1920" 60.001 2880 2928 2960 3040 1920 1925 1930 1976 +HSync -Vsync
     '';
   };
-  environment.variables = {
-    # Upscale curser
-    XCURSOR_SIZE = "64";
-    ## Used by GTK 3
-    # `GDK_SCALE` is limited to integer values
-    GDK_SCALE = "2";
-    # Inverse of GDK_SCALE
-    GDK_DPI_SCALE = "0.5";
-    # Used by Qt 5
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-    _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
-  };
   services.displayManager = {
     defaultSession = "none+i3";
     environment = {
+      WINIT_X11_SCALE_FACTOR = "1.75";
       GDK_SCALE = "2";
       GDK_DPI_SCALE = "0.5";
       QT_AUTO_SCREEN_SCALE_FACTOR = "1";
@@ -219,7 +196,6 @@
     description = inputs.nix-secrets.name;
     extraGroups = ["networkmanager" "wheel"];
     openssh.authorizedKeys.keys = inputs.nix-secrets.ssh-keys;
-    packages = with pkgs; [];
     shell = pkgs.fish;
     hashedPasswordFile = config.age.secrets.password.path;
   };
@@ -237,12 +213,15 @@
     git
     sbctl
     uutils-coreutils-noprefix
-    vim
     wget
   ];
 
-  # Set default editor to nvim
-  environment.variables.EDITOR = "vim";
+  # Set default editor to vim
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
+  programs.nano.enable = false; # otherwise it'll still be around for no reason
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
-- 
2.51.2