From 4714198bda5ae703d54df16d9638a580466400f9 Mon Sep 17 00:00:00 2001 From: minco Date: Wed, 29 Apr 2026 00:52:42 +0900 Subject: [PATCH] modify --- hardware-configuration.nix | 64 +++++++++++++++++++++++++++++--------- modules/home/bash.nix | 6 +++- pkgs/util.nix | 1 + shell/nu/config.nu | 2 ++ 4 files changed, 58 insertions(+), 15 deletions(-) diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 20aaec3..f355365 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,28 +1,54 @@ # 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") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "uas" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; - boot.kernelParams = - [ "intel_iommu=on" "modprobe.blacklist=dvb_usb_rtl28xxu" ]; - boot.kernelModules = [ "kvm-intel" "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ]; + boot.kernelParams = [ + "intel_iommu=on" + "modprobe.blacklist=dvb_usb_rtl28xxu" + ]; + boot.kernelModules = [ + "kvm-intel" + "vfio_pci" + "vfio" + "vfio_iommu_type1" + "vfio_virqfd" + ]; boot.extraModulePackages = [ ]; # 1050 passthrough - boot.extraModprobeConfig = "" - + "options vfio-pci ids=10de:1c81,10de:0fb9\n" + boot.extraModprobeConfig = + "" + + "options vfio-pci ids=10de:1c81,10de:0fb9\n" + '' options hid_apple fnmode=2 ''; # hid_apple -> remove AK68 keyboard F1-F12 not pressing issue - boot.kernel.sysctl = { "hid_apple.fnmode" = 2; "net.ipv4.ip_unprivileged_port_start" = 80; }; + boot.kernel.sysctl = { + "hid_apple.fnmode" = 2; + "net.ipv4.ip_unprivileged_port_start" = 80; + "kernel.split_lock_mitigate" = 0; + }; fileSystems."/" = { device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8"; @@ -33,7 +59,10 @@ fileSystems."/x" = { device = "tmpfs"; fsType = "tmpfs"; - options = [ "size=8G" "mode=1777" ]; + options = [ + "size=8G" + "mode=1777" + ]; }; fileSystems."/home" = { @@ -51,7 +80,10 @@ fileSystems."/boot/efi" = { device = "/dev/disk/by-uuid/E808-5876"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; # fileSystems."/mnt/hdd1" = { @@ -63,7 +95,12 @@ fileSystems."/mnt/ssd1" = { device = "/dev/disk/by-uuid/4e1710bb-2cc9-41c3-909c-34f24bd1f63e"; fsType = "btrfs"; - options = [ "defaults" "ssd" "noatime" "noauto" ]; + options = [ + "defaults" + "ssd" + "noatime" + "noauto" + ]; }; swapDevices = [ ]; @@ -77,6 +114,5 @@ # networking.interfaces.eth0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/home/bash.nix b/modules/home/bash.nix index 2617909..4e2c24f 100644 --- a/modules/home/bash.nix +++ b/modules/home/bash.nix @@ -1,6 +1,10 @@ -{ ... }: { +{ ... }: +{ programs.bash = { enable = true; enableCompletion = true; + initExtra = '' + export PATH="$HOME/.local/bin:$PATH" + ''; }; } diff --git a/pkgs/util.nix b/pkgs/util.nix index a56fa3b..0fde0cf 100644 --- a/pkgs/util.nix +++ b/pkgs/util.nix @@ -106,4 +106,5 @@ with pkgs; tmux pev virtiofsd + exfatprogs ] diff --git a/shell/nu/config.nu b/shell/nu/config.nu index e310f07..13ec580 100644 --- a/shell/nu/config.nu +++ b/shell/nu/config.nu @@ -28,3 +28,5 @@ alias girl = woman alias female = woman source ~/.config/nushell/nu/kube.nu + +alias ccc = with-env { SHELL: "/etc/profiles/per-user/allen/bin/bash" } { tmux new-session claude }