Merge pull request 'Fix Zen' (#5) from linusemr618/nixy:main into main

Reviewed-on: #5

flake.nix

@@ -28,6 +28,17 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nur = {
+      url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs = {
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
 
 
     # Server

home/programs/group/basic-apps.nix

@@ -6,12 +6,16 @@
 }: {
   home.packages = (with pkgs-stable; [
 
+    kodi # Kodi
+    keepassxc # Passwords
 		vlc # Video player
     obsidian # Note taking app
+    cwtch-ui # messager
 
     ticktick # Todo app
     onlyoffice-desktopeditors # Office suite
     firefox # Backup browser
+    tor-browser # Tor browser
 
     # I love TUIs
     caligula # User-friendly, lightweight TUI for disk imaging (ISO, USB BOOT)
@@ -40,5 +44,6 @@
 
 	++ (with pkgs; [
 		vesktop # Vencord Discord Mod
+    tor # tor network service
 	]);
 }

home/programs/group/dev-packages.nix

@@ -6,8 +6,10 @@
   go
 	zig
 
+  claude-code # Claude Code
+
 	zed-editor #Zed
-	vscodium # VS Code
+  vscodium # VS Code
 ])
 ++ (with pkgs-stable; [
   bun

home/programs/group/gaming-apps.nix

@@ -1,16 +1,15 @@
 {
   pkgs,
-  pkgs-stable,
   ...
 }: {
-  home.packages = (with pkgs-stable; [
+  home.packages = (with pkgs; [
 
     # ─────────────────────────────────────────────────────────────
     # Game launchers
     # ─────────────────────────────────────────────────────────────
 
     lutris                # Universal launcher for Wine, emulators, and native games
-    #prismlauncher         # Minecraft launcher with Fabric/Forge/Quilt support
+    #prismlauncher        # Minecraft launcher with Fabric/Forge/Quilt support
 
     # ─────────────────────────────────────────────────────────────
     # Performance & overlays
@@ -28,18 +27,19 @@
     protonup-qt           # Install and update GE-Proton, Wine-GE, Luxtorpeda, etc.
     winetricks            # Install Windows runtimes into Wine prefixes
     protontricks          # Winetricks for Steam Proton prefixes
+    wineWow64Packages.staging # Wine (32/64-bit) with staging patches
 
     # ─────────────────────────────────────────────────────────────
     # Vulkan layers
     # ─────────────────────────────────────────────────────────────
-
     vkbasalt              # Vulkan post-processing (CAS sharpening, FXAA, etc.)
-  ])
 
-  ++ (with pkgs; [
-		wineWow64Packages.staging # Wine (32/64-bit) with staging patches
-
-		steam-run             # Run generic Linux binaries inside Steam's runtime
+    # ─────────────────────────────────────────────────────────────
+    # Runner layers
+    # ─────────────────────────────────────────────────────────────
+    steam-run             # Run generic Linux binaries inside Steam's runtime
     appimage-run          # Execute AppImages on NixOS
+		
+
   ]);
 }

home/programs/group/music-apps.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = (with pkgs; [
+    ardour # DAW
+    guitarix # Digital AMP
+    carla # Hosting of VSTs
+    hydrogen# Drums
+  ]);
+}

home/programs/star-citizen/README.md

@@ -0,0 +1,110 @@
+# Star Citizen on Nixy
+
+This repo already includes Star Citizen support through `nix-citizen`.
+
+Relevant files:
+
+- `flake.nix` — declares the `nix-citizen` and `nix-gaming` inputs
+- `home/programs/star-citizen/default.nix` — Home Manager module that installs the chosen Star Citizen package
+- `home/programs/steam/system.nix` — Steam / gamescope / gamemode setup
+- `home/programs/group/gaming-apps.nix` — extra gaming tools such as `lutris`, `mangohud`, `protonup-qt`, and `wine`
+
+## Recommended package
+
+For most setups, start with:
+
+- `rsi-launcher-umu`
+
+If you want the game package instead of just the launcher, try:
+
+- `star-citizen-umu`
+
+The `*-umu` variants are usually the safest choice on Nix-based gaming setups because they are designed around UMU/Proton style runtime handling.
+
+## How to enable it
+
+Your laptop and home-pc profiles already import the module:
+
+- `hosts/laptop/home.nix`
+- `hosts/home-pc/home.nix`
+
+So you only need to turn it on in the relevant Home Manager config.
+
+Add or update:
+
+```nix
+programs.star-citizen = {
+  enable = true;
+  package = "rsi-launcher-umu";
+};
+```
+
+If you want the packaged game instead of the launcher, use:
+
+```nix
+programs.star-citizen = {
+  enable = true;
+  package = "star-citizen-umu";
+};
+```
+
+## Rebuild
+
+This flake exposes NixOS host outputs, so apply the change with your normal host rebuild command from the repo root:
+
+```bash
+sudo nixos-rebuild switch --flake .#thinkpad
+```
+
+or:
+
+```bash
+sudo nixos-rebuild switch --flake .#home-pc
+```
+
+If you’re building from one of the host directories directly, use the host-specific `nixos-rebuild` flow you already use in this repo.
+
+## First launch checklist
+
+Before launching the game, make sure:
+
+- `Steam` module is enabled
+- `gamescope` and `gamemode` are available
+- `protonup-qt` is installed so you can manage `GE-Proton` / `Wine-GE`
+- you have enough disk space for the launcher and game files
+- your GPU drivers are set up properly
+
+Useful tools already included in this repo:
+
+- `lutris`
+- `mangohud`
+- `goverlay`
+- `gamescope`
+- `gamemode`
+- `protonup-qt`
+- `winetricks`
+- `protontricks`
+
+## Notes
+
+- Star Citizen is a Windows game, so the launcher/game still downloads its own data after installation.
+- If the launcher starts but the game fails to launch, try switching the package to another `nix-citizen` option from `home/programs/star-citizen/default.nix`.
+- If you want overlay/performance debugging, launch the game with `MANGOHUD=1` or use the included `mangohud` / `goverlay` tools.
+
+## Troubleshooting
+
+### Launcher doesn’t appear
+
+- Rebuild the Home Manager profile
+- Check that `programs.star-citizen.enable = true;`
+- Confirm the module is imported in the host profile you are using
+
+### Launcher opens but game fails
+
+- Try `rsi-launcher-umu` or `star-citizen-umu`
+- Verify `protonup-qt` has a current `GE-Proton`
+- Make sure `gamescope` / `gamemode` are enabled in your gaming setup
+
+### Need a clean reset
+
+If you want to switch package variants, change `programs.star-citizen.package` and rebuild again. The package selection is the only thing the module installs.

home/programs/zen/default.nix

@@ -1,62 +1,98 @@
 {
+  inputs,
   pkgs,
-  lib,
-  config,
   ...
-}:
-{
+}: {
+  imports = [inputs.zen-browser.homeModules.beta];
   programs.zen-browser = {
     enable = true;
-
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-
-      OfferToSaveLogins = false;
-      PasswordManagerEnabled = false;
-
-      AutofillAddressEnabled = false;
-      AutofillCreditCardEnabled = false;
-
-      DontCheckDefaultBrowser = true;
-
-      DNSOverHTTPS = {
-        Enabled = true;
-        ProviderURL = "https://dns.quad9.net/dns-query";
-        Locked = true;
-      };
-    };
-
     profiles.default = {
+      extensions = {
+        packages = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+          video-downloadhelper
+          multi-account-containers
+          noscript
+        ];
+      };
       search = {
         force = true;
-        default = "Startpage";
-      };
+        default = "startpage";
+        engines = {
+          nixos-options = {
+            name = "NixOS Options";
+            urls = [{template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";}];
+            definedAliases = ["@no"];
+          };
+          nixos-packages = {
+            name = "NixOS Packages";
+            urls = [{template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";}];
+            definedAliases = ["@np"];
+          };
+          nixos-wiki = {
+            name = "NixOS Wiki";
+            urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
+            definedAliases = ["@nw"];
+          };
+          startpage = {
+            name = "Startpage";
+            urls = [
+              {
+                method = "POST";
+                template = "https://www.startpage.com/sp/search";
+                params = [
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                  {
+                    name = "prfe";
+                    value = "26b77e0ef13273610e32813c3233d92429c5426b277dcad41b2f2d38f94a44e839aa1abc7cf4223afd5872a185d5c9976949b9b1f0f83bbde3f9d4ac610d8fffa03947db6336c7a249ef62c2824adfd1";
+                  }
+                ];
+              }
 
+              {
+                type = "application/x-suggestions+json";
+                template = "https://www.startpage.com/osuggestions?query={searchTerms}";
+              }
+            ];
+            definedAliases = ["@sp"];
+          };
+        };
+      };
       settings = {
-        "browser.startup.homepage" = "https://duckduckgo.com";
+        "browser.download.useDownloadDir" = false;
+        "browser.ml.linkPreview.enabled" = true;
+        "browser.ml.linkPreview.optin" = true;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = true;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = true;
+        "browser.search.suggest.enabled" = true;
+        "browser.search.suggest.enabled.private" = true;
+        "browser.translations.neverTranslateLanguages" = "de";
+        "dom.security.https_only_mode" = true;
+        "network.trr.mode" = 3;
+        "network.trr.uri" = "https://mozilla.cloudflare-dns.com/dns-query";
+        "privacy.history.custom" = false;
+        "privacy.trackingprotection.allow_list.convenience.enabled" = true;
+        "zen.tabs.select-recently-used-on-close" = false;
+        "zen.tabs.show-newtab-vertical" = false;
+        "zen.view.show-newtab-button-top" = false;
+        "zen.workspaces.continue-where-left-off" = true;
 
-        "browser.newtabpage.enabled" = false;
-
-        "privacy.resistFingerprinting" = true;
+        "browser.contentblocking.category" = "strict";
+        "network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation" = true;
+        "network.lna.blocking" = true;
+        "privacy.annotate_channels.strict_list.enabled" = true;
+        "privacy.bounceTrackingProtection.mode" = 1;
+        "privacy.fingerprintingProtection" = true;
+        "privacy.query_stripping.enabled" = true;
+        "privacy.query_stripping.enabled.pbmode" = true;
+        "privacy.trackingprotection.consentmanager.skip.pbmode.enabled" = false;
+        "privacy.trackingprotection.emailtracking.enabled" = true;
         "privacy.trackingprotection.enabled" = true;
-
-        "geo.enabled" = false;
-        "dom.webnotifications.enabled" = false;
-
-        "signon.rememberSignons" = false;
-
-        "toolkit.telemetry.enabled" = false;
+        "privacy.trackingprotection.socialtracking.enabled" = true;
       };
-
-      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-        ublock-origin
-        firefox-multi-account-containers
-        noscript
-      ];
     };
   };
-
-  home.sessionVariables.BROWSER = "zen";
 }

home/programs/zen/default.nix.old

@@ -0,0 +1,62 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  programs.zen-browser = {
+    enable = true;
+
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+
+      OfferToSaveLogins = false;
+      PasswordManagerEnabled = false;
+
+      AutofillAddressEnabled = false;
+      AutofillCreditCardEnabled = false;
+
+      DontCheckDefaultBrowser = true;
+
+      DNSOverHTTPS = {
+        Enabled = true;
+        ProviderURL = "https://dns.quad9.net/dns-query";
+        Locked = true;
+      };
+    };
+
+    profiles.default = {
+      search = {
+        force = true;
+        default = "Startpage";
+      };
+
+      settings = {
+        "browser.startup.homepage" = "https://duckduckgo.com";
+
+        "browser.newtabpage.enabled" = false;
+
+        "privacy.resistFingerprinting" = true;
+        "privacy.trackingprotection.enabled" = true;
+
+        "geo.enabled" = false;
+        "dom.webnotifications.enabled" = false;
+
+        "signon.rememberSignons" = false;
+
+        "toolkit.telemetry.enabled" = false;
+      };
+
+      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+        ublock-origin
+        firefox-multi-account-containers
+        noscript
+      ];
+    };
+  };
+
+  home.sessionVariables.BROWSER = "zen";
+}

home/system/hyprland/bindings.nix

@@ -2,29 +2,226 @@
   pkgs,
   lib,
   config,
+  pkgs-nur-hadi,
   ...
-}: let
+}:
+let
   colors = config.lib.stylix.colors;
 
-  mkMenu = menu: let
-    configFile = pkgs.writeText "config.yaml" (
-      lib.generators.toYAML {} {
-        anchor = "bottom-right";
-        border = "#${colors.base0D}80";
-        background = "#${colors.base01}EE";
-        color = "#${colors.base05}";
-        margin_right = 15;
-        margin_bottom = 15;
-        rows_per_column = 5;
+  mkMenu = menu:
+    let
+      configFile = pkgs.writeText "config.yaml" (
+        lib.generators.toYAML { } {
+          anchor = "bottom-right";
+          border = "#${colors.base0D}80";
+          background = "#${colors.base01}EE";
+          color = "#${colors.base05}";
+          margin_right = 15;
+          margin_bottom = 15;
+          rows_per_column = 5;
 
-        inherit menu;
-      }
-    );
-  in
+          inherit menu;
+        }
+      );
+    in
     pkgs.writeShellScriptBin "menu" ''
       exec ${lib.getExe pkgs.wlr-which-key} ${configFile}
     '';
-in {
+
+  gui = exe: "uwsm app -- ${exe}";
+  term = exe: "uwsm app -- ${pkgs.ghostty}/bin/ghostty -e ${exe}";
+
+  appsMenu = mkMenu [
+    {
+      key = "f";
+      desc = "Firefox";
+      cmd = gui "${pkgs.firefox}/bin/firefox";
+    }
+    {
+      key = "o";
+      desc = "Obsidian";
+      cmd = gui "${pkgs.obsidian}/bin/obsidian";
+    }
+    {
+      key = "t";
+      desc = "TickTick";
+      cmd = gui "${pkgs.ticktick}/bin/ticktick";
+    }
+    {
+      key = "n";
+      desc = "OnlyOffice";
+      cmd = gui "${pkgs.onlyoffice-desktopeditors}/bin/onlyoffice-desktopeditors";
+    }
+    {
+      key = "v";
+      desc = "Vesktop";
+      cmd = gui "${pkgs.vesktop}/bin/vesktop";
+    }
+    {
+      key = "l";
+      desc = "VLC";
+      cmd = gui "${pkgs.vlc}/bin/vlc";
+    }
+  ];
+
+  devMenu = mkMenu [
+    {
+      key = "z";
+      desc = "Zed";
+      cmd = gui "${pkgs.zed-editor}/bin/zed";
+    }
+    {
+      key = "c";
+      desc = "VSCodium";
+      cmd = gui "${pkgs.vscodium}/bin/codium";
+    }
+    {
+      key = "g";
+      desc = "Ghostty";
+      cmd = gui "${pkgs.ghostty}/bin/ghostty";
+    }
+    {
+      key = "f";
+      desc = "Fastfetch";
+      cmd = term "${pkgs.fastfetch}/bin/fastfetch";
+    }
+    {
+      key = "d";
+      desc = "Dysk";
+      cmd = term "${pkgs.dysk}/bin/dysk";
+    }
+    {
+      key = "w";
+      desc = "Wikiman";
+      cmd = term "${pkgs.wikiman}/bin/wikiman";
+    }
+    {
+      key = "s";
+      desc = "STTR";
+      cmd = term "${pkgs.sttr}/bin/sttr";
+    }
+  ];
+
+  gamingMenu = mkMenu [
+    {
+      key = "l";
+      desc = "Lutris";
+      cmd = gui "${pkgs.lutris}/bin/lutris";
+    }
+    {
+      key = "p";
+      desc = "ProtonUp-Qt";
+      cmd = gui "${pkgs.protonup-qt}/bin/protonup-qt";
+    }
+    {
+      key = "g";
+      desc = "GOverlay";
+      cmd = gui "${pkgs.goverlay}/bin/goverlay";
+    }
+  ];
+
+  utilityMenu = mkMenu [
+    {
+      key = "B";
+      desc = "Blueman";
+      cmd = gui "${pkgs.blueman}/bin/blueman-manager";
+    }
+    {
+      key = "x";
+      desc = "Bluetoothctl";
+      cmd = term "${pkgs.bluez}/bin/bluetoothctl";
+    }
+    {
+      key = "w";
+      desc = "WiFi TUI";
+      cmd = term "${pkgs.wifitui}/bin/wifitui";
+    }
+    {
+      key = "m";
+      desc = "Wiremix";
+      cmd = term "${pkgs.wiremix}/bin/wiremix";
+    }
+    {
+      key = "u";
+      desc = "USBGuard TUI";
+      cmd = term "${pkgs-nur-hadi.usbguard-tui}/bin/usbguard-tui";
+    }
+    {
+      key = "c";
+      desc = "Caligula";
+      cmd = term "${pkgs.caligula}/bin/caligula";
+    }
+    {
+      key = "h";
+      desc = "Browsh";
+      cmd = term "${pkgs.browsh}/bin/browsh";
+    }
+    {
+      key = "p";
+      desc = "Peaclock";
+      cmd = term "${pkgs.peaclock}/bin/peaclock";
+    }
+    {
+      key = "o";
+      desc = "Cbonsai";
+      cmd = term "${pkgs.cbonsai}/bin/cbonsai";
+    }
+    {
+      key = "i";
+      desc = "Pipes";
+      cmd = term "${pkgs.pipes}/bin/pipes";
+    }
+    {
+      key = "t";
+      desc = "Tealdeer";
+      cmd = term "${pkgs.tealdeer}/bin/tldr";
+    }
+    {
+      key = "s";
+      desc = "Hyprlock";
+      cmd = gui "${pkgs.hyprlock}/bin/hyprlock";
+    }
+  ];
+
+  systemMenu = mkMenu [
+    {
+      key = "l";
+      desc = "Lock";
+      cmd = "hyprlock";
+    }
+    {
+      key = "w";
+      desc = "Restart Waybar";
+      cmd = "pkill -x waybar; waybar";
+    }
+    {
+      key = "r";
+      desc = "Restart Walker";
+      cmd = "systemctl --user restart walker.service";
+    }
+    {
+      key = "e";
+      desc = "Restart Elephant";
+      cmd = "systemctl --user restart elephant.service";
+    }
+    {
+      key = "s";
+      desc = "Suspend";
+      cmd = "systemctl suspend";
+    }
+    {
+      key = "p";
+      desc = "Power Off";
+      cmd = "systemctl poweroff";
+    }
+    {
+      key = "b";
+      desc = "Reboot";
+      cmd = "systemctl reboot";
+    }
+  ];
+in
+{
   wayland.windowManager.hyprland.settings = {
     "$mod" = "SUPER";
     "$shiftMod" = "SUPER_SHIFT";
@@ -37,53 +234,28 @@ in {
           + lib.getExe (mkMenu [
             {
               key = "a";
-              desc = "Proton Authenticator";
-              cmd = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs.proton-authenticator}/bin/proton-authenticator";
+              desc = "Apps";
+              cmd = lib.getExe appsMenu;
             }
             {
-              key = "p";
-              desc = "Proton Pass";
-              cmd = "${pkgs.proton-pass}/bin/proton-pass";
+              key = "d";
+              desc = "Dev";
+              cmd = lib.getExe devMenu;
             }
             {
-              key = "v";
-              desc = "Proton VPN";
-              cmd = "${pkgs.proton-vpn}/bin/protonvpn-app";
+              key = "g";
+              desc = "Gaming";
+              cmd = lib.getExe gamingMenu;
             }
             {
-              key = "c";
-              desc = "Proton Calendar";
-              cmd = "${config.programs.librewolf.package}/bin/helium 'https://calendar.proton.me/'";
-            }
-            {
-              key = "m";
-              desc = "Proton Mail";
-              cmd = "${config.programs.librewolf.package}/bin/helium 'https://mail.proton.me/'";
-            }
-            {
-              key = "o";
-              desc = "Obsidian";
-              cmd = "${pkgs.obsidian}/bin/obsidian";
+              key = "u";
+              desc = "Utilities";
+              cmd = lib.getExe utilityMenu;
             }
             {
               key = "s";
-              desc = "Signal";
-              cmd = "${pkgs.signal-desktop}/bin/signal-desktop";
-            }
-            {
-              key = "t";
-              desc = "TickTick";
-              cmd = "${pkgs.ticktick}/bin/ticktick";
-            }
-            {
-              key = "b";
-              desc = "Helium";
-              cmd = "${config.programs.librewolf.package}/bin/helium";
-            }
-            {
-              key = "i";
-              desc = "Helium (Incognito)";
-              cmd = "${config.programs.librewolf.package}/bin/helium --incognito";
+              desc = "System";
+              cmd = lib.getExe systemMenu;
             }
           ])
         )
@@ -97,7 +269,7 @@ in {
             {
               key = "l";
               desc = "Lock";
-              cmd = "loginctl lock-session";
+              cmd = "hyprlock";
             }
             {
               key = "s";
@@ -172,23 +344,21 @@ in {
     ];
 
     bindl = [
-    # Brightness
-    ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set 5%+"
-    ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-"
-
-    # Media
-    ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
-    ", XF86AudioPause, exec, ${lib.getExe pkgs.playerctl} play-pause"
-    ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
-    ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
-    ", XF86AudioStop, exec, ${lib.getExe pkgs.playerctl} stop"
-
-    # Sound
-    ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-    ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-    ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-  ];
+      # Brightness
+      ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set 5%+"
+      ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-"
 
+      # Media
+      ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
+      ", XF86AudioPause, exec, ${lib.getExe pkgs.playerctl} play-pause"
+      ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
+      ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
+      ", XF86AudioStop, exec, ${lib.getExe pkgs.playerctl} stop"
 
+      # Sound
+      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+      ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
+      ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+    ];
   };
 }

home/system/hyprland/default.nix

@@ -19,6 +19,7 @@ in {
     ./animations.nix
     ./bindings.nix
     ./polkitagent.nix
+    ./hyprlock.nix
     ./keyboard-backlight.nix # CHANGEME: This is for omen laptop only
   ];
 
@@ -31,6 +32,7 @@ in {
     libxcb
     hyprland-qtutils
     adw-gtk3
+    hyprlock
     hyprshot
     hyprpicker
     swappy
@@ -152,7 +154,9 @@ in {
 
         kb_options = "caps:escape";
         follow_mouse = 1;
-        sensitivity = 0.5;
+        sensitivity = 0.0; # or whatever speed you prefer
+        accel_profile = "flat";
+
         repeat_delay = 300;
         repeat_rate = 50;
         numlock_by_default = true;

home/system/hyprland/hyprlock.nix

@@ -0,0 +1,58 @@
+{config, ...}: let
+  c = config.lib.stylix.colors;
+  fontSans = config.stylix.fonts.sansSerif.name;
+in {
+  xdg.configFile."hypr/hyprlock.conf".text = ''
+    general {
+      hide_cursor = true
+      grace = 0
+    }
+
+    background {
+      monitor =
+      color = rgba(${c."base00-rgb-r"}, ${c."base00-rgb-g"}, ${c."base00-rgb-b"}, 0.90)
+      blur_passes = 2
+      blur_size = 8
+      noise = 0.01
+    }
+
+    label {
+      monitor =
+      text = cmd[update:1000] date +"%A, %d %B %Y"
+      color = rgba(${c."base05-rgb-r"}, ${c."base05-rgb-g"}, ${c."base05-rgb-b"}, 1.0)
+      font_size = 30
+      font_family = "${fontSans}"
+      position = 0, 140
+      halign = center
+      valign = center
+    }
+
+    label {
+      monitor =
+      text = cmd[update:1000] date +"%H:%M"
+      color = rgba(${c."base0D-rgb-r"}, ${c."base0D-rgb-g"}, ${c."base0D-rgb-b"}, 1.0)
+      font_size = 54
+      font_family = "${fontSans}"
+      position = 0, 60
+      halign = center
+      valign = center
+    }
+
+    input-field {
+      monitor =
+      size = 320, 52
+      outline_thickness = 2
+      outer_color = rgba(${c."base03-rgb-r"}, ${c."base03-rgb-g"}, ${c."base03-rgb-b"}, 0.60)
+      inner_color = rgba(${c."base01-rgb-r"}, ${c."base01-rgb-g"}, ${c."base01-rgb-b"}, 0.92)
+      font_color = rgba(${c."base05-rgb-r"}, ${c."base05-rgb-g"}, ${c."base05-rgb-b"}, 1.0)
+      fail_color = rgba(${c."base08-rgb-r"}, ${c."base08-rgb-g"}, ${c."base08-rgb-b"}, 1.0)
+      check_color = rgba(${c."base0B-rgb-r"}, ${c."base0B-rgb-g"}, ${c."base0B-rgb-b"}, 1.0)
+      dots_spacing = 0.3
+      dots_center = true
+      hide_input = false
+      position = 0, -20
+      halign = center
+      valign = center
+    }
+  '';
+}

hosts/home-pc/configuration.nix

@@ -4,6 +4,7 @@
 		# System configuration
 		# ─────────────────────────────────────────────────────────────
     ../../nixos/audio.nix
+    ../../nixos/docker.nix
     ../../nixos/bluetooth.nix
     ../../nixos/fonts.nix
     ../../nixos/home-manager.nix
@@ -30,6 +31,7 @@
     ./variables.nix
   ];
 
+  programs.nix-ld.enable = true; #Dynamic Linking
   home-manager.users."${config.var.username}" = import ./home.nix;
 	services.flatpak.enable = true;
   # Don't touch this

hosts/home-pc/hardware-configuration.nix

@@ -1,45 +1,50 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/5dbf85d3-d236-4af8-b489-d6066bfe1eb7";
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/E823-261A";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/mnt/hdd" = {
+    device = "/dev/disk/by-uuid/8b6e4527-2ea7-4f08-9f86-12a766e39313";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/043E-1755";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/d0243bc0-10fb-4fa6-9933-945eb2965385"; }
     ];
-  };
-
-  swapDevices = [];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/home-pc/home.nix

@@ -28,6 +28,7 @@
     ../../home/programs/group/dev.nix
     ../../home/programs/group/misc.nix
 		../../home/programs/group/gaming-apps.nix
+    ../../home/programs/group/music-apps.nix
 
     # ─────────────────────────────────────────────────────────────
     # System
@@ -60,6 +61,10 @@
 
   programs = {
     home-manager.enable = true;
+    star-citizen = {
+      enable = true;
+      package = "rsi-launcher-umu";
+    };
     nixy = {
       enable = true;
       configDirectory = config.var.configDirectory;

hosts/laptop/configuration.nix

@@ -25,6 +25,7 @@
 
 	];
 
+	programs.nix-ld.enable = true; #Dynamic Linking
 	home-manager.users."${config.var.username}" = import ./home.nix;
 	services.flatpak.enable = true;
 	# Don't touch this

hosts/laptop/home.nix

@@ -14,6 +14,7 @@
     ../../home/programs/nix-utils
     ../../home/programs/spotatui
     ../../home/programs/yazi
+    ../../home/programs/zen
 
 		# ─────────────────────────────────────────────────────────────
     # Gaming

nixos/nix.nix

@@ -22,9 +22,12 @@ in {
       ];
     }
   ];
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowBroken = false;
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      allowBroken = false;
+    };
+    overlays = [inputs.nur.overlays.default];
   };
   nix = {
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];

nixos/users.nix

@@ -16,6 +16,8 @@ in {
       extraGroups = [
         "networkmanager"
         "wheel"
+        "video"
+        "render"
       ];
     };
   };