Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

This commit is contained in:
Moritz Böhme 2024-08-19 09:59:46 +02:00
commit c249fab5cb
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
17 changed files with 580 additions and 400 deletions

View file

@ -139,7 +139,7 @@ in
windowrulev2 = opaque, class:^(emacs)$
# Fullscreen Applications
${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
${mkRules ["opaque" "noblur" "noborder" "noshadow" "allowsinput"] ["fullscreen:1"]}
${mkRules ["tile" "opaque"] ["class:^(neovide)$"]}

View file

@ -60,9 +60,6 @@ in
sub
);
description = "monitor setting";
default = {
"" = { };
};
};
extraConfig = mkOption {
type = types.str;
@ -81,6 +78,7 @@ in
kitty.enable = true;
rofi.enable = true;
hyprland.monitors."" = lib.mkDefault { };
hyprland.monitors."Unknown-1" = { disabled = true; };
};
wallpapers.enable = true;
services = {
@ -115,6 +113,15 @@ in
# add waybar as a status bar
programs.waybar = {
enable = true;
package = pkgs.waybar.overrideAttrs (old: {
patches = old.patches or [ ] ++ [
(pkgs.fetchpatch {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/waybar/-/raw/0306af03fcb6de6aee1e288f42b0bf1b223513bd/a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch";
sha256 = "sha256-S/1oUj9Aj6BElNTsDY8CTcKtS1j7Gl54JFgCywH05pg=";
})
];
});
# start using systemd service
systemd = {
@ -127,7 +134,7 @@ in
start_hidden = true;
layer = "top";
position = "top";
height = 20;
height = 24;
modules-left = [ "hyprland/workspaces" ];
modules-center = [ "hyprland/window" ];
modules-right = [ "hyprland/language" "network" "memory" "cpu" "battery" "clock" ];