hosts/shinmyoumaru: init, cross: armv6+v7 emulated, stripped base, exprs

config/users/kat/base/git.nix

@@ -1,17 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  home.packages = with pkgs; [
-    git-crypt
-    gitAndTools.gitRemoteGcrypt
-    gitAndTools.gitAnnex
-    git-revise
-    gitAndTools.git-annex-remote-b2
-  ];
-
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
     userName = "kat witch";
     userEmail = "kat@kittywit.ch";
     extraConfig = {

config/users/kat/base/packages.nix

@@ -8,7 +8,7 @@
     sd
     duc
     bat
-    exa
+    exa-noman
     socat
     rsync
     wget
@@ -19,7 +19,6 @@
     zstd
     file
     whois
-    niv
     dnsutils
     borgbackup
     neofetch

config/users/kat/default.nix

@@ -20,7 +20,7 @@ let katUser = { lib }:
       lib.genAttrs profileNames userImport // {
         services = lib.genAttrs serviceNames serviceImport;
         base = { imports = [ ./nixos.nix (userImport "base") ]; };
-        server = { imports = [ personal ]; };
+        server = { };
         guiFull = { imports = [ gui sway dev media personal ]; };
       };
   in

config/users/kat/personal/default.nix

@@ -3,6 +3,8 @@
 {
   imports = [
     ./gpg.nix
+    ./git.nix
+    ./packages.nix
     ./weechat.nix
     ./email.nix
     ./shell.nix

config/users/kat/personal/git.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    git-crypt
+    gitAndTools.gitRemoteGcrypt
+    gitAndTools.gitAnnex
+    git-revise
+    gitAndTools.git-annex-remote-b2
+  ];
+  programs.git = {
+    package = pkgs.gitAndTools.gitFull;
+  };
+}

config/users/kat/personal/packages.nix

@@ -1,5 +1,8 @@
 { config, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ pinentry.gtk2 ];
+  home.packages = with pkgs; [
+    pinentry.gtk2
+    niv
+  ];
 }

config/users/kat/personal/shell.nix

@@ -2,8 +2,6 @@
 
 {
   programs.zsh = {
-    shellAliases = genAttrs ["radio" "tv"] (attr: {
-      "abby${attr}" = "mpv $(bitw get secrets/abby -f ${attr})";
-    });
+    shellAliases = mapListToAttrs (attr: nameValuePair "abby${attr}" "mpv $(bitw get secrets/abby -f ${attr})") ["radio" "tv"];
   };
 }