modify structure

flake.nix

@@ -87,11 +87,11 @@
               ];
             }
             ./system/all.nix
-            ./system/widevine/default.nix
+            ./system/widevine
             ./system/shell/fish.nix
-            ./system/tailscale/default.nix
+            ./system/tailscale
-            ./system/hosts/${hostname}/default.nix
+            ./system/hosts/${hostname}
-            ./hardware/${hostname}.nix
+            ./hardware/${hostname}
             catppuccin.nixosModules.catppuccin
             home-manager.nixosModules.home-manager
             noctalia.nixosModules.default

home/kde/default.nix

@@ -1,6 +1,24 @@
 { config, pkgs, ... }:
 
 {
+  programs.ghostwriter = {
+    enable = true;
+    font = {
+      family = config.userOptions.fontSans.name;
+      pointSize = config.userOptions.fontSans.size;
+    };
+  };
+
+  programs.kate = {
+    enable = true;
+    editor = {
+      font = {
+        family = config.userOptions.fontMono.name;
+        pointSize = config.userOptions.fontMono.size;
+      };
+    };
+  };
+
   programs.plasma = {
     enable = true;
     overrideConfig = true;

home/kde/other.nix

@@ -1,21 +0,0 @@
-{ config, ... }:
-
-{
-  programs.ghostwriter = {
-    enable = true;
-    font = {
-      family = config.userOptions.fontSans.name;
-      pointSize = config.userOptions.fontSans.size;
-    };
-  };
-
-  programs.kate = {
-    enable = true;
-    editor = {
-      font = {
-        family = config.userOptions.fontMono.name;
-        pointSize = config.userOptions.fontMono.size;
-      };
-    };
-  };
-}

home/tiling/niri/default.nix

@@ -9,6 +9,10 @@ let
   };
 in
 {
+  imports = [
+    ./niri.nix
+    ./noctalia.nix
+  ];
   home.packages = with pkgs; [
     xdg-desktop-portal
     brightnessctl

system/all.nix

@@ -53,23 +53,20 @@
   home-manager.useUserPackages = true;
   home-manager.users.sckova = {
     imports = [
-      ../home/all.nix
+      ../home
-      ../home/browsers/firefox/default.nix
+      ../home/browsers/firefox
-      ../home/tiling/niri/default.nix
+      ../home/tiling/niri
-      ../home/tiling/niri/niri.nix
+      ../home/tiling/quickshell
-      ../home/tiling/niri/noctalia.nix
+      ../home/tiling/wallpaper
-      ../home/tiling/quickshell/default.nix
+      ../home/tiling/waybar
-      ../home/tiling/wallpaper/bing-wallpaper.nix
+      ../home/systemd
-      ../home/tiling/waybar/default.nix
+      ../home/terminal/btop
-      ../home/systemd/default.nix
+      ../home/terminal/fish
-      ../home/terminal/btop/default.nix
+      ../home/terminal/kitty
-      ../home/terminal/fish/default.nix
+      ../home/terminal/nvim
-      ../home/terminal/kitty/default.nix
+      ../home/kde
-      ../home/terminal/nvim/default.nix
+      ../home/vscode
-      ../home/kde/plasma.nix
+      ../home/hosts/${config.networking.hostName}
-      ../home/kde/other.nix
-      ../home/vscode/default.nix
-      ../home/hosts/${config.networking.hostName}.nix
     ];
   };