fix

modules/applications/btop/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.btop = {

modules/applications/claude/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.claude = {

modules/applications/fcitx5/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.fcitx5 = {

modules/applications/ghostty/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.ghostty = {

modules/applications/git/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.git = {

modules/applications/gtk/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.gtk = {

modules/applications/gtk/system.nix

@@ -1,4 +1,8 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
   cfg = config.my.applications.gtk.system;
 in
@@ -10,5 +14,7 @@ in
   config = lib.mkIf cfg.enable {
     programs.dconf.enable = true;
     programs.seahorse.enable = true;
+
+    services.gnome.gnome-keyring.enable = true;
   };
 }

modules/applications/niri/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.niri = {

modules/applications/noctalia/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.noctalia = {

modules/applications/ssh/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.ssh = {

modules/applications/vim/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home
+    ./system.nix
   ];
 
   options.my.applications.vim = {

modules/applications/vim/home/plugins/default.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./ui
     ./editor
+    ./ui
   ];
 }

modules/applications/vim/home/plugins/editor/default.nix

@@ -1,23 +1,23 @@
 { ... }:
 {
   imports = [
-    ./snacks.nix
-    ./treesitter.nix
-    ./blink-cmp.nix
-    ./gitsigns.nix
-    ./comment.nix
     ./autopairs.nix
-    ./lsp-signature.nix
+    ./blink-cmp.nix
-    ./copilot.nix
+    ./comment.nix
-    ./trouble.nix
     ./conform.nix
-    ./surround.nix
+    ./copilot.nix
-    ./git.nix
-    ./git-conflict.nix
-    ./glance.nix
     ./flash.nix
-    ./todo-comments.nix
+    ./git-conflict.nix
+    ./git.nix
+    ./gitsigns.nix
+    ./glance.nix
+    ./lsp-signature.nix
+    ./snacks.nix
     ./spectre.nix
+    ./surround.nix
+    ./todo-comments.nix
+    ./treesitter.nix
+    ./trouble.nix
     ./wakatime.nix
   ];
 }

modules/applications/vim/home/plugins/ui/default.nix

@@ -1,20 +1,20 @@
 { ... }:
 {
   imports = [
-    ./lualine.nix
-    ./neo-tree.nix
-    ./blankline.nix
-    ./which-key.nix
-    ./web-devicons.nix
-    ./toggleterm.nix
-    ./treesitter.nix
     ./barbar.nix
-    ./lightbulb.nix
+    ./blankline.nix
     ./colorizer.nix
     ./dropbar.nix
-    ./scrollbar.nix
+    ./lightbulb.nix
-    ./ufo.nix
+    ./lualine.nix
-    ./zen-mode.nix
     ./markview.nix
+    ./neo-tree.nix
+    ./scrollbar.nix
+    ./toggleterm.nix
+    ./treesitter.nix
+    ./ufo.nix
+    ./web-devicons.nix
+    ./which-key.nix
+    ./zen-mode.nix
   ];
 }

modules/applications/vscode/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.vscode = {

modules/applications/zellij/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.zellij = {

modules/applications/zsh/default.nix

@@ -8,8 +8,8 @@ let
 in
 {
   imports = [
-    ./system.nix
     ./home.nix
+    ./system.nix
   ];
 
   options.my.applications.zsh = {

modules/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./applications
+    ./drivers
+    ./integrations
+    ./system
+  ];
+}

modules/system/audio.nix

@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+let
+  cfg = config.my.system.audio;
+in
+{
+  options.my.system.audio = {
+    enable = lib.mkEnableOption "Audio support (PipeWire)";
+  };
+
+  config = lib.mkIf cfg.enable {
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+      wireplumber.enable = true;
+    };
+  };
+}

modules/system/boot/default.nix

@@ -4,8 +4,14 @@
   ...
 }:
 {
+  imports = [
+    ./nfs.nix
+    ./uefi.nix
+  ];
+
   boot = {
     loader.systemd-boot.configurationLimit = lib.mkDefault 8;
     kernelPackages = pkgs.linuxPackages_latest;
   };
+  programs.nix-ld.enable = true;
 }

modules/system/boot/nfs.nix

@@ -14,5 +14,6 @@ in
   config = lib.mkIf cfg.enable {
     boot.supportedFilesystems = [ "nfs" ];
     fuse.userAllowOther = true;
+    services.rpcbind.enable = true;
   };
 }

modules/system/default.nix

@@ -1,14 +1,15 @@
 {
   imports = [
+    ./audio.nix
     ./boot
-    ./nix.nix
     ./camera.nix
     ./fingerprint.nix
     ./fonts.nix
     ./gc.nix
-    ./locale.nix
     ./hardware
+    ./locale.nix
     ./network
+    ./nix.nix
     ./power.nix
     ./secure-boot.nix
     ./user

modules/system/hardware/default.nix

@@ -1,7 +1,14 @@
 { lib, ... }:
 {
+  imports = [
+    ./bluetooth.nix
+    ./gui.nix
+  ];
+
   hardware = {
     enableRedistributableFirmware = lib.mkDefault true;
     keyboard.qmk.enable = true;
   };
+
+  services.fwupd.enable = true;
 }

modules/system/network/default.nix

@@ -4,6 +4,10 @@
   ...
 }:
 {
+  imports = [
+    ./wifi.nix
+  ];
+
   networking = {
     hostName = host;
 

modules/system/power.nix

@@ -24,5 +24,14 @@ in
     services.power-profiles-daemon.enable = true;
     services.tlp.enable = false;
     services.upower.enable = true;
+
+    services.logind = {
+      settings.Login = {
+        HandleLidSwitch = "suspend";
+        HandleLidSwitchDocked = "ignore";
+        HandleLidSwitchExternalPower = "suspend";
+        LidSwitchIgnoreInhibited = "no";
+      };
+    };
   };
 }

modules/system/version.nix

@@ -7,12 +7,12 @@
   options.my.stateVersions = {
     nixos = lib.mkOption {
       type = lib.types.str;
-      default = "25.11";
+      default = "26.05";
     };
 
     homeManager = lib.mkOption {
       type = lib.types.str;
-      default = "25.11";
+      default = "26.05";
     };
   };