istg i have to make smaller commits

system/core/compat.nix

@@ -1,9 +1,5 @@
-{pkgs, ...}: {
-  #environment.systemPackages = [pkgs.steam-run];
-  environment.systemPackages = [pkgs.appimage-run];
-
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
+{pkgs, ...}: let
+  list-of-libraries = with pkgs; [
     alsa-lib
     at-spi2-atk
     at-spi2-core
@@ -56,4 +52,14 @@
     xorg.libxshmfence
     zlib
   ];
+in {
+  programs.appimage = {
+    enable = true;
+    package = pkgs.appimage-run.override {
+      extraPkgs = p: list-of-libraries;
+    };
+  };
+
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = list-of-libraries;
 }

system/core/docs.nix

@@ -1,11 +1,7 @@
 {pkgs, ...}: {
   documentation = {
     dev.enable = true;
-    man.generateCaches = true;
-    man = {
-      man-db.enable = false;
-      mandoc.enable = true;
-    };
+    #man.generateCaches = true;
   };
   environment.systemPackages = with pkgs; [
     linux-manual

system/core/tools.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    htop
+    btop
+    vim
+  ];
+}

system/default.nix

@@ -1,12 +1,15 @@
 let
   desktop = [
     ./core
+    ./core/tools.nix
     ./core/compat.nix
     ./core/boot.nix
     ./core/docs.nix
     ./core/gvfs.nix
 
-    ./hardware/opengl.nix
+    ./nix/gc.nix
+
+    ./hardware/graphics.nix
     ./hardware/steam-hardware.nix
     ./hardware/bluetooth.nix
     ./hardware/qmk.nix

system/hardware/graphics.nix

@@ -0,0 +1,6 @@
+{
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+}

system/hardware/opengl.nix

@@ -1,7 +0,0 @@
-{
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-}

system/nix/gc.nix

@@ -0,0 +1,7 @@
+{
+  nix.gc = {
+    automatic = true;
+    options = "--delete-older-than 14d";
+  };
+  nix.optimise.automatic = true;
+}

system/programs/fonts.nix

@@ -9,17 +9,34 @@
       source-code-pro
       iosevka
 
-      # nerdfonts
       nerdfonts
       #(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+      (stdenv.mkDerivation {
+        # font piracy? i would never
+        pname = "Cartograph-CF";
+        version = "0.1";
+        src = pkgs.fetchFromGitHub {
+          owner = "xiyaowong";
+          repo = "Cartograph-CF";
+          rev = "619de85c103dbd5c150e1d5df039357f8ac2ed52";
+          hash = "sha256-NVqHxLQZnHb0lMjODkaDwSoglGPkUVJHL1xTmASoER4=";
+        };
+        dontBuild = true;
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out/share/fonts
+          cp -r $src $out/share/fonts
+
+          runHook postInstall
+        '';
+      })
     ];
 
     # causes more issues than it solves
     enableDefaultPackages = false;
 
     # user defined fonts
-    # the reason there's Noto Color Emoji everywhere is to override DejaVu's
-    # B&W emojis that would sometimes show instead of some Color emojis
     fontconfig.defaultFonts = {
       monospace = ["DejaVu Sans Mono for Powerline"];
       sansSerif = ["DejaVu Sans"];

system/programs/tools.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     vim
     htop
@@ -8,7 +12,12 @@
     nethogs
     ffmpeg-full
     parted
-    pciutils
-    usbutils
+    busybox
+    (
+      if config.nixpkgs.config.allowUnfree
+      then p7zip-rar
+      else p7zip
+    )
+    unar
   ];
 }

system/services/containers/server/default.nix

@@ -132,6 +132,7 @@
           "5030:5030" # slskd
           "5031:5031" # slskd https
           "8096:8096" # jellyfin
+          "8920:8920" # jellyfin https
           "8080:8080" # qbittorrent webui
         ];
 

system/services/ollama.nix

@@ -1,6 +1,6 @@
 {
   services.ollama = {
     enable = true;
-    #rocmOverrideGfx = "10.3.0";
+    rocmOverrideGfx = "10.3.0";
   };
 }