sora/nixconfig
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Activity

Fixed Hyprland crashes

Browse Source
This commit is contained in:
soraefir 2023-11-17 03:29:35 +01:00
parent 63941b5c44
commit 22c68c169c
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
6 changed files with 237 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/home/base/default.nix
View File

@ -7,6 +7,6 @@
username = "${config.homecfg.username}"; username = "${config.homecfg.username}";
homeDirectory = "/home/${config.homecfg.username}"; homeDirectory = "/home/${config.homecfg.username}";
stateVersion = "23.05"; stateVersion = "23.11";
}; };
} }

3
modules/home/wayland/apps/kanshi/default.nix
View File

@ -26,6 +26,7 @@
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "0,0"; position = "0,0";
scale = 1.0;
status = "enable"; status = "enable";
}]; }];
}; };
@ -41,6 +42,7 @@
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "2560,0"; position = "2560,0";
scale = 1.0;
status = "enable"; status = "enable";
} }
]; ];
@ -58,6 +60,7 @@
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "1920,0"; position = "1920,0";
scale = 1.0;
status = "enable"; status = "enable";
} }
]; ];

80
modules/home/wayland/hyprland/config.nix
View File

@ -4,7 +4,7 @@
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
extraConfig = '' extraConfig = ''
monitor=,preferred,auto,1 monitor=,preferred,auto,auto
input { input {
kb_layout = us, ru kb_layout = us, ru
@ -29,23 +29,22 @@
animate_mouse_windowdragging=false animate_mouse_windowdragging=false
animate_manual_resizes=false animate_manual_resizes=false
vrr=1 #Note broken on renoir AMD DRM potentially ? vrr=1
} }
general { general {
gaps_in = 5 gaps_in = 4
gaps_out = 5 gaps_out = 8
border_size = 2 border_size = 2
# col.active_border = rgb(${config.colorScheme.colors.base05}) # col.active_border = rgb(${config.colorScheme.colors.base05})
# col.inactive_border = rgb(${config.colorScheme.colors.base03}) # col.inactive_border = rgb(${config.colorScheme.colors.base03})
layout = dwindle layout = dwindle
} }
decoration { decoration {
rounding = 7 rounding = 4
blur { blur {
enabled = true enabled = true
@ -69,12 +68,19 @@
} }
animations { animations {
enabled = false enabled = true
bezier = customcurve, 0.0, 0.9, 0.1, 1.0
animation = windows, 1, 4, customcurve
animation = windowsOut, 1, 4, customcurve, popin 50%
animation = border, 1, 10, customcurve
animation = borderangle, 0, 1, customcurve
animation = fade, 1, 4, customcurve
animation = workspaces, 1, 4, customcurve
} }
dwindle { dwindle {
pseudotile = yes pseudotile = yes
# force_split = 0
preserve_split = yes preserve_split = yes
} }
@ -86,7 +92,8 @@
workspace_swipe = off workspace_swipe = off
} }
exec-once = eww open bar & dunst exec-once = eww open bar
exec-once = dunst
exec-once = swww init exec-once = swww init
@ -112,32 +119,32 @@
windowrule = fullscreen, title:^(wlogout)$ windowrule = fullscreen, title:^(wlogout)$
windowrule = float, title:^(wlogout)$ windowrule = float, title:^(wlogout)$
windowrule = workspace 2 silent, class:^(org.telegram.desktop)$ windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
windowrule = workspace 2 silent, class:^(discord)$ windowrulev2 = workspace 2 silent, class:^(discord)$
windowrule = workspace 8 silent, class:^(org.keepassxc.KeePassXC)$ windowrulev2 = workspace 8 silent, class:^(org.keepassxc.KeePassXC)$
windowrule = workspace 8 silent, title:^(Nextcloud)$ windowrulev2 = workspace 8 silent, title:^(Nextcloud)$
windowrule = workspace 8 silent, class:^(Tk)$,title:^(Server Configuration)$ windowrulev2 = workspace 8 silent, class:^(Tk)$,title:^(Server Configuration)$
#SPECIAL FLOATERS #SPECIAL FLOATERS
windowrule = float,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC - Access Request)$ windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC - Access Request)$
windowrule = pin,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC - Access Request)$ windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(KeePassXC - Access Request)$
windowrule = float,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$ windowrulev2 = float,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
windowrule = pin,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$ windowrulev2 = pin,class:^(org.keepassxc.KeePassXC)$,title:^(Unlock Database - KeePassXC)$
windowrule = float,title:^(Open)$ windowrulev2 = float,title:^(Open)$
windowrule = float,title:^(Choose Files)$ windowrulev2 = float,title:^(Choose Files)$
windowrule = float,title:^(Save As)$ windowrulev2 = float,title:^(Save As)$
windowrule = float,title:^(Confirm to replace files)$ windowrulev2 = float,title:^(Confirm to replace files)$
windowrule = float,title:^(File Operation Progress)$ windowrulev2 = float,title:^(File Operation Progress)$
windowrule = float,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrule = pin,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrule = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrule = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$ windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
windowrule = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$ windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
windowrule = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$ windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
windowrule = nofullscreenrequest,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$ windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
windowrule = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$ windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
windowrule = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$ windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$
#binds #binds
bind = SUPER, RETURN, exec, kitty bind = SUPER, RETURN, exec, kitty
@ -156,11 +163,6 @@
bind = SUPER, L, exec, swaylock bind = SUPER, L, exec, swaylock
# bind = SUPER, P, pseudo, # dwindle
# bind = SUPER, J, togglesplit, # dwindle
# bind = SUPER, G, togglegroup
# bind = SUPER, tab, changegroupactive
bind = SUPER, left, movefocus, l bind = SUPER, left, movefocus, l
bind = SUPER, right, movefocus, r bind = SUPER, right, movefocus, r
bind = SUPER, up, movefocus, u bind = SUPER, up, movefocus, u
@ -208,7 +210,6 @@
}; };
xdg.configFile."startup.sh".text = '' xdg.configFile."startup.sh".text = ''
#!/bin/sh #!/bin/sh
sleep 2 sleep 2
keepassxc & keepassxc &
@ -218,7 +219,8 @@
sleep 2 sleep 2
nextcloud & nextcloud &
telegram-desktop& #telegram-desktop&
#discord&
''; '';
}; };
} }

2
modules/nixos/system/nix/default.nix
View File

@ -32,5 +32,5 @@
]; ];
}; };
}; };
system.stateVersion = "23.05"; system.stateVersion = "23.11";
} }

3
modules/nixos/system/xdg/default.nix
View File

@ -3,7 +3,8 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
# wlr.enable = true; # wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs;
[
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
# xdg-desktop-portal-gtk # xdg-desktop-portal-gtk
]; ];

2
systems/valinor/hardware-configuration.nix
View File

@ -5,7 +5,7 @@
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "v4l2loopback" "kvm-amd" ]; boot.kernelModules = [ "v4l2loopback" "kvm-amd" ];
#boot.kernelPackages = pkgs.linuxPackages_latest; #boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModulePackages = with config.boot.kernelPackages; boot.extraModulePackages = with config.boot.kernelPackages;