Refactor, test out fish on wonderland

5 files changed, 25 insertions, 2 deletions

diff --git a/hosts/sagittarius/default.nix b/hosts/sagittarius/default.nix
index 5357e46..89ee629 100644
--- a/hosts/sagittarius/default.nix
+++ b/hosts/sagittarius/default.nix
@@ -7,6 +7,7 @@
     ./web
   ];
 
+
   boot.loader.grub.device = "/dev/sda";
   time.timeZone = "Europe/Helsinki";
 
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix
index 24e030a..cb7618f 100644
--- a/hosts/underworld/default.nix
+++ b/hosts/underworld/default.nix
@@ -10,6 +10,9 @@
     { _module.args = { inherit inputs; }; }
   ];
 
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+
   # Using grub because the disko docs tell me to use it
   boot = {
     # TODO: remove in favour of kernel 6.7 when it makes it's way into nixpkgs
diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix
index 8e965da..9132a42 100644
--- a/hosts/underworld/home.nix
+++ b/hosts/underworld/home.nix
@@ -6,7 +6,12 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    sharedModules = [{ imports = [ (flakeRoot + /share/home/hyprdesktop.nix) ]; }];
+    sharedModules = [{
+      imports = [
+        (flakeRoot + /share/home/hyprdesktop.nix)
+        (flakeRoot + /share/home/fish.nix)
+      ];
+    }];
     extraSpecialArgs = { inherit inputs; };
   };
 
diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index 72d04e9..0863828 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -11,6 +11,9 @@
     { _module.args = { inherit inputs; }; }
   ];
 
+  programs.fish.enable = true;
+  users.defaultUserShell = pkgs.fish;
+
   # Use the systemd-boot EFI boot loader.
   boot = {
     # TODO: remove in favour of kernel 6.7 when it makes it's way into nixpkgs
@@ -56,6 +59,12 @@
   services.upower.enable = true;
   hardware.bluetooth.enable = true;
 
+  environment.shellAliases = {
+    battery-status = ''
+      upower -i $(upower -e | grep BAT) | grep -E "state|to full|percentage"
+    '';
+  };
+
   users.users = {
     alice = {
       isNormalUser = true;
diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix
index a87a203..759f728 100644
--- a/hosts/wonderland/home.nix
+++ b/hosts/wonderland/home.nix
@@ -6,7 +6,12 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    sharedModules = [{ imports = [ (flakeRoot + /share/home/hyprdesktop.nix) ]; }];
+    sharedModules = [{
+      imports = [
+        (flakeRoot + /share/home/hyprdesktop.nix)
+        (flakeRoot + /share/home/fish.nix)
+      ];
+    }];
     extraSpecialArgs = { inherit inputs; };
   };