jsw/NiksOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completed migration

Browse source
This commit is contained in:
Jurn Wubben 2025-05-24 00:20:29 +02:00
parent d0a41df000
commit 46b144ca2c
7 changed files with 78 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
home/shell/other.nix
View file

@ -26,5 +26,4 @@
++ lib.optionals osConfig.niksos.portable [ ++ lib.optionals osConfig.niksos.portable [
inputs.somcli.defaultPackage.${pkgs.system} inputs.somcli.defaultPackage.${pkgs.system}
]; ];
;
} }

71
home/wayland/hyprland/binds.nix
View file

@ -56,59 +56,54 @@
in in
builtins.toString (x + 1 - (c * 10)); builtins.toString (x + 1 - (c * 10));
in [ in [
"$mod, ${ws}, workspace, ${toString (x + 1)}" "$m, ${ws}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" "$m SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
] ]
) )
10); 10);
in { in {
config = lib.mkIf desktop {
home.file.".XCompose".text = ''
<Multi_key> <s> <h> <r> <u> <g> : "¯\\_(ツ)_/¯" # Shrug.
'';
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
"$mod" = "ALT"; "$m" = "ALT";
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$m, mouse:272, movewindow"
"$mod, mouse:273, resizewindow" "$m, mouse:273, resizewindow"
"$mod ALT, mouse:272, resizewindow" "$m ALT, mouse:272, resizewindow"
]; ];
bind = bind =
[ [
"$mod SHIFT, E, exec, uwsm stop" "$m SHIFT, E, exec, uwsm stop"
"$mod, Q, killactive," "$m, Q, killactive,"
"$mod, F, fullscreen," "$m, F, fullscreen,"
"$mod, SPACE, togglefloating," "$m, SPACE, togglefloating,"
"$mod, O, pseudo," "$m, O, pseudo,"
"$mod ALT, ,resizeactive," "$m ALT, ,resizeactive,"
"$mod, D, exec, ${fuzzel}" "$m, D, exec, ${fuzzel}"
"$mod, Return, exec, ${foot}" "$m, Return, exec, ${foot}"
"$mod Shift, Return, exec, ${firefox}" "$m Shift, Return, exec, ${firefox}"
"$mod, Escape, exec, ${hyprlock}" "$m, Escape, exec, ${hyprlock}"
"$mod, A, exec, ${pulsemixer}" "$m, A, exec, ${pulsemixer}"
"$mod, B, exec, ${bluetui}" "$m, B, exec, ${bluetui}"
"$mod, N, exec, ${nmtui}" "$m, N, exec, ${nmtui}"
'' ''
$mod, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"' $m, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"'
'' ''
"$mod, Print, exec, ${grimblast} copy area" "$m, Print, exec, ${grimblast} copy area"
", Print, exec, ${grimblast} save area - | ${swappy} -f -" ", Print, exec, ${grimblast} save area - | ${swappy} -f -"
"$mod, h, movefocus, l" "$m, h, movefocus, l"
"$mod, l, movefocus, r" "$m, l, movefocus, r"
"$mod, k, movefocus, u" "$m, k, movefocus, u"
"$mod, j, movefocus, d" "$m, j, movefocus, d"
"$mod SHIFT, h, movewindow, l" "$m SHIFT, h, movewindow, l"
"$mod SHIFT, l, movewindow, r" "$m SHIFT, l, movewindow, r"
"$mod SHIFT, k, movewindow, u" "$m SHIFT, k, movewindow, u"
"$mod SHIFT, j, movewindow, d" "$m SHIFT, j, movewindow, d"
] ]
++ workspaces ++ workspaces
++ lib.optionals games (let ++ lib.optionals games (let
@ -119,9 +114,10 @@ in {
"Super, d, exec, ${dolphin}" "Super, d, exec, ${dolphin}"
]) ])
++ lib.optionals portable [ ++ lib.optionals portable [
"$mod Shift, S, exec, ${somcli}" "$m Shift, S, exec, ${somcli}"
] ++ lib.optionals fingerprint [ ]
", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" #NOTE: Also check home/wayland/hyprland/settings + system/hardware/fingerprint ++ lib.optionals fingerprint [
", XF86PowerOff, exec, pgrep fprintd-verify || ${uwsm} app -- ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" #NOTE: Also check home/wayland/hyprland/settings + system/hardware/fingerprint
]; ];
bindl = [ bindl = [
@ -143,5 +139,4 @@ in {
",XF86MonBrightnessDown, exec, ${brightnessctl} s 10%-" ",XF86MonBrightnessDown, exec, ${brightnessctl} s 10%-"
]; ];
}; };
};
} }

2
system/desktop/greetd.nix
View file

@ -3,7 +3,7 @@
lib, lib,
... ...
}: let }: let
cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable; cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
in { in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
# greetd display manager # greetd display manager

2
system/desktop/hyprland.nix
View file

@ -4,7 +4,7 @@
lib, lib,
... ...
}: let }: let
cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable; cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
in { in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
programs.hyprland = { programs.hyprland = {

2
system/desktop/plasma6.nix
View file

@ -4,7 +4,7 @@
config, config,
... ...
}: let }: let
cfg = config.niksos.desktop.enable && config.niksos.desktop.kde.enable; cfg = config.niksos.desktop.enable && config.niksos.desktop.kde;
in { in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
niksos.desktop.hyprland = lib.mkForce false; niksos.desktop.hyprland = lib.mkForce false;

2
system/desktop/polkit.nix
View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable; cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
in { in {
systemd.user.services.polkit-gnome-authentication-agent-1 = lib.mkIf cfg { systemd.user.services.polkit-gnome-authentication-agent-1 = lib.mkIf cfg {
description = "polkit-gnome-authentication-agent-1"; description = "polkit-gnome-authentication-agent-1";

2
system/desktop/xdg.nix
View file

@ -4,7 +4,7 @@
lib, lib,
... ...
}: let }: let
cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable; cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
in { in {
xdg.portal = lib.mkIf cfg { xdg.portal = lib.mkIf cfg {
enable = true; enable = true;