diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index 55c0d1e..aca6793 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -36,6 +36,11 @@ _: { */ affinity.enable = false; # Affinity: professional graphics suite + /* + Utilities / Misc + */ + ventoy.enable = false; # Ventoy: New Bootable USB Solution with GUI support + packages = { /* Container & Packaging @@ -70,7 +75,7 @@ _: { signal.enable = true; # Signal: secure messaging app teams.enable = true; # Teams-for-linux: Unofficial Microsoft Teams client for Linux ferdium.enable = false; # Ferdium: All your services in one place built by the community - notify.enable = true; # notify-client: Ntfy client application to receive everyday's notifications + notify.enable = false; # notify-client: Ntfy client application to receive everyday's notifications /* Productivity / Knowledge Management diff --git a/hosts/Garand-Desktop/variables.nix b/hosts/Garand-Desktop/variables.nix index 4f860ab..2263a6b 100644 --- a/hosts/Garand-Desktop/variables.nix +++ b/hosts/Garand-Desktop/variables.nix @@ -42,20 +42,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - # stylixImage = "attack-on-titan-mikasa-ackerman.jpg"; - #stylixImage = "DW_Pacts.jpg"; - #stylixImage = "edward-elric-fullmetal-alchemist.jpg"; - #stylixImage = "fire-nation.jpg"; - #stylixImage = "four-elements.jpg"; - #stylixImage = "fullmetal-alchemist-5120x2880-10399.png"; - #stylixImage = "Grounded_Wallpaper_4K.jpg"; - #stylixImage = "jablon.jpg"; - #stylixImage = "rammstein-log-two.jpg"; - #stylixImage = "rammstein-logo-one.jpg"; - #stylixImage = "rammstein-logo-three.jpg"; - #stylixImage = "rammstein-one.jpg"; - #stylixImage = "1346530.jpeg"; - stylixImage = "The-Southern-Raiders.jpg"; + stylixImage = "Attack-on-Titan-1.jpg"; + # stylixImage = "Attack-on-Titan-2.jpg"; + # stylixImage = "Attack-on-Titan-3.jpg"; + # stylixImage = "Avatar-1.jpg"; + # stylixImage = "Avatar-2.jpg"; + # stylixImage = "Avatar-3.png"; + # stylixImage = "Avatar-4.jpg"; + # stylixImage = "Edge-of-Tomorrow-1.jpg"; + # stylixImage = "Friren-1.jpg"; + # stylixImage = "Friren-2.jpg"; + # stylixImage = "Friren-3.jpg"; + # stylixImage = "Jablon.png"; + # stylixImage = "Song-of-the-Sea-1.jpg"; + # stylixImage = "Wolfwalkers-1.jpg"; + # stylixImage = "Wolfwalkers-2.jpg"; # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix index 55c0d1e..3c2a035 100644 --- a/hosts/Garand-Laptop/system-modules.nix +++ b/hosts/Garand-Laptop/system-modules.nix @@ -36,6 +36,11 @@ _: { */ affinity.enable = false; # Affinity: professional graphics suite + /* + Utilities / Misc + */ + ventoy.enable = false; # Ventoy: New Bootable USB Solution with GUI support + packages = { /* Container & Packaging diff --git a/hosts/Garand-Laptop/variables.nix b/hosts/Garand-Laptop/variables.nix index bd1aea2..7d16cd2 100644 --- a/hosts/Garand-Laptop/variables.nix +++ b/hosts/Garand-Laptop/variables.nix @@ -39,20 +39,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - # stylixImage = "attack-on-titan-mikasa-ackerman.jpg"; - #stylixImage = "DW_Pacts.jpg"; - #stylixImage = "edward-elric-fullmetal-alchemist.jpg"; - #stylixImage = "fire-nation.jpg"; - #stylixImage = "four-elements.jpg"; - #stylixImage = "fullmetal-alchemist-5120x2880-10399.png"; - #stylixImage = "Grounded_Wallpaper_4K.jpg"; - #stylixImage = "jablon.jpg"; - #stylixImage = "rammstein-log-two.jpg"; - #stylixImage = "rammstein-logo-one.jpg"; - #stylixImage = "rammstein-logo-three.jpg"; - #stylixImage = "rammstein-one.jpg"; - #stylixImage = "1346530.jpeg"; - stylixImage = "The-Southern-Raiders.jpg"; + stylixImage = "Attack-on-Titan-1.jpg"; + # stylixImage = "Attack-on-Titan-2.jpg"; + # stylixImage = "Attack-on-Titan-3.jpg"; + # stylixImage = "Avatar-1.jpg"; + # stylixImage = "Avatar-2.jpg"; + # stylixImage = "Avatar-3.png"; + # stylixImage = "Avatar-4.jpg"; + # stylixImage = "Edge-of-Tomorrow-1.jpg"; + # stylixImage = "Friren-1.jpg"; + # stylixImage = "Friren-2.jpg"; + # stylixImage = "Friren-3.jpg"; + # stylixImage = "Jablon.png"; + # stylixImage = "Song-of-the-Sea-1.jpg"; + # stylixImage = "Wolfwalkers-1.jpg"; + # stylixImage = "Wolfwalkers-2.jpg"; # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix index 15dcdee..c0504e3 100644 --- a/hosts/default/system-modules.nix +++ b/hosts/default/system-modules.nix @@ -36,6 +36,11 @@ _: { */ affinity.enable = false; # Affinity: professional graphics suite + /* + Utilities / Misc + */ + ventoy.enable = false; # Ventoy: New Bootable USB Solution with GUI support + packages = { /* Container & Packaging diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 0290c18..2556541 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -48,20 +48,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - stylixImage = "attack-on-titan-mikasa-ackerman.jpg"; - #stylixImage = "DW_Pacts.jpg"; - #stylixImage = "edward-elric-fullmetal-alchemist.jpg"; - #stylixImage = "fire-nation.jpg"; - #stylixImage = "four-elements.jpg"; - #stylixImage = "fullmetal-alchemist-5120x2880-10399.png"; - #stylixImage = "Grounded_Wallpaper_4K.jpg"; - #stylixImage = "jablon.jpg"; - #stylixImage = "rammstein-log-two.jpg"; - #stylixImage = "rammstein-logo-one.jpg"; - #stylixImage = "rammstein-logo-three.jpg"; - #stylixImage = "rammstein-one.jpg"; - #stylixImage = "1346530.jpeg"; - #stylixImage = "The-Southern-Raiders.jpg"; + stylixImage = "Attack-on-Titan-1.jpg"; + # stylixImage = "Attack-on-Titan-2.jpg"; + # stylixImage = "Attack-on-Titan-3.jpg"; + # stylixImage = "Avatar-1.jpg"; + # stylixImage = "Avatar-2.jpg"; + # stylixImage = "Avatar-3.png"; + # stylixImage = "Avatar-4.jpg"; + # stylixImage = "Edge-of-Tomorrow-1.jpg"; + # stylixImage = "Friren-1.jpg"; + # stylixImage = "Friren-2.jpg"; + # stylixImage = "Friren-3.jpg"; + # stylixImage = "Jablon.png"; + # stylixImage = "Song-of-the-Sea-1.jpg"; + # stylixImage = "Wolfwalkers-1.jpg"; + # stylixImage = "Wolfwalkers-2.jpg"; # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/modules/core/boot.nix b/modules/core/boot.nix index cb2c46c..897f989 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -1,9 +1,12 @@ { pkgs, + host, config, lib, ... -}: { +}: let + inherit (import ../../hosts/${host}/variables.nix) stylixImage; +in { boot = { kernelPackages = pkgs.linuxPackages_zen; kernelModules = ["v4l2loopback"]; @@ -17,7 +20,7 @@ enable = true; style = { wallpapers = [ - ./../../wallpapers/attack-on-titan-mikasa-ackerman.jpg + ./../../wallpapers/${stylixImage} ]; wallpaperStyle = lib.mkForce "centered"; backdrop = "${config.stylix.base16Scheme.base00}"; diff --git a/modules/core/default.nix b/modules/core/default.nix index 1332769..9153bf8 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -23,6 +23,7 @@ ./tailscale.nix ./thunar.nix ./user.nix + ./ventoy.nix ./virtualbox.nix ./xdg.nix ./xserver.nix diff --git a/modules/core/ventoy.nix b/modules/core/ventoy.nix new file mode 100644 index 0000000..61dbe45 --- /dev/null +++ b/modules/core/ventoy.nix @@ -0,0 +1,15 @@ +{ + pkgs, + lib, + config, + ... +}: { + options.ventoy.enable = lib.mkEnableOption "Enable Ventoy"; + + config = lib.mkIf config.ventoy.enable { + environment.systemPackages = with pkgs; [ventoy-full-gtk]; + nixpkgs.config.permittedInsecurePackages = [ + "ventoy-gtk3-1.1.12" + ]; + }; +} diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 875ddb3..6efdc6d 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -42,7 +42,7 @@ "SUPER SHIFT, N, exec, nextcloud #\"Nextcloud desktop sync client\"" "SUPER SHIFT, O, exec, obs #\"Open Broadcaster Software\"" "SUPER SHIFT, P, exec, noctalia-shell ipc call volume togglePanel #\"Toggle volume control panel\"" - "SUPER SHIFT, R, exec, restart.noctalia #\"Restart Noctalia shell\"" + # "SUPER SHIFT, R, exec, restart.noctalia #\"Restart Noctalia shell\"" "SUPER SHIFT, Return, exec, noctalia-shell ipc call launcher toggle #\"Toggle application launcher\"" "SUPER SHIFT, S, exec, screenshootin #\"Take screenshot\"" "SUPER SHIFT, T, exec, tutanota-desktop #\"Tutanota encrypted email client\"" diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 3ab8d39..7d18f58 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -1,7 +1,5 @@ {pkgs, ...}: { home.packages = [ (import ./nvidia-offload.nix {inherit pkgs;}) - (import ./restart.noctalia.nix {inherit pkgs;}) - (import ./screenshootin.nix {inherit pkgs;}) ]; } diff --git a/modules/home/scripts/restart.noctalia b/modules/home/scripts/restart.noctalia deleted file mode 100644 index 747c18a..0000000 --- a/modules/home/scripts/restart.noctalia +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Restart the Noctalia QuickShell session by terminating only the noctalia-shell -# processes, avoiding any signals to unrelated process groups (e.g. Hyprland). - -log() { printf "[restart.noctalia] %s\n" "$*"; } - -list_target_pids() { - # Collect only PIDs whose command explicitly runs noctalia-shell - # - direct wrapper: ".../noctalia-shell" - # - quickshell/qs with "-c noctalia-shell" - ps -eo pid=,cmd= \ - | ${GREP:-grep} -E "(^|/)(noctalia-shell)( |$)|(^| )((qs|quickshell))( | ).*-c( |=)?noctalia-shell( |$)" \ - | awk '{print $1}' -} - -terminate_targets() { - local pids left tries - mapfile -t pids < <(list_target_pids || true) - - if ((${#pids[@]} > 0)); then - kill -TERM "${pids[@]}" 2>/dev/null || true - fi - - # Wait up to ~3s for clean exit - for tries in {1..15}; do - mapfile -t left < <(list_target_pids || true) - ((${#left[@]} == 0)) && break - sleep 0.2 - done - - # Force kill leftovers only (do not touch anything else) - if ((${#left[@]} > 0)); then - kill -KILL "${left[@]}" 2>/dev/null || true - fi -} - -start_noctalia() { - # Prefer the noctalia-shell wrapper to ensure proper env and runtime flags - if command -v noctalia-shell >/dev/null 2>&1; then - nohup setsid noctalia-shell >/dev/null 2>&1 & - elif command -v quickshell >/dev/null 2>&1; then - nohup setsid quickshell -c noctalia-shell >/dev/null 2>&1 & - elif command -v qs >/dev/null 2>&1; then - nohup setsid qs -c noctalia-shell >/dev/null 2>&1 & - else - echo "Error: noctalia-shell/quickshell/qs not found in PATH" >&2 - exit 1 - fi -} - -terminate_targets -start_noctalia diff --git a/modules/home/scripts/restart.noctalia.nix b/modules/home/scripts/restart.noctalia.nix deleted file mode 100644 index d229149..0000000 --- a/modules/home/scripts/restart.noctalia.nix +++ /dev/null @@ -1,24 +0,0 @@ -{pkgs, ...}: let - binPath = pkgs.lib.makeBinPath [ - pkgs.coreutils - pkgs.procps - pkgs.psmisc - pkgs.gnugrep - pkgs.findutils - pkgs.util-linux - pkgs.bash - ]; - script = builtins.readFile ./restart.noctalia; -in - pkgs.writeShellScriptBin "restart.noctalia" '' - set -euo pipefail - export PATH=${binPath}:$PATH - - tmp_script=$(mktemp) - trap 'rm -f "$tmp_script"' EXIT - cat > "$tmp_script" <<'BASH_EOF' - ${script} - BASH_EOF - chmod +x "$tmp_script" - exec ${pkgs.bash}/bin/bash "$tmp_script" "$@" - '' diff --git a/modules/home/scripts/screenshootin.nix b/modules/home/scripts/screenshootin.nix deleted file mode 100644 index 40de68e..0000000 --- a/modules/home/scripts/screenshootin.nix +++ /dev/null @@ -1,4 +0,0 @@ -{pkgs}: -pkgs.writeShellScriptBin "screenshootin" '' - grim -g "$(slurp)" - | swappy -f - -'' diff --git a/wallpapers/1346530.jpeg b/wallpapers/1346530.jpeg deleted file mode 100644 index 7d8ce7b..0000000 Binary files a/wallpapers/1346530.jpeg and /dev/null differ diff --git a/wallpapers/attack-on-titan-mikasa-ackerman.jpg b/wallpapers/Attack-on-Titan-1.jpg similarity index 100% rename from wallpapers/attack-on-titan-mikasa-ackerman.jpg rename to wallpapers/Attack-on-Titan-1.jpg diff --git a/wallpapers/Attack-on-Titan-2.jpg b/wallpapers/Attack-on-Titan-2.jpg new file mode 100644 index 0000000..dc666a7 Binary files /dev/null and b/wallpapers/Attack-on-Titan-2.jpg differ diff --git a/wallpapers/Attack-on-Titan-3.jpg b/wallpapers/Attack-on-Titan-3.jpg new file mode 100644 index 0000000..98926e9 Binary files /dev/null and b/wallpapers/Attack-on-Titan-3.jpg differ diff --git a/wallpapers/Avatar-1.jpg b/wallpapers/Avatar-1.jpg new file mode 100644 index 0000000..1cd0dc2 Binary files /dev/null and b/wallpapers/Avatar-1.jpg differ diff --git a/wallpapers/Avatar-2.jpg b/wallpapers/Avatar-2.jpg new file mode 100644 index 0000000..ee0c412 Binary files /dev/null and b/wallpapers/Avatar-2.jpg differ diff --git a/wallpapers/Avatar-3.jpg b/wallpapers/Avatar-3.jpg new file mode 100644 index 0000000..ca8637e Binary files /dev/null and b/wallpapers/Avatar-3.jpg differ diff --git a/wallpapers/The-Southern-Raiders.jpg b/wallpapers/Avatar-4.jpg similarity index 100% rename from wallpapers/The-Southern-Raiders.jpg rename to wallpapers/Avatar-4.jpg diff --git a/wallpapers/DW_Pacts.jpg b/wallpapers/DW_Pacts.jpg deleted file mode 100644 index 047d11c..0000000 Binary files a/wallpapers/DW_Pacts.jpg and /dev/null differ diff --git a/wallpapers/Edge-of-Tomorrow-1.jpg b/wallpapers/Edge-of-Tomorrow-1.jpg new file mode 100644 index 0000000..acb8bf1 Binary files /dev/null and b/wallpapers/Edge-of-Tomorrow-1.jpg differ diff --git a/wallpapers/Friren-1.jpg b/wallpapers/Friren-1.jpg new file mode 100644 index 0000000..e07bc78 Binary files /dev/null and b/wallpapers/Friren-1.jpg differ diff --git a/wallpapers/Friren-2.jpg b/wallpapers/Friren-2.jpg new file mode 100644 index 0000000..1e27fb2 Binary files /dev/null and b/wallpapers/Friren-2.jpg differ diff --git a/wallpapers/Friren-3.jpg b/wallpapers/Friren-3.jpg new file mode 100644 index 0000000..2419fd4 Binary files /dev/null and b/wallpapers/Friren-3.jpg differ diff --git a/wallpapers/Grounded_Wallpaper_4K.jpg b/wallpapers/Grounded_Wallpaper_4K.jpg deleted file mode 100644 index 16d5a97..0000000 Binary files a/wallpapers/Grounded_Wallpaper_4K.jpg and /dev/null differ diff --git a/wallpapers/Jablon.png b/wallpapers/Jablon.png new file mode 100644 index 0000000..bc8306b Binary files /dev/null and b/wallpapers/Jablon.png differ diff --git a/wallpapers/Song-of-the-Sea-1.jpg b/wallpapers/Song-of-the-Sea-1.jpg new file mode 100644 index 0000000..83fab69 Binary files /dev/null and b/wallpapers/Song-of-the-Sea-1.jpg differ diff --git a/wallpapers/Wolfwalkers-1.jpg b/wallpapers/Wolfwalkers-1.jpg new file mode 100644 index 0000000..934eb4b Binary files /dev/null and b/wallpapers/Wolfwalkers-1.jpg differ diff --git a/wallpapers/Wolfwalkers-2.jpg b/wallpapers/Wolfwalkers-2.jpg new file mode 100644 index 0000000..73e9603 Binary files /dev/null and b/wallpapers/Wolfwalkers-2.jpg differ diff --git a/wallpapers/edward-elric-fullmetal-alchemist.jpg b/wallpapers/edward-elric-fullmetal-alchemist.jpg deleted file mode 100644 index a7dc3da..0000000 Binary files a/wallpapers/edward-elric-fullmetal-alchemist.jpg and /dev/null differ diff --git a/wallpapers/fire-nation.jpg b/wallpapers/fire-nation.jpg deleted file mode 100644 index 18023d0..0000000 Binary files a/wallpapers/fire-nation.jpg and /dev/null differ diff --git a/wallpapers/four-elements.jpg b/wallpapers/four-elements.jpg deleted file mode 100644 index e0003c9..0000000 Binary files a/wallpapers/four-elements.jpg and /dev/null differ diff --git a/wallpapers/fullmetal-alchemist-5120x2880-10399.png b/wallpapers/fullmetal-alchemist-5120x2880-10399.png deleted file mode 100644 index 6bcad10..0000000 Binary files a/wallpapers/fullmetal-alchemist-5120x2880-10399.png and /dev/null differ diff --git a/wallpapers/jablon.png b/wallpapers/jablon.png deleted file mode 100644 index 0eeadef..0000000 Binary files a/wallpapers/jablon.png and /dev/null differ diff --git a/wallpapers/rammstein-log-two.jpg b/wallpapers/rammstein-log-two.jpg deleted file mode 100644 index 9d076ce..0000000 Binary files a/wallpapers/rammstein-log-two.jpg and /dev/null differ diff --git a/wallpapers/rammstein-logo-one.jpg b/wallpapers/rammstein-logo-one.jpg deleted file mode 100644 index a05708b..0000000 Binary files a/wallpapers/rammstein-logo-one.jpg and /dev/null differ diff --git a/wallpapers/rammstein-logo-three.jpg b/wallpapers/rammstein-logo-three.jpg deleted file mode 100644 index 8d37315..0000000 Binary files a/wallpapers/rammstein-logo-three.jpg and /dev/null differ diff --git a/wallpapers/rammstein-one.jpg b/wallpapers/rammstein-one.jpg deleted file mode 100644 index acb21aa..0000000 Binary files a/wallpapers/rammstein-one.jpg and /dev/null differ