From c58c8db4c4c0dc439c56bf10ce0f12f9e644f44a Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Mon, 29 Apr 2024 12:28:40 +0900
Subject: [PATCH] Updates

---
 nixos/default.nix              | 44 ++++++++++++++++++----------------
 nixos/minimal.nix              |  2 ++
 nixos/small.nix                |  2 ++
 nixos/users/albert/default.nix |  2 +-
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 1fd673b5..cda118bd 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,30 +1,32 @@
 { inputs, lib,  pkgs, hostname, stateVersion, username, desktop, system, ... }: {
   imports = [ 
-      # Modules
-      inputs.disko.nixosModules.disko
+    # Modules
+    inputs.disko.nixosModules.disko
 
-      # Services
-      ./common/services/openssh.nix
-      ./common/services/promtail.nix
-      ./common/services/fail2ban.nix
-      ./common/services/telegraf.nix
-      ./common/services/tailscale.nix
-      ./common/services/gnupg-agent.nix
-      ./common/services/opensnitch.nix
+    # Services
+    ./common/services/openssh.nix
+    ./common/services/promtail.nix
+    ./common/services/fail2ban.nix
+    ./common/services/telegraf.nix
+    ./common/services/tailscale.nix
+    ./common/services/gnupg-agent.nix
+    ./common/services/opensnitch.nix
 
-      # Software
-      ./common/software/cli/weechat.nix
-      ./common/software/packages.nix
+    # Software
+    ./common/software/cli/weechat.nix
+    ./common/software/packages.nix
 
-      # NixOS Modules
-      ./common/modules/fonts.nix           # Font Configs
-      ./common/modules/networking.nix      # Initial Networking configs
-      ./common/modules/nixos.nix           # NixOS related items
-      ./common/modules/remote-builders.nix # Add remote builders
+    # NixOS Modules
+    ./common/modules/fonts.nix           # Font Configs
+    ./common/modules/networking.nix      # Initial Networking configs
+    ./common/modules/nixos.nix           # NixOS related items
+    ./common/modules/remote-builders.nix # Add remote builders
 
-      ./users/${username}
-      ./hosts/${hostname}
-    ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
+    ./users/${username}
+    ./hosts/${hostname}
+  ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
+
+  programs.fish.enable = true;
 
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/nixos/minimal.nix b/nixos/minimal.nix
index c97a12b7..402e38b9 100644
--- a/nixos/minimal.nix
+++ b/nixos/minimal.nix
@@ -46,6 +46,8 @@
     fish
   ];
 
+  programs.fish.enable = true;
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
diff --git a/nixos/small.nix b/nixos/small.nix
index 26616c8a..99dda1af 100644
--- a/nixos/small.nix
+++ b/nixos/small.nix
@@ -39,6 +39,8 @@
     fish
   ];
 
+  programs.fish.enable = true;
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index e241d388..e69df3fc 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -17,7 +17,7 @@ in {
         ++ ifExists [ "docker"    ]
         ++ ifExists [ "podman"    ]
         ++ ifExists [ "syncthing" ];
-      # shell = pkgs.fish;
+      shell = pkgs.fish;
       # mkpasswd -m sha-512
       hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
       packages = [ pkgs.home-manager ];