Merge branch 'main' of git.datarift.nl:erwin/nixos-config

This commit is contained in:
Erwin Boskma 2023-02-06 15:25:07 +01:00
commit be7abdca1c
Signed by: erwin
SSH key fingerprint: SHA256:CyeNoWXd3kjX2Nwu6pDxxdS7OqmPVOy0NavA/KU/ntU
5 changed files with 18 additions and 10 deletions

View file

@ -259,6 +259,7 @@
nixos-install-tools
terraform
terraform-ls
taplo
disko.packages.${system}.disko

View file

@ -23,7 +23,7 @@ in
settings = {
global = {
follow = "mouse";
width = "(10, 500)";
width = "(10, 960)";
height = 200;
origin = "top-right";
offset = "25x25";
@ -39,7 +39,7 @@ in
separator_color = "frame";
sort = "yes";
idle_threshold = 120;
font = "Meslo Nerd Font 10";
font = "Iosevka Nerd Font 20";
line_height = 0;
markup = "full";
format = "%s %p\\n%b";
@ -64,18 +64,18 @@ in
};
urgency_low = {
background = "#282a36";
foreground = "#6272a4";
foreground = "#aaaaaa";
timeout = 10;
};
urgency_normal = {
background = "#282a36";
foreground = "#bd93f9";
foreground = "#eeeeee";
timeout = 10;
};
urgency_high = {
background = "#ff5555";
foreground = "#f8f8f2";
frame_color = "#ff5555";
frame_color = "#ffffff";
timeout = 0;
};
};

View file

@ -36,7 +36,7 @@
base = {
plymouth.enable = true;
work = true;
kernel = pkgs.linuxKernel.packages.linux_6_0;
kernel = pkgs.linuxKernel.packages.linux_6_1;
};
desktop = {
@ -171,6 +171,7 @@
programs.ssh.startAgent = true;
services.envfs.enable = true;
services.cpupower-gui.enable = true;
services.xserver.libinput = {
enable = true;

View file

@ -2,9 +2,9 @@
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" ];
boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
# boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
boot.extraModulePackages = [ ] ++
(with config.boot.kernelPackages; [ rtl88x2bu zenpower ]);
(with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
@ -30,6 +30,7 @@
[{ device = "/dev/disk/by-label/swap"; }];
powerManagement.cpuFreqGovernor = "ondemand";
hardware = {
video.hidpi.enable = true;
enableAllFirmware = true;

View file

@ -90,7 +90,7 @@ in
blink1-tool
bottom
cider
commitgpt
dbeaver
fd
feh
ffmpeg_5-full
@ -108,14 +108,17 @@ in
pamedia
quintom-cursor-theme
procs
qgis
recursive
ripgrep
signal-desktop
s-tui
solo2-cli
stress
units
unzip
xdg-utils
xkb-switch
zathura
zeal
]
++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);
@ -137,6 +140,7 @@ in
"application/xhtml+xml" = "firefox.desktop";
"application/x-extension-xhtml" = "firefox.desktop";
"application/x-extension-xht" = "firefox.desktop";
"application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
};
associations = {
added = {
@ -144,6 +148,7 @@ in
"image/png" = "feh.desktop";
"image/gif" = "feh.desktop";
"application/zip" = "org.gnome.FileRoller.desktop";
"application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
};
};
};