Debloat & refactor

8 files changed, 56 insertions, 163 deletions

diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index b78eb4e..e152e46 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -28,7 +28,6 @@
     hostName = "wonderland";
     useNetworkd = true;
 
-    nftables.enable = true;
     firewall = {
       enable = true;
       allowedTCPPorts = [ 80 443 34197 ];
@@ -62,22 +61,9 @@
     };
   };
 
-  # Set your time zone.
   time.timeZone = "Europe/Zagreb";
-
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
-  services.xserver = {
-    enable = true;
-    displayManager = {
-      sddm.enable = true;
-      defaultSession = "plasmawayland";
-    };
-    desktopManager.plasma5.enable = true;
-    videoDrivers = [ "amdgpu" ];
-  };
-
   # Enable sound.
   sound.enable = true;
   services.pipewire = {
@@ -86,16 +72,6 @@
     pulse.enable = true;
   };
 
-  services.printing = {
-    enable = true;
-    drivers = with pkgs; [
-      gutenprint
-      gutenprintBin
-      epson_201207w
-      epson-201401w
-    ];
-  };
-
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
@@ -106,7 +82,6 @@
 
   virtualisation.podman = {
     enable = true;
-    dockerSocket.enable = true;
     dockerCompat = true;
     autoPrune.enable = true;
   };
diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix
index b57342a..c22d063 100644
--- a/hosts/wonderland/home.nix
+++ b/hosts/wonderland/home.nix
@@ -5,24 +5,15 @@
 }:
 let
   desktop-pkgs = with pkgs; [
-    mullvad-vpn
-    bitwarden
+    mullvad
     calibre
     beekeeper-studio
     thunderbird
     brightnessctl
 
-    libsForQt5.plasma-browser-integration
-    libsForQt5.kdeconnect-kde
-    libsForQt5.ark
-    libsForQt5.kate
     haruna # Video player
     libreoffice-qt
-    gimp
-    audacity
     discord
-    whatsapp-for-linux
-    inkscape
 
     nsxiv
     inputs.scripts.packages.${pkgs.system}.image-move
@@ -32,9 +23,11 @@ let
   ];
 in
 {
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.sharedModules = [{ imports = [ (flakeRoot + /share/home) ]; }];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    sharedModules = [{ imports = [ (flakeRoot + /share/home) ]; }];
+  };
 
   home-manager.users.alice = {
     imports =
@@ -42,75 +35,35 @@ in
         home = flakeRoot + /share/home;
       in
       [
-        # Custom home manager modules
-        (flakeRoot + /share/hm-modules/wpaperd.nix)
-
         # Config
-        (home + /kitty.nix)
         (home + /hyprland.nix)
         (home + /git.nix)
+        (home + /gallery-dl.nix)
         (home + /firefox)
-        (home + /wezterm)
       ];
     home.packages = with pkgs;
       [
         signal-desktop
         tdesktop # Telegram desktop
         qbittorrent
-        okteta
         emacs
         # spotify-qt librespot
         nheko # matrix client
 
         # Various utils
         # qemu_kvm
-        pijul # alternative vsc system
         tokei # counts lines of code
         dua # modern du with interactive mode (dua i)
         btop # modern top
+        qemu_kvm
 
         # Gaming
-        libsForQt5.kpat # solitare
         jdk17_headless
         superTuxKart
-
-        linux-wifi-hotspot
-        qemu_kvm
       ]
       ++ desktop-pkgs;
 
     home.stateVersion = "22.05";
-
-    programs.gallery-dl = {
-      enable = true;
-      settings.extractor = {
-        base-directory = "$XDG_DOWNLOAD_DIR/gallery-dl";
-
-        postprocessors = [
-          {
-            name = "metadata";
-            mode = "json";
-            whitelist = [
-              "danbooru"
-              "moebooru"
-              "gelbooru"
-              "sankaku"
-              "nhentai"
-              "rule34"
-            ];
-          }
-          {
-            name = "zip";
-            compression = "store";
-            extension = "cbz";
-            filter = "extension not in ('zip', 'rar')";
-            whitelist = [ "nhentai" "mangadex" ];
-          }
-        ];
-
-        Danbooru.metadata = true;
-      }; # End of settings.extractor
-    }; # End of programs.gallery-dl
   }; # End of users.alice
 
   home-manager.users.madhatter = {
@@ -131,7 +84,6 @@ in
 
   home-manager.users.root = {
     home.packages = with pkgs; [
-      linux-wifi-hotspot
       dua # modern du with interactive mode (dua i)
     ];
 
diff --git a/share/home/default.nix b/share/home/default.nix
index 8e2fa08..dcd9af4 100644
--- a/share/home/default.nix
+++ b/share/home/default.nix
@@ -4,18 +4,18 @@
   imports = [ ./helix.nix ./zsh.nix ];
 
   home.packages = with pkgs; [
-    xclip
     wget
-    hunspell
-    hunspellDicts.en_US
-    hunspellDicts.hr_HR
-    ripgrep
     git
     age
     gnupg
     xh
-    fd
-    sd
+
+    # Modern unix
+    ripgrep # grep
+    fd # find
+    sd # sed
+    dua # du
+
     bc # CLI calculator
     ffmpeg
     amfora # Gemini CLI browser
diff --git a/share/home/gallery-dl.nix b/share/home/gallery-dl.nix
new file mode 100644
index 0000000..9231208
--- /dev/null
+++ b/share/home/gallery-dl.nix
@@ -0,0 +1,32 @@
+{ config, ... }: {
+  programs.gallery-dl = {
+    enable = true;
+    settings.extractor = {
+      base-directory = "${config.xdg.userDirs.download}/gallery-dl";
+
+      postprocessors = [
+        {
+          name = "metadata";
+          mode = "json";
+          whitelist = [
+            "danbooru"
+            "moebooru"
+            "gelbooru"
+            "sankaku"
+            "nhentai"
+            "rule34"
+          ];
+        }
+        {
+          name = "zip";
+          compression = "store";
+          extension = "cbz";
+          filter = "extension not in ('zip', 'rar')";
+          whitelist = [ "nhentai" "mangadex" ];
+        }
+      ];
+
+      Danbooru.metadata = true;
+    }; # End of settings.extractor
+  }; # End of programs.gallery-dl
+}
diff --git a/share/home/hyprland.nix b/share/home/hyprland.nix
index 63d5d77..0666e3b 100644
--- a/share/home/hyprland.nix
+++ b/share/home/hyprland.nix
@@ -1,7 +1,15 @@
 # IMPORTANT: this module requires the system to already have `programs.hyprland`
 #            enabled. You can enable it by importing `share/system/hyprland.nix`
 { pkgs, ... }: {
-  imports = [ ./kitty.nix ./wpaperd.nix ./eww ];
+  imports = [
+    # Custom home manager modules
+    ../hm-modules/wpaperd.nix
+
+    # Config
+    ./kitty.nix
+    ./wpaperd.nix
+    ./eww
+  ];
 
   wayland.windowManager.hyprland = {
     enable = true;
diff --git a/share/home/wezterm/config.lua b/share/home/wezterm/config.lua
deleted file mode 100644
index 872a1aa..0000000
--- a/share/home/wezterm/config.lua
+++ /dev/null
@@ -1,62 +0,0 @@
-local wezterm = require 'wezterm'
-local act = wezterm.action
-local config = {}
-
-if wezterm.config_builder then
-  config = wezterm.config_builder()
-end
-
-config.color_scheme = 'Catppuccin Mocha'
-config.window_background_opacity = 0.9
-
-config.default_cursor_style = "SteadyBar"
-config.font = wezterm.font('Blex Mono Nerd Font')
-config.font_size = 9.5
-
-config.keys = {
-  -- Tab management
-  { key = '1', mods = 'ALT', action = act.ActivateTab(0) },
-  { key = '2', mods = 'ALT', action = act.ActivateTab(1) },
-  { key = '3', mods = 'ALT', action = act.ActivateTab(2) },
-  { key = '4', mods = 'ALT', action = act.ActivateTab(3) },
-  { key = '5', mods = 'ALT', action = act.ActivateTab(4) },
-  { key = '6', mods = 'ALT', action = act.ActivateTab(5) },
-  { key = '7', mods = 'ALT', action = act.ActivateTab(6) },
-  { key = '8', mods = 'ALT', action = act.ActivateTab(7) },
-  { key = 't', mods = 'CTRL|SHIFT', action = act.SpawnTab 'CurrentPaneDomain' },
-  { key = 'w', mods = 'CTRL|SHIFT', action = act.CloseCurrentTab{ confirm = true}},
-  { key = '{', mods = 'CTRL|SHIFT', action = act.MoveTabRelative(-1) },
-  { key = '}', mods = 'CTRL|SHIFT', action = act.MoveTabRelative(1) },
-
-  -- Split management
-  {
-    key = 'h',
-    mods = 'CTRL',
-    action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
-  },
-  {
-    key = 'v',
-    mods = 'CTRL',
-    action = act.SplitVertical { domain = 'CurrentPaneDomain' },
-  },
-  {
-    key = 'q',
-    mods = 'CTRL',
-    action = act.CloseCurrentPane { confirm = true },
-  },
-  -- Split movement
-  -- activate pane selection mode with the default alphabet (labels are "a", "s", "d", "f" and so on)
-  -- (j)ump to split
-  { key = 'j', mods = 'CTRL', action = act.PaneSelect },
-  -- show the pane selection mode, but have it swap the active and selected panes
-  -- (m)ove split
-  {
-    key = 'm',
-    mods = 'CTRL',
-    action = act.PaneSelect {
-      mode = 'SwapWithActive',
-    },
-  },
-}
-
-return config
diff --git a/share/home/wezterm/default.nix b/share/home/wezterm/default.nix
deleted file mode 100644
index b06022b..0000000
--- a/share/home/wezterm/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  programs.wezterm = {
-    enable = true;
-    extraConfig = builtins.readFile ./config.lua;
-  };
-
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs;
-    [ (nerdfonts.override { fonts = [ "IBMPlexMono" ]; }) ];
-}
diff --git a/share/home/zsh.nix b/share/home/zsh.nix
index ef79acb..8b5f2b3 100644
--- a/share/home/zsh.nix
+++ b/share/home/zsh.nix
@@ -67,6 +67,4 @@
     #      };
     #    }; # end of settings
   }; # end of programs.starship
-
-  programs.wezterm.enableZshIntegration = true;
 }