From d8657c7eebb01e17d08d52c489fc441177051f4d Mon Sep 17 00:00:00 2001 From: biscuit Date: Wed, 25 Jun 2025 22:24:55 -0500 Subject: [PATCH] added heroic launcher --- config.nix | 6 +++--- modules/app.nix | 1 + nixos/desktop/hardware-configuration.nix | 25 ++++++++++++------------ pkgs/heroic/default.nix | 5 +++++ pkgs/hyprland/default.nix | 8 ++++++-- system/vpn.nix | 4 ++-- 6 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/heroic/default.nix diff --git a/config.nix b/config.nix index 024d182..0ed20d6 100644 --- a/config.nix +++ b/config.nix @@ -1,11 +1,11 @@ { - hostname = "TEXAS"; + hostname = "hakase"; username = "kenji"; timezone = "America/Chicago"; vpn = { vpnEnable = false; - vpnSecretFile = "/home/biscuit/Wireguard/secret"; + vpnSecretFile = "/home/kenji/Wireguard/secret"; }; gitProfile = { @@ -37,7 +37,7 @@ touchpadSupport = false; logitech-hardware = { - enable = false; + enable = true; }; # Custom Applications diff --git a/modules/app.nix b/modules/app.nix index a6d287d..38c5272 100644 --- a/modules/app.nix +++ b/modules/app.nix @@ -8,5 +8,6 @@ ] ++ lib.optionals (linux-apps.gamingDesktop == true) [ ../pkgs/steam/default.nix + ../pkgs/heroic/default.nix ]; } diff --git a/nixos/desktop/hardware-configuration.nix b/nixos/desktop/hardware-configuration.nix index 044722e..991ab97 100644 --- a/nixos/desktop/hardware-configuration.nix +++ b/nixos/desktop/hardware-configuration.nix @@ -8,29 +8,30 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d72dddb2-a232-46aa-8d46-c4b9cd7ed95e"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/3f2c4a5a-3124-462a-9fb9-cccc933bac63"; + fsType = "btrfs"; + options = [ "subvol=@" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A6A3-E317"; + { device = "/dev/disk/by-uuid/18F8-7DC1"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/a60ba0ab-dd33-4570-a2e9-873439d9cccf"; + fileSystems."/mnt/CRUCIAL" = + { device = "/dev/disk/by-uuid/394f67b9-e75b-40cc-9b15-28bbda40fff4"; fsType = "ext4"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/49b9aca5-2a3a-43bf-b488-a23757979f32"; } + [ { device = "/dev/disk/by-uuid/bbe1e281-4b1d-4d85-ba6a-6f5265f0e3a3"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -38,10 +39,10 @@ # 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.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.eno2.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.biscuit-default.useDHCP = lib.mkDefault true; + # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/pkgs/heroic/default.nix b/pkgs/heroic/default.nix new file mode 100644 index 0000000..3353d0a --- /dev/null +++ b/pkgs/heroic/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = [ + pkgs.heroic + ]; +} diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix index 143b866..6017d13 100644 --- a/pkgs/hyprland/default.nix +++ b/pkgs/hyprland/default.nix @@ -37,13 +37,16 @@ allow_tearing = false; layout = "dwindle"; }; - decoration = { rounding = 0; rounding_power = 2; active_opacity = 1.0; inactive_opacity = 1.0; + dim_inactive = true; + dim_strength = 0.1; + dim_special = 0.8; + shadow = { enabled = true; range = 4; @@ -110,7 +113,8 @@ input = { kb_layout = "us"; follow_mouse = 1; - sensitivity = 0; + sensitivity = -0.5; + force_no_accel = true; repeat_delay = 250; repeat_rate = 35; diff --git a/system/vpn.nix b/system/vpn.nix index 19d61c8..7fd0bf0 100644 --- a/system/vpn.nix +++ b/system/vpn.nix @@ -12,9 +12,9 @@ dns = ["10.2.0.1"]; peers = [ { - publicKey = "KkUoHrIzkuQ4msZulqCFyRC1Gqcx8oMgbDFRn8wW1X8="; + publicKey = "GbuOJ8Dho0iXlS0+ma2teQ4RxhBALWK6RB94qA1GZDA="; allowedIPs = ["0.0.0.0/0"]; - endpoint = "95.173.221.65:51820"; + endpoint = "79.127.147.2:51820"; # persistentKeepAlive = 25; } ];