From 81e521ee5c44592f2468abecd21b1a3db99fa7a1 Mon Sep 17 00:00:00 2001 From: javif89 Date: Sat, 16 Aug 2025 18:53:00 -0400 Subject: [PATCH] makin piss --- flake.nix | 2 +- hosts/common-config.nix | 1 + hosts/desktop/hardware-configuration.nix | 71 +++++++----------------- modules/home/common/kitty.nix | 2 +- modules/home/hyprland/default.nix | 4 +- 5 files changed, 26 insertions(+), 54 deletions(-) diff --git a/flake.nix b/flake.nix index 50b4d66..7c72247 100755 --- a/flake.nix +++ b/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 diff --git a/hosts/common-config.nix b/hosts/common-config.nix index 6a4dfeb..d24bac2 100644 --- a/hosts/common-config.nix +++ b/hosts/common-config.nix @@ -99,6 +99,7 @@ brave git openssh + firefox xdg-user-dirs-gtk # This helps with Nautilus integration cachix ]; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 077a87b..b2b219c 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/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 = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usb_storage" - "usbhid" - "sd_mod" - ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/8f492948-4572-44d4-9da9-9394894320f4"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/bba79e96-6fd2-4124-b3cd-157c299eb999"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/EAA9-478C"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/95EC-A63C"; + fsType = "vfat"; + options = [ "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..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0.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; diff --git a/modules/home/common/kitty.nix b/modules/home/common/kitty.nix index 8fcf075..084214c 100644 --- a/modules/home/common/kitty.nix +++ b/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 diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index ac7659f..f384af4 100644 --- a/modules/home/hyprland/default.nix +++ b/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 = {