hosts/thegeneralist-central/configuration.nix

@@ -44,7 +44,7 @@
         "scanner"
         "docker"
       ];
-      shell = pkgs.nushell;
+      shell = pkgs.zsh;
       home = "/home/thegeneralist";
       homeMode = "0750";
       hashedPasswordFile = config.age.secrets.password.path;
@@ -98,7 +98,6 @@
     group = "users";
     tokenFile = config.age.secrets.readlaterBotToken.path;
     settings = {
-      media_dir = "/home/thegeneralist/obsidian/09 Misc/Assets/images_misc";
       resources_path = "/home/thegeneralist/obsidian/02 Knowledge/03 Resources";
       read_later_path = "/home/thegeneralist/obsidian/10 Read Later.md";
       finished_path = "/home/thegeneralist/obsidian/20 Finished Reading.md";

modules/common/packages.nix

@@ -39,8 +39,6 @@ in {
       vivid
       ripgrep
       yazi
-      lazygit
-      yaziPlugins.lazygit
       jq
       yq-go
       eza
@@ -49,12 +47,8 @@ in {
       fastfetch
       carapace
       bat
-
-      mosh
     ])
     ++ optionals (pkgs ? bat-extras && pkgs.bat-extras ? core) [
       pkgs.bat-extras.core
     ];
-
-  environment.shellAliases.mosh = "mosh --no-init";
 }

modules/common/ripgrep.nix

@@ -2,8 +2,6 @@
   environment.shellAliases = {
     todo = /* sh */ ''rg "todo|fixme" --colors match:fg:yellow --colors match:style:bold'';
     todos = /* sh */ "nvim ~/todo.md";
-    bgr = /* sh */ "batgrep";
-    brg = /* sh */ "batgrep";
   };
 
   home-manager.sharedModules = [{

modules/common/shell/0_nushell.nix

@@ -1,56 +1,23 @@
-{
+{ config, lib, pkgs, ... }: let
-  config,
+  inherit (lib) attrNames attrValues const filterAttrs flatten listToAttrs mapAttrs mapAttrsToList readFile replaceStrings;
-  lib,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib)
-    attrNames
-    attrValues
-    const
-    filterAttrs
-    flatten
-    listToAttrs
-    mapAttrs
-    mapAttrsToList
-    readFile
-    replaceStrings
-    ;
 
   package = pkgs.nushell;
-in
+in {
-{
+  home-manager.sharedModules = [(homeArgs: let
-  home-manager.sharedModules = [
-    (
-      homeArgs:
-      let
     config' = homeArgs.config;
 
-        environmentVariables =
+    environmentVariables = let
-          let
+      variablesMap = config'.variablesMap
-            variablesMap =
+        |> mapAttrsToList (name: value: [
-              config'.variablesMap
+          { name = "\$${name}"; inherit value; }
-              |> mapAttrsToList (
+          { name = "\${${name}}"; inherit value; }
-                name: value: [
+        ])
-                  {
-                    name = "\$${name}";
-                    inherit value;
-                  }
-                  {
-                    name = "\${${name}}";
-                    inherit value;
-                  }
-                ]
-              )
         |> flatten
         |> listToAttrs;
-          in
+    in config.environment.variables
-          config.environment.variables
     |> mapAttrs (const <| replaceStrings (attrNames variablesMap) (attrValues variablesMap))
     |> filterAttrs (name: const <| name != "TERM");
-      in
+  in {
-      {
     shells."0" = package;
 
     programs.nushell = {
@@ -59,12 +26,10 @@ in
 
       inherit environmentVariables;
 
-          shellAliases =
+      shellAliases = config.environment.shellAliases
-            config.environment.shellAliases // { ls = "ls"; };
+        |> filterAttrs (_: value: value != null);
 
       configFile.text = readFile ./0_nushell.nu;
     };
-      }
+  })];
-    )
-  ];
 }

modules/linux/shell/default.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: let
-  inherit (lib) concatStringsSep const flatten getAttr mapAttrsToList unique;
+  inherit (lib) concatStringsSep const flatten getAttr mapAttrsToList mkForce unique;
 in {
   users.defaultUserShell = pkgs.zsh;
 
@@ -10,8 +10,8 @@ in {
   |> unique
   |> concatStringsSep ":";
 
-  # environment.shellAliases = {
+  environment.shellAliases = {
-  #   ls = mkForce null;
+    ls = mkForce null;
-  #   l  = mkForce null;
+    l  = mkForce null;
-  # };
+  };
 }