diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index 53bab33..22394a7 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -42,24 +42,24 @@ in { "Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" {} ( xserverbase + '' - cat << EOF >> $out - ${builtins.readFile ./1_mon.conf} - EOF + cat ${./1_mon.conf} >> $out '' ); "Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" {} ( xserverbase + '' - cat << EOF >> $out - ${builtins.readFile ./2_mon.conf} - EOF + cat ${./2_mon.conf} >> $out '' ); }; ####VM SOUND BORKED services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire; boot = { - kernelParams = ["amd_iommu=on" "iommu=pt" "vfio_iommu_type1.allow_unsafe_interrupts=1" "kvm.ignore_msrs=1"]; + kernelParams = [ + "amd_iommu=on" + "vfio_iommu_type1.allow_unsafe_interrupts=1" + "kvm.ignore_msrs=1" + ]; }; virtualisation = { libvirtd = { diff --git a/modules/boot/misc.nix b/modules/boot/misc.nix index c93a11f..6fa96be 100644 --- a/modules/boot/misc.nix +++ b/modules/boot/misc.nix @@ -11,7 +11,31 @@ }; boot = { blacklistedKernelModules = ["pcspkr"]; - kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"]; + kernelParams = [ + "acpi_call" + "pti=auto" + "randomize_kstack_offset=on" + "vsyscall=none" + "slab_nomerge" + "module.sig_enforce=1" + "lockdown=confidentiality" + "page_poison=1" + "page_alloc.shuffle=1" + "sysrq_always_enabled=0" + "idle=nomwait" + "rootflags=noatime" + "iommu=pt" + "usbcore.autosuspend=-1" + "noresume" + "acpi_backlight=native" + "logo.nologo" + "fbcon=nodefer" + "bgrt_disable" + "quiet" + "systemd.show_status=false" + "rd.udev.log_level=3" + "vt.global_cursor_default=0" + ]; consoleLogLevel = 3; initrd.verbose = false; plymouth = { diff --git a/modules/git.nix b/modules/git.nix index 85b4a9c..59f5979 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -24,6 +24,7 @@ _: { push = { autoSetupRemote = true; }; + advice.addIgnoredFile = false; }; }; }; diff --git a/modules/shell.nix b/modules/shell.nix index 4940023..123a214 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -20,8 +20,9 @@ variables = { EDITOR = "nvim"; VISUAL = "nvim"; - PAGER = "page"; + PAGER = "page -WfC -q 90000 -z 90000"; SYSTEMD_PAGERSECURE = "true"; + MANPAGER = "page -t man"; }; shellAliases = { #make sudo use aliases @@ -44,6 +45,7 @@ lx = "exa -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; lS = "exa -1"; lt = "exa --tree --level=2"; + page = config.environment.variables.PAGER; }; interactiveShellInit = "fetch-rs"; }; @@ -67,6 +69,13 @@ histSize = 10000; histFile = "$HOME/.cache/zsh_history"; interactiveShellInit = '' + ### pager ### + man () { + PROGRAM="''${@[-1]}" + SECTION="''${@[-2]}" + page -W "man://$PROGRAM''${SECTION:+($SECTION)}" + } + ### transient shell prompt ### zle-line-init() { emulate -L zsh