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

102
flake.lock generated
View File

@@ -61,11 +61,11 @@
]
},
"locked": {
"lastModified": 1731496216,
"narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=",
"lastModified": 1731774881,
"narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59",
"rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
"type": "github"
},
"original": {
@@ -82,12 +82,12 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1731549423,
"narHash": "sha256-856g6/DYtrC+O9yRlksrKaEWP3jDgJQ9UMmQx/twxBc=",
"rev": "c37212a15dd0dc472d75df4c21c092d1cc9df897",
"revCount": 1508,
"lastModified": 1731866540,
"narHash": "sha256-wAz/S5GLm+9Vp0kmUPsva3Mxp+VUnbEUZ8aBM1aEhhY=",
"rev": "0857914b69d90ba758e614298452636c6fdc9c7c",
"revCount": 1513,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1508%2Brev-c37212a15dd0dc472d75df4c21c092d1cc9df897/01932867-31e1-7601-9c99-ad09679c2f40/source.tar.gz?rev=c37212a15dd0dc472d75df4c21c092d1cc9df897&revCount=1508"
"url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1513%2Brev-0857914b69d90ba758e614298452636c6fdc9c7c/01933b55-726d-7028-9718-d2009e12dad9/source.tar.gz?rev=0857914b69d90ba758e614298452636c6fdc9c7c&revCount=1513"
},
"original": {
"type": "tarball",
@@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1731565929,
"narHash": "sha256-ZuVJhcL57hHBtIbaACQzlVD4p/zHOWlKh7V3wrNdnss=",
"lastModified": 1731738660,
"narHash": "sha256-tIXhc9lX1b030v812yVJanSR37OnpTb/OY5rU3TbShA=",
"owner": "nix-community",
"repo": "fenix",
"rev": "4c6c7d5088f12f57afd4ba6449f9eb168ca05620",
"rev": "e10ba121773f754a30d31b6163919a3e404a434f",
"type": "github"
},
"original": {
@@ -375,11 +375,11 @@
},
"hardware": {
"locked": {
"lastModified": 1731403644,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"lastModified": 1731797098,
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"type": "github"
},
"original": {
@@ -416,11 +416,11 @@
]
},
"locked": {
"lastModified": 1731535640,
"narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"lastModified": 1731887066,
"narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
"type": "github"
},
"original": {
@@ -547,11 +547,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1731526492,
"narHash": "sha256-tzWLCOcIxvJvxB25kC0Q371pc5wBBzbzwSlSNc4L8gw=",
"lastModified": 1731880680,
"narHash": "sha256-0i1n/gHX3p2ZFnpR3DEnOZUgniKOWXGLLYMllcZcPCw=",
"owner": "hyprwm",
"repo": "hyprland",
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a",
"rev": "1ba050d603dca644aca48872f62388d794c030b9",
"type": "github"
},
"original": {
@@ -655,11 +655,11 @@
]
},
"locked": {
"lastModified": 1731418287,
"narHash": "sha256-jVSSYAr1Ju2MZYGazUzm1Fe55IdAjsx8p4AOMdrrljQ=",
"lastModified": 1731631555,
"narHash": "sha256-ehlfCIYAs0dETZadViau4dYprgP/P1RcwgcCV0EUFjo=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "2775ab2868e6016e5f812a31c025c7eb57a88aeb",
"rev": "b9cf5151bad432fddb568702a943bab591c9387d",
"type": "github"
},
"original": {
@@ -743,11 +743,11 @@
]
},
"locked": {
"lastModified": 1731518387,
"narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=",
"lastModified": 1731702627,
"narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8",
"rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
"type": "github"
},
"original": {
@@ -816,11 +816,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1731364081,
"narHash": "sha256-7E1dh2H+36AJBO7PCHhLLEuxr2HDaEa6nif14pOoJXY=",
"lastModified": 1731855121,
"narHash": "sha256-6xZ/d9vTqw3/faV/5DNcnj0zHAA5cakSk37B0snjFhs=",
"owner": "JakeStanger",
"repo": "ironbar",
"rev": "a76957216b27f7d23128a02740cad2d78d9e4de6",
"rev": "bdf6b3b1b3e4bd6bc7b7a47436d656112a94a946",
"type": "github"
},
"original": {
@@ -921,11 +921,11 @@
"umu": "umu"
},
"locked": {
"lastModified": 1731548373,
"narHash": "sha256-wKfZUafXB/Wc+f9JlDyAY20OFDUd4CZ3LF4Li+PpAX0=",
"lastModified": 1731849451,
"narHash": "sha256-l73nJDTaOzV8rIg/IFlkK5ya3F7/tPLI5HnQGzt4FCE=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "5b3cac90d7c3ceddbe6f2cfc5c6d0b66780d2ea3",
"rev": "88cd24b3ea7301116fd5919f886e58d31c006ad3",
"type": "github"
},
"original": {
@@ -1023,11 +1023,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github"
},
"original": {
@@ -1055,11 +1055,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github"
},
"original": {
@@ -1116,11 +1116,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github"
},
"original": {
@@ -1210,11 +1210,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1731342671,
"narHash": "sha256-36eYDHoPzjavnpmEpc2MXdzMk557S0YooGms07mDuKk=",
"lastModified": 1731693936,
"narHash": "sha256-uHUUS1WPyW6ohp5Bt3dAZczUlQ22vOn7YZF8vaPKIEw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "fc98e0657abf3ce07eed513e38274c89bbb2f8ad",
"rev": "1b90e979aeee8d1db7fe14603a00834052505497",
"type": "github"
},
"original": {
@@ -1408,11 +1408,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1731556042,
"narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=",
"lastModified": 1731893168,
"narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=",
"ref": "refs/heads/main",
"rev": "66a1088194bb13c2d86d2c0af316b280a7235640",
"revCount": 839,
"rev": "9f580b251ca66950bb436c09afd2b9585eed74ba",
"revCount": 840,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
@@ -1452,11 +1452,11 @@
]
},
"locked": {
"lastModified": 1730743262,
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
"lastModified": 1731703417,
"narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
"rev": "8070f36deec723de71e7557441acb17e478204d3",
"type": "github"
},
"original": {

6
hosts/cnix/modules.nix
View File

@@ -154,12 +154,6 @@
greetd = {
enable = true;
user = "cnst";
autologin = {
enable = false;
};
gnomeKeyring = {
enable = false;
};
};
gvfs = {
enable = true;

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";

44
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;
settings = {
terminal.vt = 1;
default_session = session;
initial_session = session;
};
})
{
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --window-padding 1 --time --time-format '%R - %F' -r --remember-session --asterisks";
user = cfg.user;
};
}
];
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];
};

4
scripts/bin/tuirun-toggle.sh
View File

@@ -2,7 +2,7 @@
TERMINAL="${TERMINAL:-foot}"
# Path to the tuirun executable
TUIRUN_PATH="/etc/profiles/per-user/$USER/bin/tuirun"
TUIRUN_PATH="/run/current-system/sw/bin/uwsm app -- tuirun"
# Use absolute paths for commands
PGREP="/run/current-system/sw/bin/pgrep"
@@ -32,5 +32,5 @@ else
CMD="$CMD -e $TUIRUN_PATH"
# Launch the terminal with OPTIONS
"$HYPRCTL" dispatch exec "$CMD"
uwsm app -- "$HYPRCTL" dispatch exec "$CMD"
fi

BIN
secrets/lock.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 726 KiB

1
secrets/secrets.nix
View File

@@ -5,4 +5,5 @@ let
in {
"cnstssh.age".publicKeys = [cnst cnix];
"cnixssh.age".publicKeys = [cnst cnix];
"lock.jpg".publicKeys = [cnst cnix];
}