Refactor home configuration: update .gitignore, add packages and programs modules, and clean up flatpak settings

.gitignore

@@ -1,2 +1,3 @@
 result
-*.qcow2
+*.qcow2
+output.txt

common/modules/flatpak.nix

@@ -26,14 +26,6 @@
         appId = "com.github.tchx84.Flatseal";
         origin = "flathub";
       }
-      {
-        appId = "org.gtk.Gtk3theme.Adwaita-dark";
-        origin = "flathub";
-      }
-      {
-        appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest";
-        origin = "flathub";
-      }
       {
         appId = "com.github.iwalton3.jellyfin-media-player";
         origin = "flathub";

common/modules/home/default.nix

@@ -2,6 +2,8 @@
   imports = [
     ./dconf
     ./desktop-files.nix
+    ./packages.nix
+    ./programs.nix
     ./starship.nix
     ./services.nix
     ./zsh.nix

common/modules/home/packages.nix

@@ -0,0 +1,35 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    alejandra
+    anki
+    binwalk
+    bubblemail
+    cisco-packet-tracer_9
+    czkawka-full
+    discord
+    distrobox
+    element-desktop
+    gemini-cli
+    gimp
+    inkscape
+    jetbrains.clion
+    just
+    libreoffice-fresh
+    nil
+    nix-output-monitor
+    nix-your-shell
+    obsidian
+    rquickshare
+    saber
+    scrcpy
+    telegram-desktop
+    testdisk
+    tidal-hifi
+    tldr
+    trash-cli
+    treefmt
+    vesktop
+    vlc
+    yt-dlp
+  ];
+}

common/modules/home/programs.nix

@@ -0,0 +1,59 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs = {
+    direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    firefox = {
+      enable = true;
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
+      languagePacks = [
+        "cs"
+        "en-GB"
+        "en-US"
+      ];
+    };
+
+    fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    git = {
+      enable = true;
+      lfs.enable = true;
+    };
+
+    vscode = {
+      enable = true;
+      package = pkgs.vscode.fhsWithPackages (
+        ps:
+          with ps; [
+            python3
+            zlib
+            gcc
+            gnumake
+          ]
+      );
+    };
+
+    zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    bat.enable = true;
+    eza.enable = true;
+    fd.enable = true;
+    htop.enable = true;
+    jq.enable = true;
+    ripgrep.enable = true;
+    thunderbird.enable = true;
+    zsh.enable = true;
+  };
+}

common/modules/home/zsh.nix

@@ -1,29 +1,32 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   programs.zsh = {
-    enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
     autosuggestion.strategy = ["history" "completion" "match_prev_cmd"];
     syntaxHighlighting.enable = true;
     dotDir = "${config.xdg.configHome}/zsh";
 
-    oh-my-zsh = {
-      enable = true;
-      theme = "robbyrussell";
-      plugins = [
-        "git"
-        "docker"
-        "docker-compose"
-        "sudo"
-        "vscode"
-        "z"
-        "colorize"
-      ];
-    };
+    plugins = [
+      {
+        name = "fzf-tab";
+        src = pkgs.fetchFromGitHub {
+          owner = "Aloxaf";
+          repo = "fzf-tab";
+          rev = "master";
+          sha256 = "sha256-yvPQyuK4Dw+LkwxrkWTRcw4PIf/79fW61jWbEg8Pe9Y=";
+        };
+      }
+    ];
 
     shellAliases = {
       adbauto = "adbauto_";
       adbpair = "adbpair_";
+      cat = "bat";
     };
 
     sessionVariables = {
@@ -43,10 +46,10 @@
       zstyle ':completion:*' matcher-list "" 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' '+l:|?=** r:|?=**'
 
       # Path Management
-      export PATH="$HOME/.local/bin:/usr/local/LinkServer/:$PATH"
+      export PATH="${config.home.homeDirectory}/.local/bin:/usr/local/LinkServer/:$PATH"
 
-      # Dart Completion
-      [[ -f /home/jax/.dart-cli-completion/zsh-config.zsh ]] && . /home/jax/.dart-cli-completion/zsh-config.zsh || true
+      # Dart Completion (Safely quoted to prevent bash from misinterpreting the nix string)
+      [[ -f "${config.home.homeDirectory}/.dart-cli-completion/zsh-config.zsh" ]] && . "${config.home.homeDirectory}/.dart-cli-completion/zsh-config.zsh" || true
 
       if command -v nix-your-shell > /dev/null; then
         nix-your-shell zsh | source /dev/stdin
@@ -75,6 +78,16 @@
         echo "Found device at $IP:$PORT"
         adb pair "$IP:$PORT"
       }
+
+      # Dank `sudo` OMZ plugin replacement
+      prepend-sudo() {
+        if [[ $BUFFER != su(do|)\ * ]]; then
+          BUFFER="sudo $BUFFER"
+          CURSOR+=5
+        fi
+      }
+      zle -N prepend-sudo
+      bindkey "\e\e" prepend-sudo
     '';
   };
 }

common/modules/packages.nix

@@ -34,9 +34,7 @@
 
   environment.systemPackages = with pkgs; [
     abootimg
-    alejandra
     android-tools
-    anki
     appstream
     aspell
     aspellDicts.cs
@@ -44,23 +42,15 @@
     aspellDicts.es
     attic-client
     bibata-cursors
-    binwalk
     brscan4
     brscan5
     btrfs-progs
-    bubblemail
     bzip2
-    cisco-packet-tracer_9
     # clion-flake.packages.${pkgs.stdenv.hostPlatform.system}.default
     curl
-    czkawka-full
     ddcutil
-    discord
-    distrobox
     docker-buildx
     docker-compose
-    element-desktop
-    eza
     # fet.packages.${pkgs.stdenv.hostPlatform.system}.default
     ffmpeg-full
     ffmpegthumbnailer
@@ -73,8 +63,6 @@
     fuse
     fuse3
     fwupd
-    gemini-cli
-    gimp
     gnome-tweaks
     gnome.gvfs
     gotop
@@ -89,18 +77,12 @@
     gst_all_1.gstreamer
     gvfs
     gzip
-    htop
     i2c-tools
     iftop
-    inkscape
     iotop
-    jetbrains.clion
-    jq
-    just
     killall
     libgsf
     libnotify
-    libreoffice-fresh
     libsForQt5.qtstyleplugins
     linux-firmware
     lm_sensors
@@ -115,12 +97,8 @@
     mission-center
     ncdu
     networkmanager-openconnect
-    nil
-    nix-output-monitor
-    nix-your-shell
     ntfs3g
     nufraw-thumbnailer
-    obsidian
     papirus-icon-theme
     pbzip2
     pciutils
@@ -130,39 +108,18 @@
     prismlauncher-unwrapped
     protonup-qt
     pulseaudio
-    rquickshare
-    saber
-    scrcpy
     screen
     seafile-client
     smartmontools
     solaar
     sushi
-    telegram-desktop
-    testdisk
-    thunderbird
-    tidal-hifi
-    tldr
-    trash-cli
     tree
-    treefmt
     tumbler
     unrar
     unzip
     usbutils
     ventoy-full-gtk
-    vesktop
     vkbasalt
-    vlc
-    (vscode.fhsWithPackages (
-      ps:
-        with ps; [
-          python3
-          zlib
-          gcc
-          gnumake
-        ]
-    ))
     webp-pixbuf-loader
     wev
     wget
@@ -170,7 +127,6 @@
     wineWow64Packages.waylandFull
     wireshark
     xz
-    yt-dlp
     zip
     zram-generator
     zstd

common/modules/programs.nix

@@ -5,33 +5,6 @@
   ...
 }: {
   programs = {
-    dconf.profiles.gdm.databases = [
-      {
-        settings = {
-          "org/gnome/desktop/peripherals/keyboard" = {
-            numlock-state = true;
-            remember-numlock-state = true;
-          };
-
-          "org/gnome/desktop/peripherals/mouse" = {
-            speed-profile = "flat";
-          };
-
-          "org/gnome/desktop/interface" = {
-            color-scheme = "prefer-dark";
-            gtk-theme = "Flat-Remix-GTK-Red-Darkest";
-            icon-theme = "Papirus-Dark";
-            cursor-theme = "Bibata-Modern-Classic";
-            clock-format = "24h";
-          };
-
-          "org/gnome/shell/portal" = {
-            color-scheme = "prefer-dark";
-          };
-        };
-      }
-    ];
-
     appimage = {
       enable = true;
       binfmt = true;
@@ -44,29 +17,10 @@
     zsh.enable = true;
     gamemode.enable = true;
 
-    firefox = {
-      enable = true;
-      languagePacks = [
-        "cs"
-        "en-GB"
-        "en-US"
-      ];
-    };
-
-    direnv = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
     weylus.enable = true;
     gamescope.enable = true;
     virt-manager.enable = true;
 
-    git = {
-      enable = true;
-      lfs.enable = true;
-    };
-
     nh = {
       clean = {
         enable = true;

desktop/modules/home/default.nix

@@ -1,5 +1,7 @@
 {...}: {
   imports = [
     ./dconf
+    ./packages.nix
+    ./programs.nix
   ];
 }

desktop/modules/home/packages.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+  ];
+}

desktop/modules/home/programs.nix

@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs = {
+    obs-studio = {
+      enable = true;
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-backgroundremoval
+        obs-gstreamer
+        obs-pipewire-audio-capture
+        obs-vaapi
+        obs-vkcapture
+        wlrobs
+      ];
+    };
+  };
+}

desktop/modules/programs.nix

@@ -9,17 +9,5 @@
       enable = true;
       cacheDir = "/media/data/.ccache";
     };
-
-    obs-studio = {
-      enable = true;
-      plugins = with pkgs.obs-studio-plugins; [
-        obs-backgroundremoval
-        obs-gstreamer
-        obs-pipewire-audio-capture
-        obs-vaapi
-        obs-vkcapture
-        wlrobs
-      ];
-    };
   };
 }

laptop/modules/home/default.nix

@@ -1,5 +1,7 @@
 {...}: {
   imports = [
     ./dconf
+    ./packages.nix
+    ./programs.nix
   ];
 }

laptop/modules/home/packages.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+  ];
+}

laptop/modules/home/programs.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  programs = {
+  };
+}