Merge branch 'main' of git.datarift.nl:erwin/nixos-config
This commit is contained in:
commit
be7abdca1c
5 changed files with 18 additions and 10 deletions
|
@ -259,6 +259,7 @@
|
||||||
nixos-install-tools
|
nixos-install-tools
|
||||||
terraform
|
terraform
|
||||||
terraform-ls
|
terraform-ls
|
||||||
|
taplo
|
||||||
|
|
||||||
disko.packages.${system}.disko
|
disko.packages.${system}.disko
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ in
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
follow = "mouse";
|
follow = "mouse";
|
||||||
width = "(10, 500)";
|
width = "(10, 960)";
|
||||||
height = 200;
|
height = 200;
|
||||||
origin = "top-right";
|
origin = "top-right";
|
||||||
offset = "25x25";
|
offset = "25x25";
|
||||||
|
@ -39,7 +39,7 @@ in
|
||||||
separator_color = "frame";
|
separator_color = "frame";
|
||||||
sort = "yes";
|
sort = "yes";
|
||||||
idle_threshold = 120;
|
idle_threshold = 120;
|
||||||
font = "Meslo Nerd Font 10";
|
font = "Iosevka Nerd Font 20";
|
||||||
line_height = 0;
|
line_height = 0;
|
||||||
markup = "full";
|
markup = "full";
|
||||||
format = "%s %p\\n%b";
|
format = "%s %p\\n%b";
|
||||||
|
@ -64,18 +64,18 @@ in
|
||||||
};
|
};
|
||||||
urgency_low = {
|
urgency_low = {
|
||||||
background = "#282a36";
|
background = "#282a36";
|
||||||
foreground = "#6272a4";
|
foreground = "#aaaaaa";
|
||||||
timeout = 10;
|
timeout = 10;
|
||||||
};
|
};
|
||||||
urgency_normal = {
|
urgency_normal = {
|
||||||
background = "#282a36";
|
background = "#282a36";
|
||||||
foreground = "#bd93f9";
|
foreground = "#eeeeee";
|
||||||
timeout = 10;
|
timeout = 10;
|
||||||
};
|
};
|
||||||
urgency_high = {
|
urgency_high = {
|
||||||
background = "#ff5555";
|
background = "#ff5555";
|
||||||
foreground = "#f8f8f2";
|
foreground = "#f8f8f2";
|
||||||
frame_color = "#ff5555";
|
frame_color = "#ffffff";
|
||||||
timeout = 0;
|
timeout = 0;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
base = {
|
base = {
|
||||||
plymouth.enable = true;
|
plymouth.enable = true;
|
||||||
work = true;
|
work = true;
|
||||||
kernel = pkgs.linuxKernel.packages.linux_6_0;
|
kernel = pkgs.linuxKernel.packages.linux_6_1;
|
||||||
};
|
};
|
||||||
|
|
||||||
desktop = {
|
desktop = {
|
||||||
|
@ -171,6 +171,7 @@
|
||||||
programs.ssh.startAgent = true;
|
programs.ssh.startAgent = true;
|
||||||
|
|
||||||
services.envfs.enable = true;
|
services.envfs.enable = true;
|
||||||
|
services.cpupower-gui.enable = true;
|
||||||
|
|
||||||
services.xserver.libinput = {
|
services.xserver.libinput = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||||
boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" ];
|
boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" ];
|
||||||
boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
|
# boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
|
||||||
boot.extraModulePackages = [ ] ++
|
boot.extraModulePackages = [ ] ++
|
||||||
(with config.boot.kernelPackages; [ rtl88x2bu zenpower ]);
|
(with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-label/nixos";
|
device = "/dev/disk/by-label/nixos";
|
||||||
|
@ -30,6 +30,7 @@
|
||||||
[{ device = "/dev/disk/by-label/swap"; }];
|
[{ device = "/dev/disk/by-label/swap"; }];
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = "ondemand";
|
powerManagement.cpuFreqGovernor = "ondemand";
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
video.hidpi.enable = true;
|
video.hidpi.enable = true;
|
||||||
enableAllFirmware = true;
|
enableAllFirmware = true;
|
||||||
|
|
|
@ -90,7 +90,7 @@ in
|
||||||
blink1-tool
|
blink1-tool
|
||||||
bottom
|
bottom
|
||||||
cider
|
cider
|
||||||
commitgpt
|
dbeaver
|
||||||
fd
|
fd
|
||||||
feh
|
feh
|
||||||
ffmpeg_5-full
|
ffmpeg_5-full
|
||||||
|
@ -108,14 +108,17 @@ in
|
||||||
pamedia
|
pamedia
|
||||||
quintom-cursor-theme
|
quintom-cursor-theme
|
||||||
procs
|
procs
|
||||||
|
qgis
|
||||||
recursive
|
recursive
|
||||||
ripgrep
|
ripgrep
|
||||||
signal-desktop
|
s-tui
|
||||||
solo2-cli
|
solo2-cli
|
||||||
|
stress
|
||||||
units
|
units
|
||||||
unzip
|
unzip
|
||||||
xdg-utils
|
xdg-utils
|
||||||
xkb-switch
|
xkb-switch
|
||||||
|
zathura
|
||||||
zeal
|
zeal
|
||||||
]
|
]
|
||||||
++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);
|
++ (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/xhtml+xml" = "firefox.desktop";
|
||||||
"application/x-extension-xhtml" = "firefox.desktop";
|
"application/x-extension-xhtml" = "firefox.desktop";
|
||||||
"application/x-extension-xht" = "firefox.desktop";
|
"application/x-extension-xht" = "firefox.desktop";
|
||||||
|
"application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
|
||||||
};
|
};
|
||||||
associations = {
|
associations = {
|
||||||
added = {
|
added = {
|
||||||
|
@ -144,6 +148,7 @@ in
|
||||||
"image/png" = "feh.desktop";
|
"image/png" = "feh.desktop";
|
||||||
"image/gif" = "feh.desktop";
|
"image/gif" = "feh.desktop";
|
||||||
"application/zip" = "org.gnome.FileRoller.desktop";
|
"application/zip" = "org.gnome.FileRoller.desktop";
|
||||||
|
"application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue