Squash merge dev into master

modules/cups.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [cups-filters];
+  };
+}

modules/default.nix

@@ -6,7 +6,6 @@
     ./docker.nix
     ./env.nix
     ./fonts.nix
-    ./i3-xfce.nix
     ./net.nix
     ./nixos.nix
     ./nvidia.nix
@@ -18,16 +17,14 @@
     ./tailscale.nix
     ./udiskie.nix
     ./ld.nix
+    ./rust.nix
+    ./x11.nix
+    ./i3-xfce.nix
+    ./ollama.nix
+    ./cups.nix
   ];
 
-  services.ollama = {
-    enable = true;
-    acceleration = "cuda";
-    loadModels = [];
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
+  npm.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

modules/docker.nix

@@ -8,5 +8,6 @@
   environment.systemPackages = with pkgs; [
     docker
     docker-compose
+    lazydocker
   ];
 }

modules/fonts.nix

@@ -1,17 +1,4 @@
-{pkgs, ...}: let
-  clear-sans = pkgs.stdenv.mkDerivation {
-    name = "clear-sans";
-    src = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/resir014/Clear-Sans-Webfont/97eec13/fonts/TTF/ClearSans-Regular.ttf";
-      sha256 = "0vzhy3l056gj5vkcs1kglr4mr0546fq093v78i4ri8xni7w1m0dv";
-    };
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p $out/share/fonts/truetype
-      cp $src $out/share/fonts/truetype/ClearSans-Regular.ttf
-    '';
-  };
-in {
+{pkgs, ...}: {
   fonts = {
     packages = with pkgs; [
       noto-fonts
@@ -19,26 +6,12 @@ in {
       noto-fonts-cjk-serif
       noto-fonts-emoji
       nerd-fonts._0xproto
-      nerd-fonts.fira-code
-      nerd-fonts.jetbrains-mono
-      nerd-fonts.hack
-      nerd-fonts.noto
-      nerd-fonts.symbols-only
+      nerd-fonts-noto
+      nerd-fonts-symbols-only
       ipafont
       kochi-substitute
       clear-sans
-      (stdenv.mkDerivation {
-        name = "binary-clock-font";
-        src = fetchurl {
-          url = "https://github.com/jamessouth/polybar-binary-clock-fonts/raw/master/BinaryClockBoldMono.ttf";
-          sha256 = "0vxy23zr8r8faa5s7vy5bf8z2q7my39ghmd9ilk7aww9wqsrsjqx";
-        };
-        dontUnpack = true;
-        installPhase = ''
-          mkdir -p $out/share/fonts/truetype
-          cp $src $out/share/fonts/truetype/BinaryClockBoldMono.ttf
-        '';
-      })
+      binary-font
     ];
     fontconfig = {
       enable = true;

modules/home-manager.nix

@@ -1,12 +0,0 @@
-{ inputs, pkgs, lib, rpcs3_latest, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.cobray = import ../home-manager/cobray.nix {
-      inherit pkgs lib rpcs3_latest;
-    };
-  };
-}

modules/npm.nix

@@ -3,12 +3,14 @@
   pkgs,
   lib,
   ...
-}: let
-  npmGlobalDir = "~/.npm-global";
+}:
+# TODO:bandaid fix for now
+let
+  npmGlobalDir = "/home/cobray/.npm-global";
   npmConf = pkgs.writeText "npmrc" ''
     prefix=${npmGlobalDir}
-    cache=~/.npm
-    init-module=~/.npm-init.js
+    cache=/home/cobray/.npm
+    init-module=/home/cobray/.npm-init.js
   '';
 in {
   options.npm = {
@@ -19,6 +21,18 @@ in {
       nodejs_22
       nodePackages.npm
       electron
+      yarn
+      bun
+      deno
+      nodePackages.eslint
+      nodePackages.prettier
+      nodePackages.sql-formatter
+      nodePackages.markdownlint-cli
+      nodePackages.stylelint
+      nodePackages.htmlhint
+      nodePackages.jsonlint
+      nodePackages.pnpm
+      nodePackages.typescript
     ];
     environment.variables = {
       PATH = [

modules/ollama.nix

@@ -0,0 +1,7 @@
+{
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+    loadModels = [];
+  };
+}

modules/python.nix

@@ -17,9 +17,11 @@
         wheel
         jupyterlab
         datasets
+        debugpy
       ]))
     isort
     uv
     python311
+    ruff
   ];
 }

modules/rust.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  options.rust = {
+    enable = lib.mkEnableOption "System Rust Environment";
+  };
+
+  config = lib.mkIf config.rust.enable {
+    environment.systemPackages = with pkgs; [
+      rustc
+      rustup
+      cargo-edit
+      cargo-watch
+      cargo-outdated
+      cargo-audit
+      rust-analyzer
+      clippy
+      minijinja-cli
+    ];
+
+    environment.variables = {
+      PATH = [
+        "${pkgs.rustc}/bin"
+        "${pkgs.cargo}/bin"
+      ];
+    };
+  };
+}

modules/user.nix

@@ -6,7 +6,7 @@ in {
     isNormalUser = true;
     description = "Mon Aie";
     extraGroups = ["networkmanager" "wheel" "docker" "video"];
-    shell = fish-rust;
+    shell = pkgs.bash;
   };
 
   security.sudo = {

modules/x11.nix

@@ -0,0 +1,12 @@
+# For xorgsisters only
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    xorg.xdpyinfo
+    slop
+    xorg.libX11
+    xorg.libXtst
+    xorg.libXi
+    xorg.xorgproto
+    xclip
+  ];
+}