sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.bitlab21.com:sam/nixos

This commit is contained in:
Sam 2024-11-26 15:11:24 +00:00
parent ceeb920d5a ab4c5dc96f
commit 7c854cb4f4
4 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home/common/core/nixvim/keymaps.nix
View File

@ -100,13 +100,13 @@ programs.nixvim.keymaps = [
# move selected line up or down # move selected line up or down
{ {
mode = ["v"]; mode = ["v"];
key = "J"; key = "<C-d>";
action = ":m '>+1<CR>gv=gv"; action = ":m '>+1<CR>gv=gv";
options = {noremap = true;}; options = {noremap = true;};
} }
{ {
mode = ["v"]; mode = ["v"];
key = "K"; key = "<C-u>";
action = ":m '<-2<CR>gv=gv"; action = ":m '<-2<CR>gv=gv";
options = {noremap = true;}; options = {noremap = true;};
} }

2
home/common/core/nixvim/plugins/telescope.nix
View File

@ -22,7 +22,7 @@
# grep string under cursor # grep string under cursor
mode = ["n"]; mode = ["n"];
key = "<Leader>fs"; key = "<Leader>fs";
action = "<cmd>Telescope string_grep<CR>"; action = "<cmd>Telescope grep_string<CR>";
options = {noremap = true;}; options = {noremap = true;};
} }
{ {

66
hosts/citadel/default.nix
View File

@ -108,16 +108,21 @@ in {
XCURSOR_SIZE = "64"; XCURSOR_SIZE = "64";
}; };
# services.tlp = { environment.systemPackages = [
# enable = true; pkgs.linuxKernel.packages.linux_zen.cpupower
# settings = { pkgs.lm_sensors
# CPU_SCALING_GOVERNOR_ON_AC = "ondemand"; ];
# CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
# services.tlp = {
# START_CHARGE_THRESH_BAT0 = 50; enable = true;
# STOP_CHARGE_THRESH_BAT0 = 95; settings = {
# }; CPU_SCALING_GOVERNOR_ON_AC = "ondemand";
# }; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
START_CHARGE_THRESH_BAT0 = 60;
STOP_CHARGE_THRESH_BAT0 = 85;
};
};
hardware = { hardware = {
bluetooth = { bluetooth = {
@ -135,7 +140,7 @@ in {
enable = true; enable = true;
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = { hardware.nvidia = {
prime = { prime = {
@ -148,8 +153,8 @@ in {
}; };
nvidiaPersistenced = true; nvidiaPersistenced = true;
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = true;
powerManagement.finegrained = false; powerManagement.finegrained = true;
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
# FIXME issue with stable nvidia driver and latest linux kernel # FIXME issue with stable nvidia driver and latest linux kernel
@ -169,26 +174,25 @@ in {
# https://discourse.nixos.org/t/how-to-use-nvidia-prime-offload-to-run-the-x-server-on-the-integrated-board/9091/15 # https://discourse.nixos.org/t/how-to-use-nvidia-prime-offload-to-run-the-x-server-on-the-integrated-board/9091/15
# for udev rules to disable dGPU when not in use # for udev rules to disable dGPU when not in use
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options nvidia NVreg_DynamicPowerManagement=0x02
options nvidia NVreg_EnableGpuFirmware=0 options nvidia NVreg_EnableGpuFirmware=0
''; '';
services.udev.extraRules = '' services.udev.extraRules = ''
# Remove NVIDIA USB xHCI Host Controller devices, if present # Remove NVIDIA USB xHCI Host Controller devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
# Remove NVIDIA USB Type-C UCSI devices, if present # Remove NVIDIA USB Type-C UCSI devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1" ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1"
# Remove NVIDIA Audio devices, if present # Remove NVIDIA Audio devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1" ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1"
# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto" ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto" ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
# Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on" ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"
''; '';
networking = { networking = {

1
hosts/common/core/default.nix
View File

@ -49,7 +49,6 @@ in
pkgs.just pkgs.just
pkgs.git pkgs.git
pkgs.vim pkgs.vim
pkgs.linuxKernel.packages.linux_zen.cpupower
]; ];
system.stateVersion = "24.05"; system.stateVersion = "24.05";