summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/nvim/init.lua6
-rw-r--r--config/themes.nix6
-rw-r--r--machines/x/configuration.nix4
-rw-r--r--modules/amdgpu.nix4
-rw-r--r--modules/core/audio.nix2
-rw-r--r--modules/core/global.nix2
-rw-r--r--modules/laptop.nix16
-rw-r--r--packages/dwl.nix2
8 files changed, 32 insertions, 10 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index a906307..ccc010d 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -77,10 +77,12 @@ require('ibl').setup()
require('Comment').setup {
padding = true,
toggler = {
- line = '\\\\'
+ line = '\\\\',
+ block = ']]'
},
opleader = {
- block = '\\\\'
+ line = '\\\\',
+ block = ']]'
}
}
diff --git a/config/themes.nix b/config/themes.nix
index 818b32d..b406f36 100644
--- a/config/themes.nix
+++ b/config/themes.nix
@@ -5,7 +5,7 @@
gtk.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
- size = 24;
+ size = 16;
};
gtk = {
@@ -15,6 +15,10 @@
iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; };
font = { name = "UbuntuMono Nerd Font Mono"; };
+
+ gtk3.extraConfig = {
+ gtk-decoration-layout = "appmenu:none";
+ };
};
qt = {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index 256e4d2..e2caa0e 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -38,6 +38,10 @@
xdg.portal.wlr.enable = true;
xdg.portal.config.common.default = "*";
+ environment.variables = {
+ XCURSOR_SIZE = "16";
+ };
+
networking.extraHosts =
''
127.0.0.1 download.labsmartlis.local
diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix
index 6c1f109..bc29a29 100644
--- a/modules/amdgpu.nix
+++ b/modules/amdgpu.nix
@@ -24,6 +24,6 @@
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
- boot.kernelPackages = pkgs.linuxPackages_zen;
- boot.kernelParams = [ "pcie_acs_override=downstream,multifunction"];
+ boot.kernelPackages = pkgs.linuxPackages_xanmod;
+ boot.kernelParams = [ "pcie_acs_override=downstream,multifunction" ];
}
diff --git a/modules/core/audio.nix b/modules/core/audio.nix
index 9e45d9e..ae01cc7 100644
--- a/modules/core/audio.nix
+++ b/modules/core/audio.nix
@@ -9,6 +9,6 @@
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
- wireplumber.enable = true;
+ # wireplumber.enable = true;
};
}
diff --git a/modules/core/global.nix b/modules/core/global.nix
index 138d970..2e7ed90 100644
--- a/modules/core/global.nix
+++ b/modules/core/global.nix
@@ -11,8 +11,6 @@ in {
nixPath = [ "nixpkgs=${nix_path}" ];
};
- boot.kernelParams = [ "quiet" "splash" ];
-
systemd.tmpfiles.rules = [
"L+ ${nix_path} - - - - ${pkgs.path}"
];
diff --git a/modules/laptop.nix b/modules/laptop.nix
index f619d78..4eb401b 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
{
services.tlp = {
@@ -10,10 +10,24 @@
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+ PLATFORM_PROFILE_ON_AC = "performance";
+ PLATFORM_PROFILE_ON_BAT = "low-power";
+
+ CPU_BOOST_ON_AC = 1;
+ CPU_BOOST_ON_BAT = 0;
+
+ CPU_HWP_DYN_BOOST_ON_AC = 1;
+ CPU_HWP_DYN_BOOST_ON_BAT = 0;
+
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
};
};
+
+ boot = {
+ kernelModules = [ "acpi_call" ];
+ extraModulePackages = [ config.boot.kernelPackages.acpi_call ];
+ };
}
diff --git a/packages/dwl.nix b/packages/dwl.nix
index db1ab65..fc90591 100644
--- a/packages/dwl.nix
+++ b/packages/dwl.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "compromyse";
repo = "dwl";
rev = "master";
- hash = "sha256-u+lTcWKhYoZrfYCCOk/koMrFRUvobF3Utfc+mjPuXSM=";
+ hash = "sha256-Ut1/uik8YzvySpKKfWG+rScHLk93qtDC0VXfJ+h8JqA=";
};
nativeBuildInputs = [