misc general changes / nixpkgs break fixes
This commit is contained in:
parent
4b90113a54
commit
a5b19fc918
GPG key ID:
4C88A185FB89301E
15 changed files with 272 additions and 67 deletions
|
|
@ -1,11 +1,15 @@
|
|||
{ system, inputs, impurity, lib, config, pkgs, ... }: let
|
||||
inherit (inputs) hyprland hyprland-hy3 quickshell;
|
||||
inherit (inputs) hyprland hyprsunset hyprpicker hyprland-hy3 quickshell;
|
||||
|
||||
exe = hyprland.packages.${system}.default.overrideAttrs (final: prev: {
|
||||
dontStrip = true;
|
||||
});
|
||||
|
||||
# I blame home manager
|
||||
wrapper = pkgs.callPackage ({ ... }: pkgs.writeShellScriptBin "hyprland" ''
|
||||
${builtins.readFile ./session.sh}
|
||||
${config.hyprland-session.prerun}
|
||||
${hyprland.packages.${system}.default}/bin/Hyprland $@
|
||||
${lib.getExe exe} $@
|
||||
'') {};
|
||||
in {
|
||||
imports = [ hyprland.nixosModules.default ];
|
||||
|
|
@ -20,6 +24,12 @@ in {
|
|||
type = types.separatedString "\n";
|
||||
default = "";
|
||||
};
|
||||
|
||||
# same as above but no impurity so the greeter works
|
||||
extraConfigStatic = mkOption {
|
||||
type = types.separatedString "\n";
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
|
@ -54,7 +64,10 @@ in {
|
|||
grim
|
||||
slurp
|
||||
playerctl
|
||||
wf-recorder
|
||||
wl-screenrec
|
||||
|
||||
hyprsunset.packages.${system}.default
|
||||
hyprpicker.packages.${system}.default
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
exec-once = quickshell -c shell
|
||||
exec-once = qs -c shell
|
||||
|
||||
exec = systemctl start --user emacs.service && emacsclient -e "(setenv \"HYPRLAND_INSTANCE_SIGNATURE\" \"$HYPRLAND_INSTANCE_SIGNATURE\")"
|
||||
|
||||
|
|
@ -17,7 +17,6 @@ input {
|
|||
kb_layout = us
|
||||
sensitivity = 0
|
||||
follow_mouse = 1
|
||||
mouse_refocus = false
|
||||
accel_profile = flat
|
||||
}
|
||||
|
||||
|
|
@ -31,13 +30,17 @@ decoration {
|
|||
noise = 0.008
|
||||
contrast = 0.8916
|
||||
brightness = 0.8
|
||||
input_methods = yes
|
||||
}
|
||||
|
||||
drop_shadow = no
|
||||
shadow {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled = yes
|
||||
first_launch_animation = no
|
||||
|
||||
bezier = windowIn, 0.06, 0.71, 0.25, 1
|
||||
bezier = windowResize, 0.04, 0.67, 0.38, 1
|
||||
|
|
@ -48,7 +51,7 @@ animations {
|
|||
animation = border, 1, 10, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = fade, 1, 3, default
|
||||
animation = workspaces, 1, 6, default
|
||||
animation = workspaces, 1, 6, default, slidevert
|
||||
animation = layers, 1, 5, windowIn, slide
|
||||
}
|
||||
|
||||
|
|
@ -62,22 +65,28 @@ gestures {
|
|||
misc {
|
||||
disable_hyprland_logo = true
|
||||
disable_splash_rendering = true
|
||||
vrr = 1
|
||||
no_direct_scanout = false
|
||||
key_press_enables_dpms = true
|
||||
}
|
||||
|
||||
render {
|
||||
explicit_sync = true
|
||||
#direct_scanout = true
|
||||
}
|
||||
|
||||
binds {
|
||||
workspace_back_and_forth = true
|
||||
}
|
||||
|
||||
plugin {
|
||||
hy3 {
|
||||
tabs {
|
||||
height = 2
|
||||
padding = 6
|
||||
render_text = false
|
||||
}
|
||||
tabs {
|
||||
border_width = 1
|
||||
col.active = rgba(33ccff20)
|
||||
col.border.active = rgba(33ccffee)
|
||||
col.text.active = rgba(ffffffff)
|
||||
col.inactive = rgba(30303020)
|
||||
col.border.inactive = rgba(595959aa)
|
||||
}
|
||||
|
||||
autotile {
|
||||
enable = true
|
||||
|
|
@ -87,8 +96,13 @@ plugin {
|
|||
}
|
||||
}
|
||||
|
||||
misc {
|
||||
vfr = on
|
||||
}
|
||||
|
||||
debug {
|
||||
disable_logs = no
|
||||
overlay = off
|
||||
}
|
||||
|
||||
monitor = , preferred, auto, 1
|
||||
|
|
@ -110,10 +124,15 @@ layerrule = animation fade, shell:background
|
|||
layerrule = blur, shell:bar
|
||||
layerrule = blurpopups, shell:bar
|
||||
layerrule = ignorezero, shell:bar
|
||||
layerrule = noanim, shell:bar
|
||||
layerrule = blur, shell:notifications
|
||||
layerrule = ignorezero, shell:notifications
|
||||
layerrule = noanim, shell:notifications
|
||||
|
||||
layerrule = noanim, shell:screenshot
|
||||
|
||||
layerrule = blur, shell:launcher
|
||||
layerrule = ignorezero, shell:launcher
|
||||
layerrule = animation popin 90%, shell:launcher
|
||||
|
||||
windowrulev2 = float, class:^(opensnitch_ui)$
|
||||
windowrulev2 = dimaround, class:^(opensnitch_ui)$
|
||||
|
|
@ -125,11 +144,12 @@ windowrulev2 = float, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
|||
windowrulev2 = size 1000 700, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = center, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = dimaround, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = float, title:^(OpenSSH Authentication Passphrase request)$
|
||||
|
||||
windowrulev2 = float, class:^(AlacrittyFloating)$
|
||||
|
||||
$mod = SUPER
|
||||
$launcher = walker
|
||||
$launcher = qs msg -c shell launcher open
|
||||
|
||||
bind = $mod+SHIFT, m, exit
|
||||
|
||||
|
|
@ -138,12 +158,12 @@ bind = $mod+SHIFT, return, exec, alacritty --class AlacrittyFloating
|
|||
bind = $mod, grave, exec, $launcher
|
||||
bind = $mod+SHIFT, q, hy3:killactive
|
||||
|
||||
bind = $mod+SHIFT, s, global, shell:screenshot
|
||||
bind = $mod, c, global, shell:termselect
|
||||
bind = $mod, PERIOD, exec, quickshell -c lockscreen
|
||||
bind = $mod+SHIFT, s, exec, qs msg -c shell screenshot takeScreenshot
|
||||
bind = $mod, PERIOD, exec, qs msg -c shell lockscreen lock
|
||||
|
||||
bind = $mod, f, fullscreen, 1
|
||||
bind = $mod+SHIFT, f, fullscreen, 0
|
||||
bind = $mod, tab, hy3:togglefocuslayer
|
||||
bind = $mod+SHIFT, tab, togglefloating
|
||||
|
||||
bind = $mod, d, hy3:makegroup, h
|
||||
|
|
@ -162,10 +182,18 @@ bindn = , mouse_down, hy3:focustab, l, require_hovered
|
|||
bindn = , mouse_up, hy3:focustab, r, require_hovered
|
||||
bind = $mod, q, hy3:warpcursor
|
||||
|
||||
bind = ,XF86AudioPlay, exec, playerctl play-pause
|
||||
bind = ,XF86AudioStop, exec, playerctl -a stop
|
||||
bind = ,XF86AudioNext, exec, playerctl next
|
||||
bind = ,XF86AudioPrev, exec, playerctl previous
|
||||
bind = $mod, i, exec, hyprctl keyword plugin:hy3:tabs:height 20
|
||||
bind = $mod, i, exec, hyprctl keyword plugin:hy3:tabs:render_text true
|
||||
bind = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:height 20
|
||||
bind = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text true
|
||||
|
||||
bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:height 2
|
||||
bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text false
|
||||
|
||||
bind = ,XF86AudioStop, exec, qs msg -c shell mpris pauseAll
|
||||
bind = ,XF86AudioPlay, exec, qs msg -c shell mpris playPause
|
||||
bind = ,XF86AudioNext, exec, qs msg -c shell mpris next
|
||||
bind = ,XF86AudioPrev, exec, qs msg -c shell mpris previous
|
||||
|
||||
bind = $mod, h, hy3:movefocus, l
|
||||
bind = $mod, j, hy3:movefocus, d
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
# session
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export XDG_SESSION_DESKTOP=hyprland
|
||||
export XDG_CURRENT_DESKTOP=hyprland
|
||||
|
||||
# firefox
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
|
|
@ -28,7 +26,7 @@ export NIXOS_OZONE_WL=1
|
|||
|
||||
# cursed dbus
|
||||
|
||||
dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_QPA_PLATFORMTHEME QT_WAYLAND_DISABLE_WINDOWDECORATION SDL_VIDEODRIVER _JAVA_AWT_WM_NONREPARENTING JDK_JAVA_OPTIONS XCURSOR_SIZE XCURSOR_THEME
|
||||
dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_QPA_PLATFORMTHEME QT_WAYLAND_DISABLE_WINDOWDECORATION SDL_VIDEODRIVER _JAVA_AWT_WM_NONREPARENTING JDK_JAVA_OPTIONS XCURSOR_SIZE XCURSOR_THEME NIXOS_OZONE_WL
|
||||
|
||||
# theme in dbus:
|
||||
# QT_PLUGIN_PATH=<qt5ct>/lib/qt-ver/plugins + breeze will correctly set the theme.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue