chore: update flake

modules/home/common/autotiling.nix

@@ -5,7 +5,7 @@ in
 {
   options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} and settings";
   config = lib.mkIf config.swarselmodules.${moduleName} {
-    swarselservices.${moduleName} = {
+    services.${moduleName} = {
       enable = true;
       systemdTarget = config.wayland.systemd.target;
     };

modules/home/common/emacs.nix

@@ -22,6 +22,7 @@ in
           epkgs.lsp-bridge
           epkgs.doom-themes
           epkgs.vterm
+          # pkgs.stable.emacs.pkgs.elpaPackages.tramp # use the unstable version from elpa
           epkgs.treesit-grammars.with-all-grammars
 
           # build the rest of the packages myself

modules/home/common/git.nix

@@ -11,26 +11,29 @@ in
     programs.git = {
       enable = true;
     } // lib.optionalAttrs (!minimal) {
-      aliases = {
-        a = "add";
-        c = "commit";
-        cl = "clone";
-        co = "checkout";
-        b = "branch";
-        i = "init";
-        m = "merge";
-        s = "status";
-        r = "restore";
-        p = "pull";
-        pp = "push";
+      settings = {
+        alias = {
+          a = "add";
+          c = "commit";
+          cl = "clone";
+          co = "checkout";
+          b = "branch";
+          i = "init";
+          m = "merge";
+          s = "status";
+          r = "restore";
+          p = "pull";
+          pp = "push";
+        };
+        user = {
+          email = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1);
+          name = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName;
+        };
       };
       signing = {
         key = "0x76FD3810215AE097";
         signByDefault = true;
       };
-      userEmail = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1);
-      userName = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName;
-      difftastic.enable = true;
       lfs.enable = true;
       includes = [
         {
@@ -45,5 +48,6 @@ in
         }
       ];
     };
+    programs.difftastic.enable = lib.mkIf (!minimal) true;
   };
 }

modules/home/common/niri.nix

@@ -114,9 +114,11 @@
           "Mod+Shift+Escape".action = spawn "kitty" "-o" "confirm_os_window_close=0" "btm";
           "Mod+h".action = sh ''hyprpicker | wl-copy'';
           # "Mod+s".action = spawn "grim" "-g" "\"$(slurp)\"" "-t" "png" "-" "|" "wl-copy" "-t" "image/png";
-          "Mod+s".action = screenshot { show-pointer = false; };
+          # "Mod+s".action = screenshot { show-pointer = false; };
+          "Mod+s".action.screenshot = { show-pointer = false; };
           # "Mod+Shift+s".action = spawn "slurp" "|" "grim" "-g" "-" "Pictures/Screenshots/$(date +'screenshot_%Y-%m-%d-%H%M%S.png')";
-          "Mod+Shift+s".action = screenshot-window { write-to-disk = true; };
+          # "Mod+Shift+s".action = screenshot-window { write-to-disk = true; };
+          "Mod+Shift+s".action.screenshot-window = { write-to-disk = true; };
           # "Mod+Shift+v".action = spawn "wf-recorder" "-g" "'$(slurp -f %o -or)'" "-f" "~/Videos/screenrecord_$(date +%Y-%m-%d-%H%M%S).mkv";
 
           "Mod+e".action = sh "emacsclient -nquc -a emacs -e '(dashboard-open)'";

modules/home/common/obsidian.nix

@@ -15,6 +15,9 @@ in
     };
 
     programs.obsidian =
+      let
+        pluginSource = pkgs.nur.repos.swarsel;
+      in
       {
         enable = true;
         package = pkgs.obsidian;
@@ -62,7 +65,8 @@ in
             "templates"
             "word-count"
           ];
-          communityPlugins = with pkgs.swarsel-nix; [
+          # communityPlugins = with pkgs.swarsel-nix; [
+          communityPlugins = with pluginSource; [
             advanced-tables
             calendar
             file-hider
@@ -80,7 +84,8 @@ in
               appearance = {
                 baseFontSize = lib.mkForce 19;
               };
-              communityPlugins = with pkgs.swarsel-nix; [
+              # communityPlugins = with pkgs.swarsel-nix; [
+              communityPlugins = with pluginSource; [
                 {
                   pkg = advanced-tables;
                   enable = true;

modules/home/common/packages.nix

@@ -42,7 +42,7 @@
       sshfs
       fuse
       # ventoy
-      poppler_utils
+      poppler-utils
       vdhcoapp
 
       # nix
@@ -130,7 +130,7 @@
       unzip
 
       #nautilus
-      stable.nautilus
+      nautilus
       xfce.tumbler
       libgsf
 
@@ -147,7 +147,7 @@
 
       # the following packages are used (in some way) by waybar
       # playerctl
-      stable.pavucontrol
+      pavucontrol
       # stable.pamixer
       # gnome.gnome-clocks
       # wlogout
@@ -177,7 +177,7 @@
       nerd-fonts.fira-mono
       nerd-fonts.fira-code
       nerd-fonts.symbols-only
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       font-awesome_5
       noto-fonts
       noto-fonts-cjk-sans

modules/home/common/programs.nix

@@ -5,7 +5,14 @@
     programs = {
       bat = {
         enable = true;
-        extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
+        extraPackages = [
+          pkgs.bat-extras.batdiff
+          pkgs.bat-extras.batman
+          pkgs.bat-extras.batwatch
+        ] ++ [
+          pkgs.stable.bat-extras.batgrep
+        ];
+        # extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
       };
       bottom.enable = true;
       carapace.enable = true;

modules/home/common/settings.nix

@@ -1,6 +1,6 @@
 { self, lib, pkgs, config, ... }:
 let
-  inherit (config.swarselsystems) mainUser;
+  inherit (config.swarselsystems) mainUser flakePath isNixos isLinux;
 in
 {
   options.swarselmodules.general = lib.mkEnableOption "general nix settings";
@@ -43,33 +43,21 @@ in
           auto-optimise-store = true;
           warn-dirty = false;
           max-jobs = 1;
-          use-cgroups = lib.mkIf config.swarselsystems.isLinux true;
+          use-cgroups = lib.mkIf isLinux true;
         };
       };
 
-      nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
+      nixpkgs.overlays = lib.mkIf isNixos (lib.mkForce null);
 
       programs = {
-        home-manager = lib.mkIf (!config.swarselsystems.isNixos)
-          {
-            enable = true;
-            package = pkgs.symlinkJoin {
-              name = "home-manager";
-              buildInputs = [ pkgs.makeWrapper ];
-              paths = [ pkgs.home-manager ];
-              postBuild = ''
-                wrapProgram $out/bin/home-manager \
-                --append-flags '--flake .#$(hostname)'
-              '';
-            };
-          };
+        # home-manager.enable = lib.mkIf (!isNixos) true;
         man = {
           enable = true;
           generateCaches = true;
         };
       };
 
-      targets.genericLinux.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
+      targets.genericLinux.enable = lib.mkIf (!isNixos) true;
 
       home = {
         username = lib.mkDefault mainUser;
@@ -84,6 +72,17 @@ in
           "info"
           "devdoc"
         ];
+        packages = lib.mkIf (!isNixos) [
+          (pkgs.symlinkJoin {
+            name = "home-manager";
+            buildInputs = [ pkgs.makeWrapper ];
+            paths = [ pkgs.home-manager ];
+            postBuild = ''
+              wrapProgram $out/bin/home-manager \
+              --append-flags '--flake ${flakePath}#$(hostname)'
+            '';
+          })
+        ];
       };
     };
 

modules/home/common/spicetify.nix

@@ -9,7 +9,7 @@ in
     programs.spicetify = {
       enable = true;
       # spotifyPackage = pkgs.stable24_11.spotify;
-      spotifyPackage = pkgs.stable.spotify;
+      spotifyPackage = pkgs.spotify;
       enabledExtensions = with spicePkgs.extensions; [
         fullAppDisplay
         shuffle

modules/home/common/stylix.nix

@@ -1,10 +1,11 @@
-{ lib, config, vars, ... }:
+{ self, lib, config, vars, ... }:
 {
   options.swarselmodules.stylix = lib.mkEnableOption "stylix settings";
   config = lib.mkIf config.swarselmodules.stylix {
-    stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate
+    stylix = lib.mkIf (!config.swarselsystems.isNixos && config.swarselmodules.stylix) (lib.recursiveUpdate
       {
-        image = config.swarselsystems.wallpaper;
+        enable = true;
+        base16Scheme = "${self}/files/stylix/swarsel.yaml";
         targets = vars.stylixHomeTargets;
       }
       vars.stylix);

modules/home/common/vesktop.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, pkgs, config, ... }:
 let
   moduleName = "vesktop";
 in
@@ -7,6 +7,7 @@ in
   config = lib.mkIf config.swarselmodules.${moduleName} {
     programs.${moduleName} = {
       enable = true;
+      package = pkgs.stable.vesktop;
       settings = {
         appBadge = false;
         arRPC = false;

modules/home/common/zsh.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, minimal, inputs, globals, nixosConfig ? config, ... }:
 let
-  inherit (config.swarselsystems) flakePath;
+  inherit (config.swarselsystems) flakePath isNixos;
   crocDomain = globals.services.croc.domain;
 in
 {
@@ -21,12 +21,10 @@ in
         shellAliases = lib.recursiveUpdate
           {
             hg = "history | grep";
-            hmswitch = "home-manager --flake ${flakePath}#$(whoami)@$(hostname) switch |& nom";
-            # nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v switch |& nom --json";
-            nswitch = "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;";
-            nboot = "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;";
-            ndry = "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;";
-            # nboot = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v boot |& nom --json";
+            hmswitch = lib.mkIf (!isNixos) "${lib.getExe pkgs.home-manager} --flake ${flakePath}#$(hostname) switch |& nom";
+            nswitch = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;";
+            nboot = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;";
+            ndry = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;";
             magit = "emacsclient -nc -e \"(magit-status)\"";
             config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME";
             g = "git";
@@ -48,7 +46,7 @@ in
             cc = "wl-copy";
             build-topology = "nix build .#topology.x86_64-linux.config.output";
             build-iso = "nix build --print-out-paths .#live-iso";
-            nix-review- = "nix run nixpkgs#nixpkgs-review -- rev HEAD";
+            nix-review-local = "nix run nixpkgs#nixpkgs-review -- rev HEAD";
             nix-review-post = "nix run nixpkgs#nixpkgs-review -- pr --post-result --systems linux";
           }
           config.swarselsystems.shellAliases;

modules/home/optional/uni.nix

@@ -3,7 +3,7 @@
   options.swarselmodules.optional.uni = lib.mkEnableOption "optional uni settings";
   config = lib.mkIf config.swarselmodules.optional.uni
     {
-      swarselservices.pizauth = {
+      services.pizauth = {
         enable = true;
         accounts = {
           uni = {

modules/home/optional/work.nix

@@ -16,7 +16,7 @@ in
         postman
         # rclone
         libguestfs-with-appliance
-        stable.prometheus.cli
+        prometheus.cli
         tigervnc
         # openstackclient
 
@@ -141,7 +141,7 @@ in
             #   };
             # };
           };
-          git.userEmail = lib.mkForce gitMail;
+          git.settings.user.email = lib.mkForce gitMail;
 
           zsh = {
             shellAliases = {
@@ -464,7 +464,7 @@ in
 
       };
 
-      swarselservices.pizauth = {
+      services.pizauth = {
         enable = true;
         extraConfig = ''
           auth_notify_cmd = "if [[ \"$(notify-send -A \"Open $PIZAUTH_ACCOUNT\" -t 30000 'pizauth authorisation')\" == \"0\" ]]; then open \"$PIZAUTH_URL\"; fi";