fix: remove system level zsh

The coexistence of zsh in both system and home manager causes significant speed issues as per: nix-community/home-manager#910
JayRovacsek · Oct 8, 2024 · b3a0f0b · b3a0f0b
1 parent 2d341d0
commit b3a0f0b
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -231,6 +231,8 @@
 
 - *(packages)* Resolve broken packages - ([74fbe6f](https://github.com/JayRovacsek/nix-config/commit/74fbe6fcbe1046512778970f6b47f4bbb8709a7f))
 
+- *(packages,hydra)* Remove bedrock server package, add uris to hydra - ([2d341d0](https://github.com/JayRovacsek/nix-config/commit/2d341d08008a60b6c38159195887058a9c680f18))
+
 - *(static)* Update build configs - ([3ab0dda](https://github.com/JayRovacsek/nix-config/commit/3ab0ddaa8eb135235b02bf9988379926476bead2))
 
 - *(tooling)* Add scopes to conform configuration - ([99a07f5](https://github.com/JayRovacsek/nix-config/commit/99a07f59513cfd6824a8d21875d4c8f95356f88d))

diff --git a/common/config.nix b/common/config.nix
@@ -175,6 +175,30 @@ _: {
           address = "192.168.17.2";
           fqdn = "minecraft.local";
         }
+        {
+          address = "192.168.17.2";
+          fqdn = "geo.hivebedrock.network";
+        }
+        {
+          address = "192.168.17.2";
+          fqdn = "hivebedrock.network";
+        }
+        {
+          address = "192.168.17.2";
+          fqdn = "play.inpvp.net";
+        }
+        {
+          address = "192.168.17.2";
+          fqdn = "mco.lbsg.net";
+        }
+        {
+          address = "192.168.17.2";
+          fqdn = "play.galaxite.net";
+        }
+        {
+          address = "192.168.17.2";
+          fqdn = "play.enchanted.gg";
+        }
         {
           address = "192.168.17.2";
           fqdn = "palworld.local";

diff --git a/common/images/amazon.nix b/common/images/amazon.nix
@@ -2,14 +2,13 @@
 let
   inherit (self.common.system) unstable-system;
   inherit (self.common.package-sets) x86_64-linux-unstable;
-  inherit (self.nixosModules) amazon-image zsh;
+  inherit (self.nixosModules) amazon-image;
 
   inherit (x86_64-linux-unstable) system identifier pkgs;
   base = self.common.modules.${identifier};
   modules = base ++ [
     ../../hosts/ditto
     amazon-image
-    zsh
   ];
   specialArgs = {
     inherit self;

diff --git a/common/images/oracle.nix b/common/images/oracle.nix
@@ -1,7 +1,7 @@
 { self }:
 let
   inherit (self.common.system) unstable-system;
-  inherit (self.nixosModules) disable-assertions oracle-image zsh;
+  inherit (self.nixosModules) disable-assertions oracle-image;
   inherit (self.common.package-sets) x86_64-linux-unstable;
 
   inherit (x86_64-linux-unstable) system identifier pkgs;
@@ -10,7 +10,6 @@ let
     ../../hosts/ditto
     disable-assertions
     oracle-image
-    zsh
   ];
   specialArgs = {
     inherit self;

diff --git a/home-manager-modules/alacritty/default.nix b/home-manager-modules/alacritty/default.nix
@@ -10,7 +10,6 @@ in
   programs.alacritty = {
     enable = true;
     settings = {
-      shell.program = "${pkgs.zsh}/bin/zsh";
       window = {
         dimensions = {
           columns = 0;

diff --git a/home-manager-modules/broot/default.nix b/home-manager-modules/broot/default.nix
@@ -1,13 +1,10 @@
-{ config, osConfig, ... }:
+{ config, ... }:
 let
   enable = true;
 
-  enableBashIntegration =
-    config.programs.bash.enable && osConfig.programs.bash.enable;
-  enableFishIntegration =
-    config.programs.fish.enable && osConfig.programs.fish.enable;
-  enableZshIntegration =
-    config.programs.zsh.enable && osConfig.programs.zsh.enable;
+  enableBashIntegration = config.programs.bash.enable;
+  enableFishIntegration = config.programs.fish.enable;
+  enableZshIntegration = config.programs.zsh.enable;
 
   settings.modal = true;
 

diff --git a/home-manager-modules/direnv/default.nix b/home-manager-modules/direnv/default.nix
@@ -1,12 +1,9 @@
-{ config, osConfig, ... }:
+{ config, ... }:
 let
   enable = true;
-  enableBashIntegration =
-    config.programs.bash.enable && osConfig.programs.bash.enable;
-  enableFishIntegration =
-    config.programs.fish.enable && osConfig.programs.fish.enable;
-  enableZshIntegration =
-    config.programs.zsh.enable && osConfig.programs.zsh.enable;
+  enableBashIntegration = config.programs.bash.enable;
+  enableFishIntegration = config.programs.fish.enable;
+  enableZshIntegration = config.programs.zsh.enable;
 
   nix-direnv.enable = true;
 

diff --git a/home-manager-modules/hstr/default.nix b/home-manager-modules/hstr/default.nix
@@ -1,11 +1,9 @@
-{ config, osConfig, ... }:
+{ config, ... }:
 let
   enable = true;
 
-  enableBashIntegration =
-    config.programs.bash.enable && osConfig.programs.bash.enable;
-  enableZshIntegration =
-    config.programs.zsh.enable && osConfig.programs.zsh.enable;
+  enableBashIntegration = config.programs.bash.enable;
+  enableZshIntegration = config.programs.zsh.enable;
 
 in
 {

diff --git a/home-manager-modules/hyprland/settings.nix b/home-manager-modules/hyprland/settings.nix
@@ -33,7 +33,7 @@ let
       extra = "transform,1";
     }
     {
-      name = "DP-2";
+      name = "DP-4";
       resolution = "1920x1080";
       position = "1080x420";
       scale = "1";

diff --git a/home-manager-modules/nix-index/default.nix b/home-manager-modules/nix-index/default.nix
@@ -1,13 +1,10 @@
-{ config, osConfig, ... }:
+{ config, ... }:
 let
   enable = true;
 
-  enableBashIntegration =
-    config.programs.bash.enable && osConfig.programs.bash.enable;
-  enableFishIntegration =
-    config.programs.fish.enable && osConfig.programs.fish.enable;
-  enableZshIntegration =
-    config.programs.zsh.enable && osConfig.programs.zsh.enable;
+  enableBashIntegration = config.programs.bash.enable;
+  enableFishIntegration = config.programs.fish.enable;
+  enableZshIntegration = config.programs.zsh.enable;
 
 in
 {

diff --git a/home-manager-modules/starship/default.nix b/home-manager-modules/starship/default.nix
@@ -1,12 +1,9 @@
-{ config, osConfig, ... }:
+{ config, ... }:
 let
   enable = true;
-  enableBashIntegration =
-    config.programs.bash.enable && osConfig.programs.bash.enable;
-  enableFishIntegration =
-    config.programs.fish.enable && osConfig.programs.fish.enable;
-  enableZshIntegration =
-    config.programs.zsh.enable && osConfig.programs.zsh.enable;
+  enableBashIntegration = config.programs.bash.enable;
+  enableFishIntegration = config.programs.fish.enable;
+  enableZshIntegration = config.programs.zsh.enable;
 in
 {
   programs.starship = {

diff --git a/home-manager-modules/zsh/default.nix b/home-manager-modules/zsh/default.nix
@@ -14,6 +14,8 @@ let
   };
 in
 {
+  home.sessionVariables.SHELL = "${lib.getExe config.programs.zsh.package}";
+
   programs.zsh = {
     autosuggestion.enable = true;
     enable = true;

diff --git a/hosts/alakazam/default.nix b/hosts/alakazam/default.nix
@@ -69,7 +69,6 @@ in
     tmux
     udev
     zramSwap
-    zsh
   ];
 
   age = {

diff --git a/hosts/butterfree/default.nix b/hosts/butterfree/default.nix
@@ -38,7 +38,6 @@ in
     ssm
     time
     timesyncd
-    zsh
   ];
 
   networking.hostName = "butterfree";

diff --git a/hosts/dragonite/default.nix b/hosts/dragonite/default.nix
@@ -96,7 +96,6 @@ in
     unifi
     zfs
     zramSwap
-    zsh
   ];
 
   age = {

diff --git a/hosts/gastly/default.nix b/hosts/gastly/default.nix
@@ -44,7 +44,6 @@ in
     timesyncd
     udev
     zramSwap
-    zsh
   ];
 
   age = {

diff --git a/hosts/jigglypuff/default.nix b/hosts/jigglypuff/default.nix
@@ -64,7 +64,6 @@ in
     time
     timesyncd
     zramSwap
-    zsh
   ];
 
   networking = {

diff --git a/hosts/mew/default.nix b/hosts/mew/default.nix
@@ -36,7 +36,6 @@ in
     nix
     time
     timesyncd
-    zsh
   ];
 
   networking = {

diff --git a/hosts/victreebel/default.nix b/hosts/victreebel/default.nix
@@ -87,7 +87,6 @@ in
     ssh
     time
     yabai
-    zsh
   ];
 
   networking = {

diff --git a/hosts/zubat/default.nix b/hosts/zubat/default.nix
@@ -36,7 +36,6 @@ in
     nix-topology
     time
     timesyncd
-    zsh
     self.inputs.nixos-wsl.nixosModules.wsl
   ];
 

diff --git a/lib/users.nix b/lib/users.nix
@@ -60,7 +60,7 @@ let
     # this file.
     flippedRecursiveUpdate overrides {
       users.users.${name} = recursiveUpdate {
-        shell = if name != "builder" then pkgs.zsh else pkgs.bash;
+        shell = pkgs.bash;
         home = if isDarwin then "/Users/${name}" else "/home/${name}";
       } stripped-user-settings;
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ in @@
         tmux
         udev
         zramSwap
-        zsh
       ];
       age = {
@@ Expand Down @@