Complete system rework feat. Niri, Noctalia, Helix, Vicinae, Zellij, & Kanshi

modules/system/agenix.nix

@@ -3,8 +3,6 @@
   config,
   pkgs,
   lib,
-  host,
-  hostPubkey ? null,
   ...
 }:
 {
@@ -25,13 +23,13 @@
     rekey = {
       masterIdentities = [ "${inputs.self}/secrets/age-yubikey-identity-d9ed335b.pub" ];
       storageMode = "local";
-      localStorageDir = ../../. + "/secrets/rekeyed/${host}";
+      localStorageDir = ../../. + "/secrets/rekeyed/${config.host.name}";
     }
     # We only set the hostPubkey if one is supplied. For new hosts the pub key will not
     # exist until it is generated after the first rebuild. Runtime decryption will fail
     # but then the ssh host key will be generated in /etc/ssh and can be supplied
-    // lib.optionalAttrs (hostPubkey != null) {
-      inherit hostPubkey;
+    // lib.optionalAttrs (config.host.pubKey != null) {
+      hostPubkey = config.host.pubKey;
     };
     secrets = {
       tailscale-auth.rekeyFile = ../../secrets/tailscale-auth.age;

modules/system/boot.nix

@@ -12,6 +12,8 @@
       };
       efi.canTouchEfiVariables = true;
     };
-    kernelParams = [ "kvm.enable_virt_at_load=0" ];
+    kernelParams = [
+      "kvm.enable_virt_at_load=0" # Fixes some virtuallization issues
+    ];
   };
 }

modules/system/desktop.nix

@@ -1,59 +1,29 @@
 {
   inputs,
-  pkgs,
   ...
 }:
-let
-  sddm-theme = inputs.silentSDDM.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in
 {
   imports = [
-    inputs.mango.nixosModules.mango
+    inputs.niri.nixosModules.niri
   ];
 
   programs = {
-    hyprland = {
+    niri.enable = true;
+    uwsm = {
       enable = true;
-      # withUWSM = true;
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage =
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-
-    };
-    mango.enable = true;
-    # uwsm.enable = true;
-  };
-
-  environment.systemPackages = [
-    sddm-theme
-    sddm-theme.test
-  ];
-
-  services.displayManager = {
-    defaultSession = "mango";
-    sddm = {
-      enable = true;
-      package = pkgs.kdePackages.sddm;
-      theme = sddm-theme.pname;
-      extraPackages = sddm-theme.propagatedBuildInputs;
-      settings = {
-        General = {
-          GreeterEnvironment = "QML2_IMPORT_PATH=${sddm-theme}/share/sddm/themes/${sddm-theme.pname}/components/,QT_IM_MODULE=qtvirtualkeyboard";
-          InputMethod = "qtvirtualkeyboard";
+      waylandCompositors = {
+        niri = {
+          prettyName = "Niri";
+          binPath = "/run/current-system/sw/bin/niri-session";
         };
       };
-      wayland.enable = true;
     };
   };
 
-  # Enable the KDE Plasma Desktop Environment.
-  # displayManager.sddm.enable = true;
-  # desktopManager.plasma5.enable = true;
-
-  # Enable the System76 Cosmic Desktop Environment
-  # displayManager.cosmic-greeter.enable = true;
-  # desktopManager.cosmic = {
-  #   enable = true;
-  #   xwayland.enable = true;
-  # };
+  services.displayManager = {
+    gdm = {
+      enable = true;
+      wayland = true;
+    };
+  };
 }

modules/system/fileSystems.nix

@@ -40,6 +40,5 @@ in
 
   environment.systemPackages = with pkgs; [
     cifs-utils
-    # rclone
   ];
 }

modules/system/network.nix

@@ -1,19 +1,19 @@
 {
-  host,
+  config,
   ...
 }:
 {
   networking = {
-    hostName = "${host}"; # Define your hostname
-   
-    # Pick only one of the below networking options. 
+    hostName = "${config.host.name}"; # Define your hostname
+
+    # Pick only one of the below networking options.
     # wireless.enable = true; # Enables wireless support via wpa_supplicant.
     networkmanager.enable = true; # Easiest to use and most distros use this by default.
-    
+
     # Configure network proxy if necessary
     # proxy.default = "http://user:password@proxy:port/";
     # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-    
+
     # Open ports in the firewall.
     # firewall.allowedTCPPorts = [ ... ];
     # firewall.allowedUDPPorts = [ ... ];

modules/system/packages.nix

@@ -19,6 +19,7 @@
     # };
     gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
     nix-ld.enable = true;
+    xwayland.enable = true;
     zsh.enable = true;
   };
 
@@ -38,6 +39,7 @@
     systemPackages = with pkgs; [
       vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       git
+      disktui
     ];
     variables = {
       EDITOR = "vim";

modules/system/services.nix

@@ -14,7 +14,6 @@
         layout = "us";
         variant = "";
       };
-
     };
 
     # Enable touchpad support (enabled default in most desktopManager).
@@ -92,7 +91,7 @@
   hardware = {
     bluetooth = {
       enable = true;
-      powerOnBoot = true;
+      powerOnBoot = false;
     };
     sane = {
       enable = true;

modules/system/system.nix

@@ -22,6 +22,8 @@
         "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
+      extra-substituters = [ "https://vicinae.cachix.org" ];
+      extra-trusted-public-keys = [ "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ];
     };
   };
 

modules/system/user.nix

@@ -1,8 +1,6 @@
 {
   inputs,
   pkgs,
-  host,
-  wallpaper,
   config,
   ...
 }:
@@ -12,7 +10,7 @@
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    extraSpecialArgs = { inherit inputs host wallpaper; };
+    extraSpecialArgs = { inherit inputs; };
 
     users.eclypse = {
       imports = [ ../home ];