mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-11-22 03:33:55 -05:00
reformat with nixfmt (classic)
This commit is contained in:
Aly Raffauf
parent
d1523ffeab
commit
fb9e82f873
|
|
@ -42,7 +42,8 @@
|
|||
};
|
||||
|
||||
outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager
|
||||
, home-manager-unstable, nixos-hardware, impermanence, disko, disko-unstable, ... }: {
|
||||
, home-manager-unstable, nixos-hardware, impermanence, disko, disko-unstable
|
||||
, ... }: {
|
||||
|
||||
homeConfigurations.aly =
|
||||
home-manager-unstable.lib.homeManagerConfiguration {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ pkgs, lib, config, ... }: {
|
||||
|
||||
options = { cliApps.neofetch.enable = lib.mkEnableOption "Enable neofetch."; };
|
||||
options = {
|
||||
cliApps.neofetch.enable = lib.mkEnableOption "Enable neofetch.";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.cliApps.neofetch.enable {
|
||||
|
||||
|
|
|
|||
|
|
@ -110,215 +110,215 @@
|
|||
gdk_scale = "1.5";
|
||||
|
||||
in ''
|
||||
monitor = desc:BOE 0x0BCA,preferred,auto,1.566667 # lavaridge fw13 matte display
|
||||
monitor = desc:BOE 0x095F,preferred,auto,1.566667# lavaridge fw13 glossy display
|
||||
monitor = desc:LG Electronics LG ULTRAWIDE 311NTAB5M720,preferred,auto,1.25,vrr,2 # mauville
|
||||
monitor = desc:LG Display 0x0569,preferred,auto,1.2 # rustboro
|
||||
monitor = desc:Samsung Display Corp. 0x4152,preferred,auto,2 # petalburg
|
||||
monitor = desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2560x0,1.5 # workshop
|
||||
monitor = desc:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto
|
||||
monitor=,preferred,auto,auto
|
||||
monitor = desc:BOE 0x0BCA,preferred,auto,1.566667 # lavaridge fw13 matte display
|
||||
monitor = desc:BOE 0x095F,preferred,auto,1.566667# lavaridge fw13 glossy display
|
||||
monitor = desc:LG Electronics LG ULTRAWIDE 311NTAB5M720,preferred,auto,1.25,vrr,2 # mauville
|
||||
monitor = desc:LG Display 0x0569,preferred,auto,1.2 # rustboro
|
||||
monitor = desc:Samsung Display Corp. 0x4152,preferred,auto,2 # petalburg
|
||||
monitor = desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2560x0,1.5 # workshop
|
||||
monitor = desc:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto
|
||||
monitor=,preferred,auto,auto
|
||||
|
||||
# unscale XWayland apps
|
||||
xwayland {
|
||||
force_zero_scaling = true
|
||||
}
|
||||
# unscale XWayland apps
|
||||
xwayland {
|
||||
force_zero_scaling = true
|
||||
}
|
||||
|
||||
# toolkit-specific scale
|
||||
env = GDK_SCALE,${gdk_scale}
|
||||
# toolkit-specific scale
|
||||
env = GDK_SCALE,${gdk_scale}
|
||||
|
||||
# Some default env vars.
|
||||
env = XCURSOR_SIZE,${cursor_size}
|
||||
env = QT_QPA_PLATFORMTHEME,${qt_platform_theme}
|
||||
# Some default env vars.
|
||||
env = XCURSOR_SIZE,${cursor_size}
|
||||
env = QT_QPA_PLATFORMTHEME,${qt_platform_theme}
|
||||
|
||||
# Execute necessary apps
|
||||
exec-once = ${pkgs.hyprshade}/bin/hyprshade auto
|
||||
exec-once = ${pkgs.hypridle}/bin/hypridle
|
||||
exec-once = ${wallpaperd}
|
||||
exec-once = ${bar}
|
||||
exec-once = ${notifyd}
|
||||
exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store
|
||||
exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store
|
||||
# Execute necessary apps
|
||||
exec-once = ${pkgs.hyprshade}/bin/hyprshade auto
|
||||
exec-once = ${pkgs.hypridle}/bin/hypridle
|
||||
exec-once = ${wallpaperd}
|
||||
exec-once = ${bar}
|
||||
exec-once = ${notifyd}
|
||||
exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store
|
||||
exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store
|
||||
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input {
|
||||
kb_layout = us
|
||||
follow_mouse = 1
|
||||
sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
|
||||
touchpad {
|
||||
clickfinger_behavior = true
|
||||
drag_lock = true
|
||||
middle_button_emulation = true
|
||||
natural_scroll = yes
|
||||
tap-to-click = true
|
||||
}
|
||||
}
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input {
|
||||
kb_layout = us
|
||||
follow_mouse = 1
|
||||
sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
|
||||
touchpad {
|
||||
clickfinger_behavior = true
|
||||
drag_lock = true
|
||||
middle_button_emulation = true
|
||||
natural_scroll = yes
|
||||
tap-to-click = true
|
||||
}
|
||||
}
|
||||
|
||||
gestures {
|
||||
workspace_swipe = true
|
||||
}
|
||||
gestures {
|
||||
workspace_swipe = true
|
||||
}
|
||||
|
||||
general {
|
||||
gaps_in = 5
|
||||
gaps_out = 10
|
||||
border_size = 2
|
||||
col.active_border = rgba(${border_secondary}) rgba(${border_primary}) 45deg
|
||||
col.inactive_border = rgba(${border_inactive})
|
||||
general {
|
||||
gaps_in = 5
|
||||
gaps_out = 10
|
||||
border_size = 2
|
||||
col.active_border = rgba(${border_secondary}) rgba(${border_primary}) 45deg
|
||||
col.inactive_border = rgba(${border_inactive})
|
||||
|
||||
layout = dwindle
|
||||
layout = dwindle
|
||||
|
||||
allow_tearing = false
|
||||
}
|
||||
allow_tearing = false
|
||||
}
|
||||
|
||||
decoration {
|
||||
rounding = 10
|
||||
blur {
|
||||
enabled = true
|
||||
size = 8
|
||||
passes = 1
|
||||
}
|
||||
drop_shadow = yes
|
||||
shadow_range = 4
|
||||
shadow_render_power = 3
|
||||
col.shadow = rgba(${drop_shadow})
|
||||
decoration {
|
||||
rounding = 10
|
||||
blur {
|
||||
enabled = true
|
||||
size = 8
|
||||
passes = 1
|
||||
}
|
||||
drop_shadow = yes
|
||||
shadow_range = 4
|
||||
shadow_render_power = 3
|
||||
col.shadow = rgba(${drop_shadow})
|
||||
|
||||
dim_special = 0.5
|
||||
dim_special = 0.5
|
||||
|
||||
# Window-specific rules
|
||||
layerrule = blur, waybar
|
||||
layerrule = ignorezero, waybar
|
||||
layerrule = blur, launcher
|
||||
layerrule = blur, notifications
|
||||
layerrule = ignorezero, notifications
|
||||
layerrule = blur, logout_dialog
|
||||
}
|
||||
# Window-specific rules
|
||||
layerrule = blur, waybar
|
||||
layerrule = ignorezero, waybar
|
||||
layerrule = blur, launcher
|
||||
layerrule = blur, notifications
|
||||
layerrule = ignorezero, notifications
|
||||
layerrule = blur, logout_dialog
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled = yes
|
||||
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
|
||||
animations {
|
||||
enabled = yes
|
||||
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
|
||||
|
||||
animation = border, 1, 10, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = fade, 1, 7, default
|
||||
animation = specialWorkspace, 1, 6, default, slidevert
|
||||
animation = windows, 1, 7, myBezier
|
||||
animation = windowsOut, 1, 7, default, popin 80%
|
||||
animation = workspaces, 1, 6, default
|
||||
}
|
||||
animation = border, 1, 10, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = fade, 1, 7, default
|
||||
animation = specialWorkspace, 1, 6, default, slidevert
|
||||
animation = windows, 1, 7, myBezier
|
||||
animation = windowsOut, 1, 7, default, popin 80%
|
||||
animation = workspaces, 1, 6, default
|
||||
}
|
||||
|
||||
dwindle {
|
||||
preserve_split = yes # you probably want this
|
||||
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
||||
}
|
||||
dwindle {
|
||||
preserve_split = yes # you probably want this
|
||||
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
||||
}
|
||||
|
||||
master {
|
||||
always_center_master = true
|
||||
new_is_master = false
|
||||
}
|
||||
master {
|
||||
always_center_master = true
|
||||
new_is_master = false
|
||||
}
|
||||
|
||||
misc {
|
||||
disable_hyprland_logo = true
|
||||
disable_splash_rendering = true
|
||||
focus_on_activate = true
|
||||
vfr = true
|
||||
}
|
||||
misc {
|
||||
disable_hyprland_logo = true
|
||||
disable_splash_rendering = true
|
||||
focus_on_activate = true
|
||||
vfr = true
|
||||
}
|
||||
|
||||
# Window Rules
|
||||
windowrulev2 = center(1),class:(blueberry.py)
|
||||
windowrulev2 = center(1),class:(nmtui)
|
||||
windowrulev2 = center(1),class:(pavucontrol)
|
||||
windowrulev2 = float,class:(blueberry.py)
|
||||
windowrulev2 = float,class:(nmtui)
|
||||
windowrulev2 = float,class:(pavucontrol)
|
||||
windowrulev2 = suppressevent maximize, class:.*
|
||||
# Window Rules
|
||||
windowrulev2 = center(1),class:(blueberry.py)
|
||||
windowrulev2 = center(1),class:(nmtui)
|
||||
windowrulev2 = center(1),class:(pavucontrol)
|
||||
windowrulev2 = float,class:(blueberry.py)
|
||||
windowrulev2 = float,class:(nmtui)
|
||||
windowrulev2 = float,class:(pavucontrol)
|
||||
windowrulev2 = suppressevent maximize, class:.*
|
||||
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = ${modifier}, T, exec, ${terminal}
|
||||
bind = ${modifier}, F, exec, ${fileManager}
|
||||
bind = ${modifier}, B, exec, ${browser}
|
||||
bind = ${modifier}, E, exec, ${editor}
|
||||
bind = ${modifier}, R, exec, ${launcher}
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = ${modifier}, T, exec, ${terminal}
|
||||
bind = ${modifier}, F, exec, ${fileManager}
|
||||
bind = ${modifier}, B, exec, ${browser}
|
||||
bind = ${modifier}, E, exec, ${editor}
|
||||
bind = ${modifier}, R, exec, ${launcher}
|
||||
|
||||
# Manage session.
|
||||
bind = ${modifier}, C, killactive,
|
||||
bind = ${modifier}, M, exec, ${logout}
|
||||
bind = ${modifier}, L, exec, ${lock}
|
||||
# Manage session.
|
||||
bind = ${modifier}, C, killactive,
|
||||
bind = ${modifier}, M, exec, ${logout}
|
||||
bind = ${modifier}, L, exec, ${lock}
|
||||
|
||||
# Basic window management.
|
||||
bind = ${modifier} SHIFT, W, fullscreen
|
||||
bind = ${modifier} SHIFT, V, togglefloating,
|
||||
bind = ${modifier} SHIFT, P, pseudo, # dwindle
|
||||
bind = ${modifier} SHIFT, J, togglesplit, # dwindle
|
||||
# Basic window management.
|
||||
bind = ${modifier} SHIFT, W, fullscreen
|
||||
bind = ${modifier} SHIFT, V, togglefloating,
|
||||
bind = ${modifier} SHIFT, P, pseudo, # dwindle
|
||||
bind = ${modifier} SHIFT, J, togglesplit, # dwindle
|
||||
|
||||
# Move focus with mainMod + arrow keys
|
||||
bind = ${modifier}, left, movefocus, l
|
||||
bind = ${modifier}, right, movefocus, r
|
||||
bind = ${modifier}, up, movefocus, u
|
||||
bind = ${modifier}, down, movefocus, d
|
||||
# Move focus with mainMod + arrow keys
|
||||
bind = ${modifier}, left, movefocus, l
|
||||
bind = ${modifier}, right, movefocus, r
|
||||
bind = ${modifier}, up, movefocus, u
|
||||
bind = ${modifier}, down, movefocus, d
|
||||
|
||||
# Gnome-like workspaces.
|
||||
bind = ${modifier}, 1, exec, ${hyprnome} --previous
|
||||
bind = ${modifier}, 2, exec, ${hyprnome}
|
||||
bind = ${modifier} SHIFT, 1, exec, ${hyprnome} --previous --move
|
||||
bind = ${modifier} SHIFT, 2, exec, ${hyprnome} --move
|
||||
# Gnome-like workspaces.
|
||||
bind = ${modifier}, 1, exec, ${hyprnome} --previous
|
||||
bind = ${modifier}, 2, exec, ${hyprnome}
|
||||
bind = ${modifier} SHIFT, 1, exec, ${hyprnome} --previous --move
|
||||
bind = ${modifier} SHIFT, 2, exec, ${hyprnome} --move
|
||||
|
||||
# # Switch workspaces with mainMod + [0-9]
|
||||
# bind = ${modifier}, 1, workspace, 1
|
||||
# bind = ${modifier}, 2, workspace, 2
|
||||
# bind = ${modifier}, 3, workspace, 3
|
||||
# bind = ${modifier}, 4, workspace, 4
|
||||
# bind = ${modifier}, 5, workspace, 5
|
||||
# bind = ${modifier}, 6, workspace, 6
|
||||
# bind = ${modifier}, 7, workspace, 7
|
||||
# bind = ${modifier}, 8, workspace, 8
|
||||
# bind = ${modifier}, 9, workspace, 9
|
||||
# bind = ${modifier}, 0, workspace, 10
|
||||
# # Switch workspaces with mainMod + [0-9]
|
||||
# bind = ${modifier}, 1, workspace, 1
|
||||
# bind = ${modifier}, 2, workspace, 2
|
||||
# bind = ${modifier}, 3, workspace, 3
|
||||
# bind = ${modifier}, 4, workspace, 4
|
||||
# bind = ${modifier}, 5, workspace, 5
|
||||
# bind = ${modifier}, 6, workspace, 6
|
||||
# bind = ${modifier}, 7, workspace, 7
|
||||
# bind = ${modifier}, 8, workspace, 8
|
||||
# bind = ${modifier}, 9, workspace, 9
|
||||
# bind = ${modifier}, 0, workspace, 10
|
||||
|
||||
# # Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
# bind = ${modifier} SHIFT, 1, movetoworkspace, 1
|
||||
# bind = ${modifier} SHIFT, 2, movetoworkspace, 2
|
||||
# bind = ${modifier} SHIFT, 3, movetoworkspace, 3
|
||||
# bind = ${modifier} SHIFT, 4, movetoworkspace, 4
|
||||
# bind = ${modifier} SHIFT, 5, movetoworkspace, 5
|
||||
# bind = ${modifier} SHIFT, 6, movetoworkspace, 6
|
||||
# bind = ${modifier} SHIFT, 7, movetoworkspace, 7
|
||||
# bind = ${modifier} SHIFT, 8, movetoworkspace, 8
|
||||
# bind = ${modifier} SHIFT, 9, movetoworkspace, 9
|
||||
# bind = ${modifier} SHIFT, 0, movetoworkspace, 10
|
||||
# # Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
# bind = ${modifier} SHIFT, 1, movetoworkspace, 1
|
||||
# bind = ${modifier} SHIFT, 2, movetoworkspace, 2
|
||||
# bind = ${modifier} SHIFT, 3, movetoworkspace, 3
|
||||
# bind = ${modifier} SHIFT, 4, movetoworkspace, 4
|
||||
# bind = ${modifier} SHIFT, 5, movetoworkspace, 5
|
||||
# bind = ${modifier} SHIFT, 6, movetoworkspace, 6
|
||||
# bind = ${modifier} SHIFT, 7, movetoworkspace, 7
|
||||
# bind = ${modifier} SHIFT, 8, movetoworkspace, 8
|
||||
# bind = ${modifier} SHIFT, 9, movetoworkspace, 9
|
||||
# bind = ${modifier} SHIFT, 0, movetoworkspace, 10
|
||||
|
||||
# Example special workspace (scratchpad)
|
||||
bind = ${modifier}, S, togglespecialworkspace, magic
|
||||
bind = ${modifier} SHIFT, S, movetoworkspace, special:magic
|
||||
# Example special workspace (scratchpad)
|
||||
bind = ${modifier}, S, togglespecialworkspace, magic
|
||||
bind = ${modifier} SHIFT, S, movetoworkspace, special:magic
|
||||
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
bind = ${modifier}, mouse_down, workspace, e+1
|
||||
bind = ${modifier}, mouse_up, workspace, e-1
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
bind = ${modifier}, mouse_down, workspace, e+1
|
||||
bind = ${modifier}, mouse_up, workspace, e-1
|
||||
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
bindm = ${modifier}, mouse:272, movewindow
|
||||
bindm = ${modifier}, mouse:273, resizewindow
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
bindm = ${modifier}, mouse:272, movewindow
|
||||
bindm = ${modifier}, mouse:273, resizewindow
|
||||
|
||||
# Display, volume, microphone, and media keys.
|
||||
bindle = , xf86monbrightnessup, exec, ${brightness_up}
|
||||
bindle = , xf86monbrightnessdown, exec, ${brightness_down}
|
||||
bindle = , xf86audioraisevolume, exec, ${volume_up};
|
||||
bindle = , xf86audiolowervolume, exec, ${volume_down};
|
||||
bindl = , xf86audiomute, exec, ${volume_mute}
|
||||
bindl = , xf86audiomicmute, exec, ${mic_mute}
|
||||
bindl = , xf86audioplay, exec, ${media_play}
|
||||
bindl = , xf86audioprev, exec, ${media_previous}
|
||||
bindl = , xf86audionext, exec, ${media_next}
|
||||
# Display, volume, microphone, and media keys.
|
||||
bindle = , xf86monbrightnessup, exec, ${brightness_up}
|
||||
bindle = , xf86monbrightnessdown, exec, ${brightness_down}
|
||||
bindle = , xf86audioraisevolume, exec, ${volume_up};
|
||||
bindle = , xf86audiolowervolume, exec, ${volume_down};
|
||||
bindl = , xf86audiomute, exec, ${volume_mute}
|
||||
bindl = , xf86audiomicmute, exec, ${mic_mute}
|
||||
bindl = , xf86audioplay, exec, ${media_play}
|
||||
bindl = , xf86audioprev, exec, ${media_previous}
|
||||
bindl = , xf86audionext, exec, ${media_next}
|
||||
|
||||
# Extra bindings for petalburg.
|
||||
bind = , xf86launch4, exec, pp-adjuster
|
||||
bind = , xf86launch1, exec, ${pkgs.hyprshade}/bin/hyprshade toggle
|
||||
bind = , xf86launch2, exec, ${media_play}
|
||||
# Extra bindings for petalburg.
|
||||
bind = , xf86launch4, exec, pp-adjuster
|
||||
bind = , xf86launch1, exec, ${pkgs.hyprshade}/bin/hyprshade toggle
|
||||
bind = , xf86launch2, exec, ${media_play}
|
||||
|
||||
# Screenshot with hyprshot.
|
||||
bind = , PRINT, exec, ${screenshot_screen}
|
||||
# Screenshot with hyprshot.
|
||||
bind = , PRINT, exec, ${screenshot_screen}
|
||||
|
||||
# Show/hide waybar.
|
||||
bind = ${modifier}, F11, exec, pkill -SIGUSR1 waybar
|
||||
# Show/hide waybar.
|
||||
bind = ${modifier}, F11, exec, pkill -SIGUSR1 waybar
|
||||
'';
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ in {
|
|||
# Packages that should be installed to the user profile.
|
||||
home.packages = with pkgs; [ hyprpaper-random ];
|
||||
|
||||
wayland.windowManager.hyprland.extraConfig = "exec-once = ${hyprpaper-random}/bin/hyprpaper-random";
|
||||
wayland.windowManager.hyprland.extraConfig =
|
||||
"exec-once = ${hyprpaper-random}/bin/hyprpaper-random";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ pkgs, lib, config, ... }: {
|
||||
|
||||
options = {
|
||||
desktopEnv.sway.enable =
|
||||
lib.mkEnableOption "Sway with extra apps.";
|
||||
desktopEnv.sway.enable = lib.mkEnableOption "Sway with extra apps.";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktopEnv.sway.enable {
|
||||
|
|
@ -47,7 +46,7 @@
|
|||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [ pkgs.xdg-desktop-portal-wlr];
|
||||
configPackages = [ pkgs.xdg-desktop-portal-wlr ];
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,9 +28,7 @@
|
|||
|
||||
systemConfig = {
|
||||
plymouth.enable = true;
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
};
|
||||
zramSwap = { enable = true; };
|
||||
};
|
||||
|
||||
desktopConfig = {
|
||||
|
|
|
|||
|
|
@ -82,9 +82,7 @@ in {
|
|||
|
||||
systemConfig = {
|
||||
plymouth.enable = true;
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
};
|
||||
zramSwap = { enable = true; };
|
||||
};
|
||||
|
||||
apps = {
|
||||
|
|
|
|||
|
|
@ -19,9 +19,7 @@
|
|||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/persist" = {
|
||||
neededForBoot = true;
|
||||
};
|
||||
fileSystems."/persist" = { neededForBoot = true; };
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,35 @@
|
|||
{ pkgs, lib, config, ... }: {
|
||||
|
||||
options = {
|
||||
desktopConfig.desktopEnvironments.gnome.fprintdFix.enable = lib.mkEnableOption
|
||||
desktopConfig.desktopEnvironments.gnome.fprintdFix.enable =
|
||||
lib.mkEnableOption
|
||||
"Fixes fprintd and pam issues with GNOME Display Manager.";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktopConfig.desktopEnvironments.gnome.fprintdFix.enable {
|
||||
# Need to change the order pam loads its modules
|
||||
# to get proper fingerprint behavior on GDM and the lockscreen.
|
||||
security.pam.services.login.fprintAuth = false;
|
||||
security.pam.services.gdm-fingerprint =
|
||||
lib.mkIf (config.services.fprintd.enable) {
|
||||
text = ''
|
||||
auth required pam_shells.so
|
||||
auth requisite pam_nologin.so
|
||||
auth requisite pam_faillock.so preauth
|
||||
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
|
||||
auth optional pam_permit.so
|
||||
auth required pam_env.so
|
||||
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
|
||||
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
|
||||
config =
|
||||
lib.mkIf config.desktopConfig.desktopEnvironments.gnome.fprintdFix.enable {
|
||||
# Need to change the order pam loads its modules
|
||||
# to get proper fingerprint behavior on GDM and the lockscreen.
|
||||
security.pam.services.login.fprintAuth = false;
|
||||
security.pam.services.gdm-fingerprint =
|
||||
lib.mkIf (config.services.fprintd.enable) {
|
||||
text = ''
|
||||
auth required pam_shells.so
|
||||
auth requisite pam_nologin.so
|
||||
auth requisite pam_faillock.so preauth
|
||||
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
|
||||
auth optional pam_permit.so
|
||||
auth required pam_env.so
|
||||
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
|
||||
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
|
||||
|
||||
account include login
|
||||
account include login
|
||||
|
||||
password required pam_deny.so
|
||||
password required pam_deny.so
|
||||
|
||||
session include login
|
||||
session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
'';
|
||||
};
|
||||
};
|
||||
session include login
|
||||
session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,20 +5,21 @@
|
|||
lib.mkEnableOption "Enables dynamic triple buffering for GNOME.";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktopConfig.desktopEnvironments.gnome.tripleBuffering.enable {
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
|
||||
mutter = gnomePrev.mutter.overrideAttrs (old: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://gitlab.gnome.org/vanvugt/mutter.git";
|
||||
# GNOME 45: triple-buffering-v4-45
|
||||
rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
|
||||
sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
|
||||
};
|
||||
config = lib.mkIf
|
||||
config.desktopConfig.desktopEnvironments.gnome.tripleBuffering.enable {
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
|
||||
mutter = gnomePrev.mutter.overrideAttrs (old: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://gitlab.gnome.org/vanvugt/mutter.git";
|
||||
# GNOME 45: triple-buffering-v4-45
|
||||
rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
|
||||
sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
|
||||
};
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
];
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
enable = true;
|
||||
settings = rec {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland";
|
||||
command =
|
||||
"${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue