cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

adding uwsm, ty fufexan. and quite a bit more

Browse Source
This commit is contained in:
cnst
2024-11-18 06:14:56 +01:00
parent 8d121fda97
commit edfc9767c7
17 changed files with 120 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/home/programs/hyprland/default.nix
View File

@@ -2,11 +2,12 @@
config,
lib,
pkgs,
inputs,
...
}: let
inherit (lib) mkIf mkEnableOption mkOption types mkDefault;
inherit (lib) mkIf mkEnableOption mkDefault;
cfg = config.home.programs.hyprland;
hyprlandPkg = pkgs.hyprland;
hyprlandPkg = inputs.hyprland.packages.${pkgs.system}.default;
in {
imports = [
./appearance.nix
@@ -35,6 +36,7 @@ in {
enable = true;
package = hyprlandPkg;
systemd = {
enable = false;
variables = ["--all"];
extraCommands = [
"systemctl --user stop graphical-session.target"
@@ -42,5 +44,7 @@ in {
];
};
};
systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
};
}

14
modules/home/programs/hyprland/keybinds.nix
View File

@@ -8,6 +8,12 @@
inherit (lib) mkIf mkEnableOption mkMerge;
cfg = config.home.programs.hyprland;
host = osConfig.networking.hostName;
toggle = program: let
prog = builtins.substring 0 14 program;
in "pkill ${prog} || uwsm app -- ${program}";
runOnce = program: "pgrep ${program} || uwsm app -- ${program}";
in {
options = {
home.programs.hyprland.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
@@ -18,21 +24,21 @@ in {
wayland.windowManager.hyprland.settings = {
# Common Keybind Variables
"$fileManager" = "thunar";
"$passwordManager" = "keepassxc";
"$menu" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
"$menuw" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
"$yazi" = "alacritty -e yazi";
"$tuirun" = "tuirun-toggle.sh";
bind = [
"$mod, L, exec, ${runOnce "hyprlock"}"
"$mod SHIFT, B, exec, pkill -SIGUSR2 waybar"
"$mod, A, exec, pkill -SIGUSR1 waybar"
"$mod, T, exec, $terminal"
"$mod, T, exec, uwsm app -T"
"$mod, W, exec, $browser"
"$mod, K, exec, $passwordManager"
"$mod, K, exec, keepassxc"
"$mod SHIFT, W, exec, $browserinc"
"$mod, Q, killactive,"
"$mod, E, exec, $fileManager"
"$mod, E, exec, uwsm app -- $fileManager"
"$mod, R, exec, $tuirun"
"$mod SHIFT, E, exec, $yazi"
"$mod, F, fullscreen,"

2
modules/home/programs/hyprland/rules.nix
View File

@@ -21,7 +21,7 @@ in {
# === TUIRUN SETTINGS ===
"size 600 300, initialTitle:^(tuirun)$"
"center, initialTitle:^(tuirun)$"
"workspace special:tuirun, initialTitle:^(tuirun)$"
# "workspace special:tuirun, initialTitle:^(tuirun)$"
"noborder, initialTitle:^(tuirun)$"
"float, initialTitle:^(tuirun)$"

14
modules/home/programs/hyprland/startup.nix
View File

@@ -16,20 +16,20 @@ in {
{
wayland.windowManager.hyprland.settings = {
exec-once = [
"hyprlock"
"systemctl --user start polkit-gnome-authentication-agent-1"
"udiskie -Nt"
"wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'"
"hyprctl dispatch exec 'sleep 5s && keepassxc'"
"uwsm finalize"
"uwsm app -- keepassxc'"
];
};
}
(mkIf (host == "cnix") {
wayland.windowManager.hyprland.settings.exec-once = [
"mullvad-vpn"
"blueman-applet"
"pamixer --set-volume 50"
"hyprctl dispatch exec 'sleep 3s && solaar -w hide'"
"uwsm app -- mullvad-vpn"
"uwsm app -- blueman-applet"
"uwsm app -- pamixer --set-volume 50"
"uwsm app -- solaar -w hide"
];
})

8
modules/home/programs/hyprlock/default.nix
View File

@@ -1,5 +1,5 @@
{
# inputs,
inputs,
pkgs,
config,
lib,
@@ -8,8 +8,8 @@
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.hyprlock;
# hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
hyprlockPkg = pkgs.hyprlock;
hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
# hyprlockPkg = pkgs.hyprlock;
in {
options = {
home.programs.hyprlock.enable = mkEnableOption "Enables hyprlock";
@@ -17,7 +17,7 @@ in {
config = mkIf cfg.enable {
programs.hyprlock = {
enable = true;
package = hyprlockPkg;
package = hyprlockFlake;
settings = {
general = {
disable_loading_bar = true;

6
modules/home/programs/nwg-bar/default.nix
View File

@@ -38,7 +38,7 @@ in {
];
xdg.configFile."nwg-bar/style.css".text = ''
window {
background-color: rgba (0, 0, 0, 0.6)
background-color: rgba (60, 56, 54, 0.6)
}
/* Outer bar container, takes all the window width/height */
@@ -48,7 +48,7 @@ in {
/* Inner bar container, surrounds buttons */
#inner-box {
background-color: rgba (0, 0, 0, 0.85);
background-color: rgba (28, 28, 28, 0.85);
border-radius: 0px;
border-style: none;
border-width: 1px;
@@ -70,7 +70,7 @@ in {
}
button:hover {
background-color: rgba (255, 255, 255, 0.1)
background-color: rgba (255, 255, 255, 0.35)
}
'';
};

9
modules/home/services/hypridle/default.nix
View File

@@ -2,14 +2,14 @@
config,
lib,
pkgs,
# inputs,
inputs,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.hypridle;
# hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
hypridlePkg = pkgs.hypridle;
hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
# hypridlePkg = pkgs.hypridle;
in {
options = {
home.services.hypridle.enable = mkEnableOption "Enables hypridle";
@@ -17,7 +17,7 @@ in {
config = mkIf cfg.enable {
services.hypridle = {
enable = true;
package = hypridlePkg;
package = hypridleFlake;
settings = {
general = {
lock_cmd = "hyprlock";
@@ -38,5 +38,6 @@ in {
];
};
};
systemd.user.services.hypridle.Unit.After = lib.mkForce "graphical-session.target";
};
}

9
modules/home/services/hyprpaper/default.nix
View File

@@ -2,14 +2,14 @@
config,
lib,
pkgs,
# inputs,
inputs,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.hyprpaper;
# hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
hyprpaperPkg = pkgs.hyprpaper;
hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
# hyprpaperPkg = pkgs.hyprpaper;
in {
options = {
home.services.hyprpaper.enable = mkEnableOption "Enables hyprpaper";
@@ -17,7 +17,7 @@ in {
config = mkIf cfg.enable {
services.hyprpaper = {
enable = true;
package = hyprpaperPkg;
package = hyprpaperFlake;
settings = {
ipc = "on";
splash = false;
@@ -51,5 +51,6 @@ in {
];
};
};
systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
};
}

1
modules/home/services/udiskie/default.nix
View File

@@ -15,5 +15,6 @@ in {
tray = "always";
notify = false;
};
systemd.user.services.udiskie.Unit.After = lib.mkForce "graphical-session.target";
};
}

5
modules/nixos/programs/hyprland/default.nix
View File

@@ -18,9 +18,8 @@ in {
security.pam.services.hyprlock.text = "auth include login";
programs.hyprland = {
enable = true;
xwayland.enable = true;
package = pkgs.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
package = inputs.hyprland.packages.${pkgs.system}.default;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
};
environment = {
variables.NIXOS_OZONE_WL = "1";

48
modules/nixos/services/greetd/default.nix
View File

@@ -14,16 +14,6 @@ in {
default = false;
description = "Enables the greetd service.";
};
gnomeKeyring.enable = mkEnableOption {
type = types.bool;
default = false;
description = "Enables GnomeKeyring PAM service for greetd.";
};
autologin.enable = mkEnableOption {
type = types.bool;
default = false;
description = "Enables autologin for a specified user.";
};
user = mkOption {
type = types.str;
default = "cnst";
@@ -33,26 +23,30 @@ in {
};
config = mkIf cfg.enable {
services.greetd = {
services.greetd = let
session = {
command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
user = cfg.user;
};
in {
enable = true;
settings = mkMerge [
# Conditionally include initial_session if autologin is enabled
(mkIf cfg.autologin.enable {
initial_session = {
command = "${lib.getExe config.programs.hyprland.package}";
user = cfg.user;
};
})
{
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --window-padding 1 --time --time-format '%R - %F' -r --remember-session --asterisks";
user = cfg.user;
};
}
];
settings = {
terminal.vt = 1;
default_session = session;
initial_session = session;
};
};
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/run/current-system/sw/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
};
# Apply GnomeKeyring PAM Service based on user configuration
security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
# security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
};
}

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

@@ -24,7 +24,7 @@ in {
xdgOpenUsePortal = cfg.xdgOpenUsePortal;
config = {
common.default = ["gtk"];
hyprland.default = ["hyprland" "gtk"];
hyprland.default = ["gtk" "hyprland"];
};
extraPortals = [pkgs.xdg-desktop-portal-gtk];
};