new machines! random other changes

4 files changed, 25 insertions, 14 deletions

diff --git a/modules/services/nixos/openssh.nix b/modules/services/nixos/openssh.nix
index 4826369..eb8bff6 100644
--- a/modules/services/nixos/openssh.nix
+++ b/modules/services/nixos/openssh.nix
@@ -5,7 +5,6 @@
   ...
 }: let
   cfg = config.collinux.services.sshd;
-  pure = x: [x];
 
   authorizedKeys =
     hosts
@@ -18,15 +17,19 @@ in {
       enable = true;
       allowSFTP = true;
 
-      hostKeys = pure {
-        path = "/etc/ssh/ssh_host_ed25519_key";
-        type = "ed25519";
-      };
+      hostKeys = [
+        {
+          path = "/etc/ssh/ssh_host_ed25519_key";
+          type = "ed25519";
+        }
+      ];
 
-      listenAddresses = pure {
-        addr = "0.0.0.0";
-        port = cfg.port;
-      };
+      listenAddresses = [
+        {
+          addr = "0.0.0.0";
+          port = cfg.port;
+        }
+      ];
 
       settings = {
         PermitRootLogin = "yes";
diff --git a/modules/terminal/hjem/programs/eza.nix b/modules/terminal/hjem/programs/eza.nix
index b900ceb..a54fbbe 100644
--- a/modules/terminal/hjem/programs/eza.nix
+++ b/modules/terminal/hjem/programs/eza.nix
@@ -10,13 +10,15 @@ in
     files =
       (lib.optionalAttrs config.collinux.terminal.shells.fish.enable {
         ".config/fish/conf.d/eza.fish".text = ''
-          alias ls "eza -A -w 80 --group-directories-first -I '.git*'"
+          alias ls "eza -A -w 80 --group-directories-first --git"
+          alias ll "eza -Alho --no-permissions --group --group-directories-first --git"
           alias tree "eza -T"
         '';
       })
-      // (lib.optionalAttrs config.collinux.terminal.shells.fish.enable {
+      // (lib.optionalAttrs config.collinux.terminal.shells.bash.enable {
         ".config/bash/conf.d/eza.bash".text = ''
-          alias ls="eza -A -w 80 --group-directories-first -I '.git*'"
+          alias ls="eza -A -w 80 --group-directories-first --git"
+          alias ll="eza -Alho --no-permissions --group --group-directories-first --git"
           alias tree="eza -T"
         '';
       });
diff --git a/modules/terminal/hjem/programs/lazygit.nix b/modules/terminal/hjem/programs/lazygit.nix
index 399d2f4..d4a22eb 100644
--- a/modules/terminal/hjem/programs/lazygit.nix
+++ b/modules/terminal/hjem/programs/lazygit.nix
@@ -7,7 +7,7 @@
   cfg = config.collinux.terminal.programs.lazygit;
 
   settings = {
-    git.pagers = [{pager = "diff-so-fancy";}];
+    git.diffRenderers = [{command = "diff-so-fancy";}];
     gui = {
       showRandomTip = false;
       commitLength.show = false;
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index 239f7ce..a6fd52d 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -45,7 +45,13 @@ in {
           publicKey = data.host_pubkey;
         }
         // (lib.optionalAttrs (data ? hostnames) {
-          hostNames = data.hostnames;
+          hostNames =
+            data.hostnames
+            ++ (
+              if data ? ip
+              then [data.ip]
+              else []
+            );
         }));
   };