huge

modules/users/user/common.nix

@@ -33,5 +33,5 @@
     music = homeDir "music";
   };
 
-  dconf.settings."org/gnome/desktop/interface".enable-animations = false;
+  # dconf.settings."org/gnome/desktop/interface".enable-animations = false;
 }

modules/users/user/default.nix

@@ -3,5 +3,6 @@
     ./common.nix
     ./flatpak.nix
     ./programs.nix
+    ./services.nix
   ];
 }

modules/users/user/flatpak.nix

@@ -1,5 +1,7 @@
 {
+  config,
   inputs,
+  lib,
   pkgs,
   ...
 }: {
@@ -34,9 +36,7 @@
         "com.github.PintaProject.Pinta" # bootleg paint
         "org.gimp.GIMP" # the holy gimp
         "org.kde.kdenlive" # video editor
-        {
-          appId = "com.collabora.Office";
-        }
+        "com.collabora.Office" # libreoffice but pretty pixel-wasting ui
       ]
       ++ [
         # chatting
@@ -71,10 +71,10 @@
         "com.bitwarden.desktop"
         "com.github.johnfactotum.Foliate" # book reader
         "com.github.tchx84.Flatseal" # control flatpak permissions
-        "com.logseq.Logseq"
+        # "com.logseq.Logseq"
         "com.obsproject.Studio"
         "com.usebottles.bottles" # wine containers
-        "de.capypara.FieldMonitor" # libvirt
+        "de.capypara.FieldMonitor" # qemu and rdp/vnc client
         "org.qbittorrent.qBittorrent" # torrents
         "io.github.amit9838.mousam" # weather
         "io.github.finefindus.Hieroglyphic" # find latex symbols (in rust)
@@ -83,6 +83,7 @@
         "md.obsidian.Obsidian"
         "me.iepure.devtoolbox" # some cool utils
         "org.nicotine_plus.Nicotine" # soulseek
+        (lib.mkIf config.programs.distrobox.enable "com.ranfdev.DistroShelf")
       ];
     overrides = let
       homeNoNetwork = {

modules/users/user/programs.nix

@@ -11,18 +11,9 @@
   inherit (osConfig.virtualisation) libvirtd;
   inherit (osConfig.hardware) bluetooth;
 in {
-  imports = with flake.modules.hm-programs;
-    [
-      yazi
-      helix
-      fish
-      oh-my-posh
-      wezterm
-      ghostty
-    ]
-    ++ [./vicinae.nix];
-
-  syncthing.enable = true;
+  imports = with flake.homeModules; [
+    programs
+  ];
 
   systemd.user.settings.Manager.DefaultEnvironment = {
     TERMINAL = "wezterm";
@@ -37,14 +28,19 @@ in {
     # NPM_CONFIG_TMP = ''"$XDG_RUNTIME_DIR"/npm'';
   };
 
-  services = {
-    # pueue.enable = true; # process queue in rust
-    ssh-agent.enable = true;
-  };
-
   programs =
     lib.attrsets.recursiveUpdate
     {
+      atuin.enable = true;
+      fish.enable = true; # friendly interactive shell in rust
+      oh-my-posh.enable = true;
+
+      helix.enable = true;
+      yazi.enable = true;
+
+      wezterm.enable = true;
+      ghostty.enable = true;
+
       bat.enable = true; # cat in rust
       btop.enable = true;
       # direnv.enable = true;
@@ -60,6 +56,7 @@ in {
       nix-index-database.comma.enable = true;
       nix-index.enable = true;
       nix-your-shell.enable = true;
+      obsidian.enable = true;
       pay-respects.enable = true; # thefuck in rust
       ripgrep.enable = true; # grep in rust
       zellij.enable = true;
@@ -68,16 +65,31 @@ in {
     }
     {
       btop.settings.update_ms = 200;
+      btop.package = pkgs.btop-rocm;
 
       difftastic.git.enable = true;
       difftastic.git.diffToolMode = true;
 
-      git.signing.format = "ssh";
+      helix.defaultEditor = true;
 
+      git.signing.format = "ssh";
       git.settings.alias.cl = "clone";
       git.settings.alias.co = "checkout";
 
       keychain.keys = ["id_ed25519"];
+
+      obsidian.package = perSystem.mypackages.obsidian-bwrapped.override {
+        bwrapperOpts = {
+          sockets.x11 = false;
+          mounts.readWrite = [
+            "$HOME/Obsidian"
+          ];
+        };
+      };
+      # obsidian.vaults = {
+      #   personal.target = "Obsidian/Personal";
+      #   university.target = "Obsidian/University";
+      # };
     };
 
   home.packages = with pkgs;
@@ -103,6 +115,70 @@ in {
       systemctl-tui # systemctl tui in rust
       trashy # trash cli in rust
       up # ultimate plumber in go
+
+      (perSystem.mypackages.prismlauncher-bwrapped.override {
+        addPkgs = with pkgs; [mangohud gamemode gamescope glfw3-minecraft];
+        packageOverrides = {
+          jdks = with pkgs; [
+            # graalvmPackages.graalvm-ce
+            # zulu8
+            zulu17
+            zulu
+          ];
+        };
+      })
+      (perSystem.mypackages.zen-browser-bwrapped.override {
+        bwrapperOpts = {
+          sockets.x11 = false;
+        };
+      })
+      (perSystem.mypackages.legcord-bwrapped.override {
+        bwrapperOpts = {
+          sockets.x11 = false;
+        };
+      })
+      (perSystem.mypackages.helium-browser-bwrapped.override {
+        bwrapperOpts = {
+          sockets.x11 = false;
+          mounts.readWrite = [
+            # "$XDG_DOCUMENTS_DIR"
+            "$XDG_DOWNLOAD_DIR"
+            # "$XDG_MUSIC_DIR"
+            # "$XDG_VIDEOS_DIR"
+            # "$XDG_PICTURES_DIR"
+          ];
+        };
+      })
+      (pkgs.mkBwrapper rec {
+        app = {
+          addPkgs = with pkgs; [mangohud gamemode gamescope];
+          package = pkgs.heroic.override {
+            extraPkgs = pkgs: app.addPkgs;
+          };
+          id = "com.heroicgameslauncher.hgl_bwrapper";
+          runScript = "heroic";
+          # isFhsenv = true;
+        };
+        dbus.session.talks = [
+          "com.canonical.Unity"
+          "org.freedesktop.Notifications"
+          "org.freedesktop.PowerManagement"
+          "org.freedesktop.ScreenSaver"
+          "org.gnome.SettingsDaemon.MediaKeys"
+          "org.kde.StatusNotifierWatcher"
+        ];
+        dbus.system.talks = [
+          "org.freedesktop.UDisks2"
+          "org.freedesktop.UPower"
+        ];
+        mounts.readWrite = [
+          "/storage/games/heroic"
+          "$HOME/.config/wine-tools"
+        ];
+        mounts.read = [
+          "$XDG_CONFIG_HOME/mangohud"
+        ];
+      })
     ]
     ++ [
       (pkgs.writeShellApplication {
@@ -150,6 +226,8 @@ in {
       # sonusmix # pipewire routing tool in rust
     ];
 
+  xdg.systemDirs.data = ["/home/user/.bwrapper/helium/local/share"];
+
   # xdg.desktopEntries.uni = {
   #   actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
   #   categories = ["Utility" "X-Launch" "Network"];

modules/users/user/services.nix

@@ -0,0 +1,17 @@
+{inputs, ...}: {
+  imports = [inputs.vicinae.homeManagerModules.default];
+
+  syncthing.enable = true;
+
+  services.easyeffects.enable = true;
+
+  # services.pueue.enable = true; # process queue in rust
+  services.ssh-agent.enable = true;
+
+  services.vicinae = {
+    enable = true;
+    systemd.enable = true;
+  };
+
+  xdg.configFile."vicinae/settings.json".enable = false;
+}

modules/users/user/vicinae.nix

@@ -1,7 +0,0 @@
-{inputs, ...}: {
-  imports = [inputs.vicinae.homeManagerModules.default];
-
-  services.vicinae.enable = true;
-
-  xdg.configFile."vicinae/vicinae.json".enable = false;
-}