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

home/common/core/nixvim/keymaps.nix

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

home/common/core/nixvim/plugins/telescope.nix

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

hosts/citadel/default.nix

@@ -108,16 +108,21 @@ in {
     XCURSOR_SIZE = "64";
   };
 
-  # services.tlp = {
-  #   enable = true;
-  #   settings = {
-  #     CPU_SCALING_GOVERNOR_ON_AC = "ondemand";
-  #     CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-  #
-  #     START_CHARGE_THRESH_BAT0 = 50;
-  #     STOP_CHARGE_THRESH_BAT0 = 95;
-  #   };
-  # };
+  environment.systemPackages = [
+    pkgs.linuxKernel.packages.linux_zen.cpupower
+    pkgs.lm_sensors
+  ];
+
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_AC = "ondemand";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+      START_CHARGE_THRESH_BAT0 = 60;
+      STOP_CHARGE_THRESH_BAT0 = 85;
+    };
+  };
 
   hardware = {
     bluetooth = {
@@ -148,8 +153,8 @@ in {
     };
     nvidiaPersistenced = true;
     modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
+    powerManagement.enable = true;
+    powerManagement.finegrained = true;
     open = false;
     nvidiaSettings = true;
     # FIXME issue with stable nvidia driver and latest linux kernel
@@ -169,7 +174,6 @@ in {
   # 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
   boot.extraModprobeConfig = ''
-    options nvidia NVreg_DynamicPowerManagement=0x02
     options nvidia NVreg_EnableGpuFirmware=0
   '';
   services.udev.extraRules = ''

hosts/common/core/default.nix

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