39 changed files with 11 additions and 6 deletions
--- a/homes/julian/aspi.nix
+++ b/homes/julian/aspi.nix
@ -1,18 +1,22 @@
 {
  imports = [
    ./global
-
    ./features/fish
    ./features/direnv
    ./features/topgrade
    ./features/neovim
    ./features/kitty
    ./features/wezterm
+    ./features/alacritty
    ./features/yazi
    ./features/emacs
+    # ./features/i3

    ./features/hyprland

+    ./features/nix-helper
+    ./features/desktop
+
    ./features/suites/cli
    ./features/suites/desktop
    ./features/suites/development
--- a/homes/julian/features/desktop/default.nix
+++ b/homes/julian/features/desktop/default.nix
--- a/homes/julian/features/desktop/wallpapers/32j4hjkl4j4hkl.png
+++ b/homes/julian/features/desktop/wallpapers/32j4hjkl4j4hkl.png
--- a/homes/julian/features/desktop/wallpapers/Bridge.jpg
+++ b/homes/julian/features/desktop/wallpapers/Bridge.jpg
--- a/homes/julian/features/desktop/wallpapers/astronaut.png
+++ b/homes/julian/features/desktop/wallpapers/astronaut.png
--- a/homes/julian/features/desktop/wallpapers/astronaut_ultra.png
+++ b/homes/julian/features/desktop/wallpapers/astronaut_ultra.png
--- a/homes/julian/features/desktop/wallpapers/babel.png
+++ b/homes/julian/features/desktop/wallpapers/babel.png
--- a/homes/julian/features/desktop/wallpapers/blockwavemoon.png
+++ b/homes/julian/features/desktop/wallpapers/blockwavemoon.png
--- a/homes/julian/features/desktop/wallpapers/cat_Japanese_Neon.png
+++ b/homes/julian/features/desktop/wallpapers/cat_Japanese_Neon.png
--- a/homes/julian/features/desktop/wallpapers/cat_leaves.png
+++ b/homes/julian/features/desktop/wallpapers/cat_leaves.png
--- a/homes/julian/features/desktop/wallpapers/colorful-planets.jpg
+++ b/homes/julian/features/desktop/wallpapers/colorful-planets.jpg
--- a/homes/julian/features/desktop/wallpapers/finalizer.png
+++ b/homes/julian/features/desktop/wallpapers/finalizer.png
--- a/homes/julian/features/desktop/wallpapers/gruv-material.png
+++ b/homes/julian/features/desktop/wallpapers/gruv-material.png
--- a/homes/julian/features/desktop/wallpapers/ign-0002.png
+++ b/homes/julian/features/desktop/wallpapers/ign-0002.png
--- a/homes/julian/features/desktop/wallpapers/ign-0008.png
+++ b/homes/julian/features/desktop/wallpapers/ign-0008.png
--- a/homes/julian/features/desktop/wallpapers/ign-0011.png
+++ b/homes/julian/features/desktop/wallpapers/ign-0011.png
--- a/homes/julian/features/desktop/wallpapers/ign_car.png
+++ b/homes/julian/features/desktop/wallpapers/ign_car.png
--- a/homes/julian/features/desktop/wallpapers/ign_city.png
+++ b/homes/julian/features/desktop/wallpapers/ign_city.png
--- a/homes/julian/features/desktop/wallpapers/ign_cityRainOther.png
+++ b/homes/julian/features/desktop/wallpapers/ign_cityRainOther.png
--- a/homes/julian/features/desktop/wallpapers/ign_herakles.png
+++ b/homes/julian/features/desktop/wallpapers/ign_herakles.png
--- a/homes/julian/features/desktop/wallpapers/ign_stuff.png
+++ b/homes/julian/features/desktop/wallpapers/ign_stuff.png
--- a/homes/julian/features/desktop/wallpapers/ign_unsplash16.png
+++ b/homes/julian/features/desktop/wallpapers/ign_unsplash16.png
--- a/homes/julian/features/desktop/wallpapers/koi2.png
+++ b/homes/julian/features/desktop/wallpapers/koi2.png
--- a/homes/julian/features/desktop/wallpapers/nix-wallpaper-nineish-catppuccin-mocha.png
+++ b/homes/julian/features/desktop/wallpapers/nix-wallpaper-nineish-catppuccin-mocha.png
--- a/homes/julian/features/desktop/wallpapers/nord_buildings.png
+++ b/homes/julian/features/desktop/wallpapers/nord_buildings.png
--- a/homes/julian/features/desktop/wallpapers/outer-space.png
+++ b/homes/julian/features/desktop/wallpapers/outer-space.png
--- a/homes/julian/features/desktop/wallpapers/platform.jpg
+++ b/homes/julian/features/desktop/wallpapers/platform.jpg
--- a/homes/julian/features/desktop/wallpapers/rolly.png
+++ b/homes/julian/features/desktop/wallpapers/rolly.png
--- a/homes/julian/features/desktop/wallpapers/rose_pine_contourline.png
+++ b/homes/julian/features/desktop/wallpapers/rose_pine_contourline.png
--- a/homes/julian/features/desktop/wallpapers/rose_pine_shape.png
+++ b/homes/julian/features/desktop/wallpapers/rose_pine_shape.png
--- a/homes/julian/features/desktop/wallpapers/shiny-colors.png
+++ b/homes/julian/features/desktop/wallpapers/shiny-colors.png
--- a/homes/julian/features/desktop/wallpapers/skullcat.png
+++ b/homes/julian/features/desktop/wallpapers/skullcat.png
--- a/homes/julian/features/desktop/wallpapers/space324dhsj.png
+++ b/homes/julian/features/desktop/wallpapers/space324dhsj.png
--- a/homes/julian/features/desktop/wallpapers/spiral.jpg
+++ b/homes/julian/features/desktop/wallpapers/spiral.jpg
--- a/homes/julian/features/desktop/wallpapers/spooky_spill.jpg
+++ b/homes/julian/features/desktop/wallpapers/spooky_spill.jpg
--- a/homes/julian/features/desktop/wallpapers/wallpaper.jpg
+++ b/homes/julian/features/desktop/wallpapers/wallpaper.jpg
--- a/homes/julian/features/suites/desktop/default.nix
+++ b/homes/julian/features/suites/desktop/default.nix
@ -3,8 +3,6 @@
  pkgs,
  ...
 }: {
-  imports = [../../gtk];
-
  services.blueman-applet.enable = true;
  services.nextcloud-client.enable = true;
  services.nextcloud-client.startInBackground = true;
--- a/homes/julian/global/default.nix
+++ b/homes/julian/global/default.nix
@ -1,4 +1,5 @@
 {
+  inputs,
  lib,
  pkgs,
  config,
@ -8,7 +9,8 @@
  imports =
    [
      ../features/fonts
-      ../features/nix-helper
+      # ../features/cli
+      # ../features/helix
    ]
    ++ (builtins.attrValues outputs.homeManagerModules);

--- a/homes/julian/kardorf.nix
+++ b/homes/julian/kardorf.nix
@ -10,8 +10,9 @@
    ./features/wezterm
    ./features/yazi
    ./features/emacs
-
-    ./features/hyprland
+    ./features/i3
+    ./features/nix-helper
+    ./features/desktop

    ./features/suites/cli
    ./features/suites/desktop