Refactor/ctos cleanup keybinds

CONTRIBUTING.md

@@ -22,12 +22,9 @@ This provides `nixfmt`, `nil` (Nix LSP), `python3`, `git`, and `jq`.
 
 ## Adding a New Host
 
-1. Run the interactive installer (creates `hosts/<hostname>` automatically):
-   ```bash
-   nix run . --impure
-   ```
+Create a host directory (`hosts/YourHostName` containing `default.nix`, `disko.nix`, and `hardware.nix`):
 
-2. Or create a host directory manually (`hosts/YourHostName` containing `default.nix`, `disko.nix`, and `hardware.nix`):
+1. Generate hardware configuration:
    ```bash
    mkdir -p hosts/YourHostName
    sudo nixos-generate-config --show-hardware-config > hosts/YourHostName/hardware.nix
@@ -74,11 +71,11 @@ The host is **auto-discovered** — any directory in `hosts/` with both `default
 # Nix-native checks (module syntax, lib tests, eval tests)
 nix flake check --impure
 
-# Python installer tests
-python3 -m unittest discover -s tests -v
+# End-to-end and test suite runner
+./tests/e2e/run_tests.sh
 
-# Format check
-nix fmt -- --check .
+# Format check (CI mode)
+nix fmt -- --ci
 ```
 
 ## Code Formatting
@@ -105,21 +102,22 @@ We use `nixfmt-rfc-style` (the RFC 166 formatter).
 ```
 ctos/
 ├── flake.nix              # Flake entry point
-├── flake/                 # flake-parts modules (hosts, installer, checks, devshell, formatter)
+├── flake/                 # flake-parts modules (hosts, checks, devshell, formatter, modules, shell)
 ├── hosts/                 # Host machine configs (auto-discovered)
 │   ├── common.nix         # Shared base config
 │   └── <hostname>/        # Per-machine config
 ├── home/
 │   └── home.nix           # Base Home Manager user environment
 ├── lib/
-│   ├── core.nix           # Shared Nix helpers (scanModules, discoverHosts, mkDisko, mkUser, mkProfile)
+│   ├── core.nix           # Shared Nix helpers (scanModules, discoverHosts, mkDisko, mkProfile)
 │   └── disko/
 │       └── generator.nix  # Dynamic mkDisko partition generator
 ├── modules/               # Option-based modules (auto-discovered)
 │   ├── features/          # Vertical feature slices (core, desktop, dev, shell, terminals, tools)
 │   ├── hardware/          # Hardware drivers (NVIDIA)
 │   └── profiles/          # Composable feature bundles (base, desktop, workstation, gaming)
-├── installer/             # Python interactive installer
-├── tests/                 # Python test suites
+├── scripts/               # Repository and maintenance utility scripts
+├── shell/                 # ctOS Quickshell desktop environment and greeter
+├── tests/                 # End-to-end and boundary test suites
 └── assets/                # Themes and media
 ```

assets/ctos-plymouth/ctos.script

@@ -106,6 +106,8 @@ for (i = 0; i < 13; i++) {
     );
 }
 
+empty_image = Image();
+
 log_sprites = [];
 for (i = 0; i < 5; i++) {
     log_sprites[i] = Sprite();
@@ -236,35 +238,45 @@ fun refresh_callback() {
 
     indicator.SetOpacity(0.48 + (pulse * 0.27));
 
-    if ((frame % 12) == 0 && log_index < 13) {
-        log_index++;
+    if ((frame % 12) == 0) {
+        if (log_index < 13) {
+            log_index++;
+        }
     }
 
     for (i = 0; i < 5; i++) {
         line_idx = log_index + i - 4;
 
-        if (line_idx >= 0 && line_idx < 13) {
-            log_sprites[i].SetImage(log_images[line_idx]);
-            log_sprites[i].SetY(telemetry_y + 22 + (i * 18));
-
-            if (i == 0) {
-                log_sprites[i].SetOpacity(0.24);
-            } else if (i == 1) {
-                log_sprites[i].SetOpacity(0.36);
-            } else if (i == 2) {
-                log_sprites[i].SetOpacity(0.50);
-            } else if (i == 3) {
-                log_sprites[i].SetOpacity(0.64);
+        if (line_idx >= 0) {
+            if (line_idx < 13) {
+                log_sprites[i].SetImage(log_images[line_idx]);
+                log_sprites[i].SetY(telemetry_y + 22 + (i * 18));
+
+                if (i == 0) {
+                    log_sprites[i].SetOpacity(0.24);
+                } else if (i == 1) {
+                    log_sprites[i].SetOpacity(0.36);
+                } else if (i == 2) {
+                    log_sprites[i].SetOpacity(0.50);
+                } else if (i == 3) {
+                    log_sprites[i].SetOpacity(0.64);
+                } else {
+                    log_sprites[i].SetOpacity(0.80);
+                }
             } else {
-                log_sprites[i].SetOpacity(0.80);
+                log_sprites[i].SetImage(empty_image);
+                log_sprites[i].SetOpacity(0.0);
             }
         } else {
+            log_sprites[i].SetImage(empty_image);
             log_sprites[i].SetOpacity(0.0);
         }
     }
 
-    if ((frame % 7) == 0 && progress_index < 20) {
-        progress_index++;
+    if ((frame % 7) == 0) {
+        if (progress_index < 20) {
+            progress_index++;
+        }
     }
 
     progress.SetImage(progress_images[progress_index]);

flake/shell.nix

@@ -3,7 +3,8 @@
 {
   perSystem =
     { pkgs, ... }:
-    {
+    rec {
       packages.ctos-shell = pkgs.callPackage ../shell/nix/package.nix { };
+      packages.default = packages.ctos-shell;
     };
 }

hosts/Makima/default.nix

@@ -21,8 +21,6 @@
     home.homeDirectory = lib.mkForce "/home/reze";
   };
 
-  # Bootloader (Limine)
-  boot.loader.limine.resolution = "1920x1080";
   ctos.features.boot.secureBoot.enable = true;
 
   users.users.reze = {
@@ -33,6 +31,7 @@
       "wheel"
       "libvirtd"
       "docker"
+      "wireshark"
     ];
     shell = pkgs.zsh;
     hashedPassword = "$6$7uVH9VA23imtOFPs$Rx7oc7xoN5gxBqdB6pg1ZG7xqAeX4LIzLuKjPExFOySTdfmVGdDbCD.4K/dtLLbUbdpcNJ8W5OYpeknaij6mM.";
@@ -60,6 +59,9 @@
     amdgpuBusId = "PCI:5:0:0";
   };
 
+  programs.wireshark.enable = true;
+  programs.wireshark.package = pkgs.wireshark-cli;
+
   networking.hostName = "Makima";
   system.stateVersion = "26.11";
 }

lib/core.nix

@@ -31,33 +31,6 @@ rec {
     });
   };
 
-  # User & Home-Manager Functional Combinator
-  mkUser =
-    {
-      username,
-      groups ? [ "wheel" ],
-      shell ? null,
-      homeDir ? "/home/${username}",
-      homeConfig ? ../home/home.nix,
-      extraConfig ? { },
-    }:
-    { pkgs, ... }:
-    {
-      users.users.${username} = {
-        isNormalUser = true;
-        description = username;
-        extraGroups = groups;
-      }
-      // (lib.optionalAttrs (shell != null) { inherit shell; })
-      // extraConfig;
-
-      home-manager.users.${username} = {
-        imports = [ homeConfig ];
-        home.username = username;
-        home.homeDirectory = homeDir;
-      };
-    };
-
   scanModules =
     dir:
     if dir |> builtins.pathExists then
@@ -107,21 +80,4 @@ rec {
     ]
     ++ modulePaths
     ++ lib.optionals (hostHasDisko hostsDir hostName) [ inputs.disko.nixosModules.disko ];
-
-  mkSystem =
-    {
-      inputs,
-      hostName,
-      system ? "x86_64-linux",
-      hostsDir ? ../hosts,
-      extraModules ? [ ],
-    }:
-    lib.nixosSystem {
-      inherit system;
-      specialArgs = {
-        inherit inputs;
-        ctos = import ./core.nix { inherit lib; };
-      };
-      modules = (mkHostModules { inherit inputs hostsDir hostName; }) ++ extraModules;
-    };
 }

modules/features/desktop/desktopPackages.nix

@@ -21,6 +21,8 @@ in
       easyeffects
       grim
       hyprcursor
+      hypridle
+      hyprlock
       hyprpolkitagent
       kdePackages.dolphin
       kdePackages.okular

modules/features/desktop/hyprland.nix

@@ -15,8 +15,6 @@ let
       pkgs,
       ...
     }:
-    let
-    in
     {
       config = {
         home.packages = with pkgs; [
@@ -141,7 +139,7 @@ let
 
           hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal))
           hl.bind(mainMod .. " + C", hl.dsp.window.close())
-          hl.bind(mainMod .. " + M", hl.dsp.exit())
+          hl.bind(mainMod .. " + SHIFT + E", hl.dsp.exit())
           hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager))
           hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
           hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))

modules/features/desktop/hyprlock.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.ctos.features.hyprlock;
+
+  hmHyprlockModule =
+    { ... }:
+    {
+      config = {
+        xdg.configFile."hypr/hyprlock.conf".source = ../../../shell/config/hypr/hyprlock.conf;
+        xdg.configFile."hypr/hypridle.conf".source = ../../../shell/config/hypr/hypridle.conf;
+      };
+    };
+in
+{
+  options.ctos.features.hyprlock.enable = lib.mkEnableOption "ctOS lockscreen and idle daemon";
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      hyprlock
+      hypridle
+    ];
+
+    security.pam.services.hyprlock = { };
+
+    services.hypridle.enable = true;
+
+    home-manager.sharedModules = [ hmHyprlockModule ];
+  };
+}