makin piss

flake.nix

@@ -68,7 +68,7 @@
     {
       nixosConfigurations = {
         desktop = mkHost "desktop" [
-          ./modules/system/nvidia.nix
+          #./modules/system/nvidia.nix
           ./modules/system/nfs.nix
           ./modules/system/display-manager/sddm.nix
           ./modules/system/gaming.nix

hosts/common-config.nix

@@ -99,6 +99,7 @@
       brave
       git
       openssh
+      firefox
       xdg-user-dirs-gtk # This helps with Nautilus integration
       cachix
     ];
@@ -109,9 +110,9 @@
     };
   };
 
-  users.users.javi = {
+  users.users.blaine = {
     isNormalUser = true;
-    description = "javi";
+    description = "blaine";
     shell = pkgs.zsh;
     useDefaultShell = true;
     extraGroups = [
@@ -124,7 +125,7 @@
     stateVersion = "25.05"; # Did you read the comment?
     activationScripts.avatar = ''
       mkdir -p /var/lib/AccountsService/icons
-      ln -sf /etc/avatars/javi.png /var/lib/AccountsService/icons/javi
+      ln -sf /etc/avatars/javi.png /var/lib/AccountsService/icons/blaine
     '';
   };
 
@@ -169,7 +170,7 @@
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark.yaml";
-    # image = "/home/javi/Documents/wallpapers/Fantasy-Mountain.png";
+    # image = "/home/blaine/Documents/wallpapers/Fantasy-Mountain.png";
     polarity = "dark";
   };
 
@@ -180,7 +181,7 @@
       assets = assets;
     };
     users = {
-      "javi" = {
+      "blaine" = {
         imports = [
           ../modules/home/home.nix
         ];

hosts/desktop/hardware-configuration.nix

@@ -1,71 +1,40 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/8f492948-4572-44d4-9da9-9394894320f4";
+    { device = "/dev/disk/by-uuid/bba79e96-6fd2-4124-b3cd-157c299eb999";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/EAA9-478C";
+    { device = "/dev/disk/by-uuid/95EC-A63C";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
+    };
-      "dmask=0077"
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/b13461ea-9ff4-4843-b39b-d9d0759fff1e"; }
     ];
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/6646d409-6417-4410-b3a0-fe6bafb2b9f3";
-    fsType = "ext4";
-  };
-
-  fileSystems."/tmp" = {
-    device = "/dev/disk/by-uuid/9fe1009a-f604-40ff-a13d-e78d9041397f";
-    fsType = "ext4";
-  };
-
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/9d39eb6d-09ab-4d66-8864-c19f9d59f620";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/6fa52bf4-b1d9-468f-bc3a-f0c740e80c86"; }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

modules/home/common/kitty.nix

@@ -6,7 +6,7 @@
 }:
 let
   kittyConfig = ''
-    font_size 16.0
+    font_size 11
 
     background_opacity 0.7
     background_blur 1

modules/home/home.nix

@@ -28,8 +28,8 @@
   # };
 
   home = {
-    username = "javi";
+    username = "blaine";
-    homeDirectory = "/home/javi";
+    homeDirectory = "/home/blaine";
     stateVersion = "25.05"; # Home manager version. Do not update carelessly
     packages = with pkgs; [
       # Basics

modules/home/hyprland/default.nix

@@ -66,8 +66,10 @@
         repeat_rate = 20;
       };
 
+
       monitor = [
-        "DP-5, 3440x1440@179.99, 0x0, 1"
+        "DP-1, 2560x1600@59.97200, 0x0, 1"
+        "DP-2, 1920x1080@60.00000, 2560x-375, 1, transform, 1"
       ];
 
       general = {

modules/home/hyprland/hyprpaper.nix

@@ -18,11 +18,11 @@
       ipc = "on";
       splash = false;
       preload = [
-        "/home/javi/.config/wallpaper.png"
+        "/home/blaine/.config/wallpaper.png"
       ];
 
       wallpaper = [
-        ", /home/javi/.config/wallpaper.png"
+        ", /home/blaine/.config/wallpaper.png"
       ];
     };
   };

modules/system/device-management/logitech.nix

@@ -23,7 +23,7 @@
     };
   };
 
-  users.users.javi.extraGroups = [
+  users.users.blaine.extraGroups = [
     "input"
     "plugdev"
   ];

modules/system/display-manager/sddm.nix

@@ -6,7 +6,7 @@
   ...
 }:
 let
-  basePath = "/home/javi/Documents/wallpapers";
+  basePath = "/home/blaine/Documents/wallpapers";
   wallpaper = "Fantasy-Mountain.png";
 in
 {

modules/system/nfs.nix

@@ -6,7 +6,7 @@ let
   shares = [
     "backups"
     "container-data"
-    "javi"
+    "blaine"
   ];
 
   configureShare = share: {

modules/system/nix-valet.nix

@@ -49,10 +49,10 @@ in
     # Enable PHP-FPM
     phpfpm = {
       pools.www = {
-        user = "javi";
+        user = "blaine";
         group = "users";
         settings = {
-          "listen.owner" = "javi";
+          "listen.owner" = "blaine";
           "listen.group" = "users";
           "listen.mode" = "0660";
           "pm" = "dynamic";
@@ -83,7 +83,7 @@ in
 
         # Wildcard for other .test domains
         http://*.test {
-            root * /home/javi/projects/{labels.1}/public
+            root * /home/blaine/projects/{labels.1}/public
             php_server
         }
       '';
@@ -125,12 +125,12 @@ in
 
   # Create a dedicated caddy config directory
   systemd.tmpfiles.rules = [
-    "d /var/lib/caddy 0755 javi users -"
+    "d /var/lib/caddy 0755 blaine users -"
   ];
 
   systemd.services.caddy = {
     serviceConfig = {
-      User = lib.mkForce "javi";
+      User = lib.mkForce "blaine";
       Group = lib.mkForce "users";
       # More comprehensive capabilities
       AmbientCapabilities = [
@@ -151,7 +151,7 @@ in
   };
 
   # And make sure your user is in the caddy group
-  users.users.javi = {
+  users.users.blaine = {
     extraGroups = [
       "users"
     ];