From 8363764798af261b111033c37c7a46b19816e6c2 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Tue, 3 Mar 2026 22:58:48 +0100
Subject: [PATCH] migrates even more things

---
 modules/base/default.nix               |  2 +-
 modules/cli-tools/default.nix          | 32 ++++++++++++++++++++++++++
 modules/gaming/default.nix             |  1 +
 modules/hosts/dnsc-machine/default.nix |  4 +++-
 modules/nix/default.nix                | 29 +++++++++++++++++++++++
 modules/nvidia-graphics/default.nix    |  5 ++--
 6 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 modules/cli-tools/default.nix
 create mode 100644 modules/nix/default.nix

diff --git a/modules/base/default.nix b/modules/base/default.nix
index c0dc000..43efccb 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
   username = config.flake.globalConfig.username;
 in
diff --git a/modules/cli-tools/default.nix b/modules/cli-tools/default.nix
new file mode 100644
index 0000000..d5ba546
--- /dev/null
+++ b/modules/cli-tools/default.nix
@@ -0,0 +1,32 @@
+{ ... }:
+let
+  commonPackages =
+    pkgs: with pkgs; [
+      neofetch
+      zip
+      unzip
+      ripgrep
+      fzf
+      fd
+      sd
+      bat
+      tldr
+      fortune
+      just
+      mmv-go
+      usbutils
+    ];
+in
+{
+  flake.modules.nixos.cli-tools =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = commonPackages pkgs;
+    };
+
+  flake.modules.darwin.cli-tools =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = commonPackages pkgs;
+    };
+}
diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix
index 1f60277..263c286 100644
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -8,6 +8,7 @@
       programs.steam = {
         enable = true;
         remotePlay.openFirewall = true;
+        gamescopeSession.enable = true;
         protontricks.enable = true;
 
         extraCompatPackages = with pkgs; [
diff --git a/modules/hosts/dnsc-machine/default.nix b/modules/hosts/dnsc-machine/default.nix
index 6860343..2b0f3c4 100644
--- a/modules/hosts/dnsc-machine/default.nix
+++ b/modules/hosts/dnsc-machine/default.nix
@@ -8,10 +8,12 @@ in
     modules = with config.flake.modules.nixos; [
       home-manager
       base
+      shell
+      cli-tools
+      nix
       nvidia-graphics
       drawing-tablet
       printing
-      shell
       desktop
       gaming
 
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
new file mode 100644
index 0000000..b0a31c5
--- /dev/null
+++ b/modules/nix/default.nix
@@ -0,0 +1,29 @@
+{ ... }:
+{
+  flake.modules.nixos.nix =
+    { pkgs, ... }:
+    {
+      programs.direnv = {
+        enable = true;
+        silent = false;
+        loadInNixShell = true;
+        direnvrcExtra = "";
+        nix-direnv = {
+          enable = true;
+        };
+      };
+
+      nix.settings.experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      programs.nix-ld.enable = true;
+      nixpkgs.config.allowUnfree = true;
+
+      environment.systemPackages = with pkgs; [
+        nil
+        statix
+        manix
+      ];
+    };
+}
diff --git a/modules/nvidia-graphics/default.nix b/modules/nvidia-graphics/default.nix
index b5f397f..a30a569 100644
--- a/modules/nvidia-graphics/default.nix
+++ b/modules/nvidia-graphics/default.nix
@@ -1,8 +1,9 @@
-{ config, ... }:
+{ ... }:
 {
   flake.modules.nixos.nvidia-graphics =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
+      nixpkgs.config.allowUnfree = true;
       services.xserver.videoDrivers = [ "nvidia" ];
       hardware = {
         graphics.enable = true;