some flake magic or something

modules/ashell.nix

@@ -1,9 +1,9 @@
-{ ... }:
+{ lib, isNixOS, ... }:
 
 {
   programs.ashell = {
     enable = true;
-    package = null;
+    package = lib.mkIf (!isNixOS) null;
     settings = {
       outputs = {
         Targets = [ "DP-1" ];

modules/atuin.nix

@@ -1,4 +1,4 @@
-{ pgks, ... }:
+{ ... }:
 
 {
   programs.atuin = {

modules/fish.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ isNixOS, ... }:
 
 {
   programs.fish = {
@@ -42,7 +42,9 @@
                   
                   set -l rel_file (realpath --relative-to=$config_dir $file)
                   
-                  if home-manager switch -b backup
+                  if home-manager switch --flake "$config_dir#${
+                    if isNixOS then "nixos" else "arch"
+                  }" -b backup
                       git add -A
                       set commit_msg "update: $rel_file"
                       git commit -m "$commit_msg"

modules/git.nix

@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  full_name,
+  email,
+  ...
+}:
 
 {
   home.packages = with pkgs; [
@@ -9,8 +14,8 @@
     enable = true;
     settings = {
       user = {
-        name = "Szymon P";
-        email = "szymon_jozef@proton.me";
+        name = full_name;
+        email = email;
       };
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
@@ -18,7 +23,7 @@
     };
 
     signing = {
-      key = "szymon_jozef@proton.me";
+      key = email;
       signByDefault = true;
     };
 

modules/kitty.nix

@@ -1,9 +1,9 @@
-{ lib, ... }:
+{ lib, isNixOS, ... }:
 
 {
-  programs.kitty = lib.mkForce {
+  programs.kitty = {
     enable = true;
-    package = null;
+    package = lib.mkIf (!isNixOS) null;
     settings = {
       confirm_os_window_close = 0;
       dynamic_background_opacity = true;

modules/satty.nix

@@ -1,15 +1,20 @@
-{ ... }:
+{
+  lib,
+  isNixOS,
+  username,
+  ...
+}:
 
 {
   programs.satty = {
     enable = true;
-    package = null;
+    package = lib.mkIf (!isNixOS) null;
     settings = {
       general = {
         fullscreen = true;
         early-exit = true;
         initial-tool = "crop";
-        output-filename = "/home/szymon/Obrazy/zrzuty/%d-%m-%Y_%H:%M:%S.png";
+        output-filename = "/home/${username}/Obrazy/zrzuty/%d-%m-%Y_%H:%M:%S.png";
         save-after-copy = true;
         disable-notifications = false;
         actions-on-escape = [ "exit" ];

modules/ssh.nix

@@ -1,4 +1,4 @@
-{ args, ... }:
+{ username, ... }:
 
 {
   services.ssh-agent.enable = true;
@@ -10,13 +10,13 @@
     matchBlocks = {
       "dmowski" = {
         hostname = "192.168.0.30";
-        user = "szymon";
+        user = username;
         port = 22;
         identityFile = "~/.ssh/dmowski";
       };
 
       "aur.archlinux.org" = {
-        user = "szymon";
+        user = username;
         identityFile = "~/.ssh/aur";
       };
 

modules/yazi.nix

@@ -1,4 +1,4 @@
-{ pgks, ... }:
+{ ... }:
 
 {
   programs.yazi = {