Merge branch 'nixos' into nixos-work

modules/profiles/base.nix

@@ -187,14 +187,13 @@ in
         rs = "sudo systemctl";
         uj = "journalctl --user";
         rj = "sudo journalctl";
+        lg = "lazygit";
       };
       aliases = {
         ls = "${getExe pkgs.eza} -lh --icons --git";
         cat = "bat";
         rm = "rm -i";
         mv = "mv -i";
-
-        nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
       };
       variables = { EDITOR = "vim"; };
     };
@@ -241,6 +240,7 @@ in
     which-nix
 
     # utils
+    (viu.override { withSixel = true; })
     bat
     cht-sh
     f
@@ -249,7 +249,6 @@ in
     parallel
     ripgrep
     vim
-    (viu.override { withSixel = true; })
     wget
   ];
 
@@ -300,6 +299,65 @@ in
         ];
       };
       starship.enable = true;
+      lazygit.enable = true;
+      lazygit.settings = {
+        customCommands = [
+          {
+            key = "<c-v>";
+            context = "global";
+            description = "Create new conventional commit";
+            prompts = [
+              {
+                type = "menu";
+                key = "Type";
+                title = "Type of change";
+                options = [
+                  { name = "build"; description = "Changes that affect the build system or external dependencies"; value = "build"; }
+                  { name = "feat"; description = "A new feature"; value = "feat"; }
+                  { name = "fix"; description = "A bug fix"; value = "fix"; }
+                  { name = "chore"; description = "Other changes that don't modify src or test files"; value = "chore"; }
+                  { name = "ci"; description = "Changes to CI configuration files and scripts"; value = "ci"; }
+                  { name = "docs"; description = "Documentation only changes"; value = "docs"; }
+                  { name = "perf"; description = "A code change that improves performance"; value = "perf"; }
+                  { name = "refactor"; description = "A code change that neither fixes a bug nor adds a feature"; value = "refactor"; }
+                  { name = "revert"; description = "Reverts a previous commit"; value = "revert"; }
+                  { name = "style"; description = "Changes that do not affect the meaning of the code"; value = "style"; }
+                  { name = "test"; description = "Adding missing tests or correcting existing tests"; value = "test"; }
+                ];
+              }
+              {
+                type = "input";
+                title = "Scope";
+                key = "Scope";
+                initialValue = "";
+              }
+              {
+                type = "menu";
+                key = "Breaking";
+                title = "Breaking change";
+                options = [
+                  { name = "no"; value = ""; }
+                  { name = "yes"; value = "!"; }
+                ];
+              }
+              {
+                type = "input";
+                title = "message";
+                key = "Message";
+                initialValue = "";
+              }
+              {
+                type = "confirm";
+                key = "Confirm";
+                title = "Commit";
+                body = "Are you sure you want to commit?";
+              }
+            ];
+            command = "git commit --message '{{.Form.Type}}{{ if .Form.Scope }}({{ .Form.Scope }}){{ end }}{{.Form.Breaking}}: {{.Form.Message}}'";
+            loadingText = "Creating conventional commit...";
+          }
+        ];
+      };
     };
     home = {
       username = "moritz";

modules/profiles/desktop.nix

@@ -31,7 +31,7 @@ in
         chromium.enable = mkDefault true;
         firefox.enable = mkDefault true;
         gpg.enable = mkDefault true;
-        hyprland.enable = mkDefault true;
+        river.enable = mkDefault true;
         nix-edit.enable = mkDefault true;
         nvim.enable = mkDefault true;
         python.versions."311".enable = mkDefault true;

modules/profiles/impermanence.nix

@@ -45,6 +45,8 @@ in
           ".cat_installer" # eduroam
           ".config/JetBrains"
           ".config/Nextcloud"
+          ".config/Signal/"
+          ".config/Mullvad VPN/"
           ".config/calibre"
           ".config/github-copilot"
           ".config/kdeconnect"