feat: update desktop apps configuration

LibreOffice: bump versiont to newest
Firefox: change to firefox-devedition
Programs: reorganise config into special programs dir

4 files changed, 38 insertions, 37 deletions

diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix
index a859e2c..ab17c62 100644
--- a/home-manager/stvnliu/home.nix
+++ b/home-manager/stvnliu/home.nix
@@ -1,5 +1,3 @@
-# his is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
 {
   inputs,
   lib,
@@ -7,13 +5,7 @@
   pkgs,
   ...
 }: {
-  # You can import other home-manager modules here
   imports = [
-    # If you want to use home-manager modules from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModule
-
-    # You can also split up your configuration and import pieces of it here:
-    #./swaywm.nix
     ./hypr
     ./shells
     ../../common/variables.nix
@@ -26,20 +18,12 @@
     ./stylix.nix
     ./spicetify.nix
     ./scripts
+    ./programs
   ];
 
   nixpkgs = {
     # You can add overlays here
     overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
       (final: prev: {
         ags = prev.ags.overrideAttrs (old: {
           buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
@@ -71,12 +55,10 @@
     tree
     zed-editor
     rhythmbox
-    #clash-verge-rev
     vesktop
     qq
-    libreoffice
+    libreoffice-fresh
     discord
-    #zathura
     kdePackages.okular
     shotwell
     mpv
@@ -93,7 +75,7 @@
   ];
   myAutostartCommands = [
     #"${pkgs.clash-verge-rev}/bin/clash-verge"
-    "${pkgs.firefox}/bin/firefox"
+    "${config.programs.firefox.package}/bin/firefox"
     "${pkgs.thunderbird}/bin/thunderbird"
   ];
 
@@ -103,24 +85,13 @@
       plugins = [pkgs.obs-studio-plugins.wlrobs];
     };
     home-manager.enable = true;
-    firefox.enable = true;
-    thunderbird = {
+    firefox = {
       enable = true;
-      profiles.default = {isDefault = true;};
+      package = pkgs.firefox-devedition;
     };
-    git = {
+    thunderbird = {
       enable = true;
-      package = pkgs.gitFull;
-      userName = config.myDisplayName;
-      userEmail = config.myEmail;
-      extraConfig = {
-        push.autoSetupRemote = true;
-        commit.gpgsign = true;
-        gpg.format = "ssh";
-        gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers";
-        user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub";
-        credential.helper = "libsecret";
-      };
+      profiles.default = {isDefault = true;};
     };
   };
   # Nicely reload system units when changing configs
diff --git a/home-manager/stvnliu/hypr/hyprland.nix b/home-manager/stvnliu/hypr/hyprland.nix
index 4a61d7e..dba67dd 100644
--- a/home-manager/stvnliu/hypr/hyprland.nix
+++ b/home-manager/stvnliu/hypr/hyprland.nix
@@ -74,7 +74,6 @@
           # Example volume button that allows press and hold, volume limited to 150%
           "$mod, Q, killactive"
           "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
-          # firefox quickstart
           "$mod, F, fullscreen"
           "$mod, E, exec, ${pkgs.pcmanfm}/bin/pcmanfm"
           # foot terminal
diff --git a/home-manager/stvnliu/programs/default.nix b/home-manager/stvnliu/programs/default.nix
new file mode 100644
index 0000000..ec73826
--- /dev/null
+++ b/home-manager/stvnliu/programs/default.nix
@@ -0,0 +1,10 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  imports = [
+    ./git.nix
+  ];
+}
diff --git a/home-manager/stvnliu/programs/git.nix b/home-manager/stvnliu/programs/git.nix
new file mode 100644
index 0000000..2910e7f
--- /dev/null
+++ b/home-manager/stvnliu/programs/git.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  programs.git = {
+    enable = true;
+    package = pkgs.gitFull;
+    userName = config.myDisplayName;
+    userEmail = config.myEmail;
+    extraConfig = {
+      push.autoSetupRemote = true;
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers";
+      user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub";
+      credential.helper = "libsecret";
+    };
+  };
+}