diff --git a/modules/features/terminal/bootvine.nix b/modules/features/terminal/bootvine.nix new file mode 100644 index 0000000..c90c2ac --- /dev/null +++ b/modules/features/terminal/bootvine.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: +{ + flake.nixosModules.bootvine = + { ... }: + { + imports = [ inputs.bootvine.nixosModules.default ]; + services.bootvine.enable = true; + }; +} diff --git a/modules/features/terminal/cdevenv.nix b/modules/features/terminal/cdevenv.nix index 8500296..b8bc9c3 100644 --- a/modules/features/terminal/cdevenv.nix +++ b/modules/features/terminal/cdevenv.nix @@ -4,6 +4,17 @@ { pkgs, user-parts, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ]; + + # onig_sys links against the system Oniguruma library. + nixpkgs.overlays = [ + (final: prev: { + neocmakelsp = prev.neocmakelsp.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ final.oniguruma ]; + }); + }) + ]; + environment.systemPackages = with pkgs; [ libclang neocmakelsp diff --git a/modules/features/terminal/default.nix b/modules/features/terminal/default.nix index 4969611..827cb52 100644 --- a/modules/features/terminal/default.nix +++ b/modules/features/terminal/default.nix @@ -41,6 +41,7 @@ self.nixosModules.flatpak self.nixosModules.rust self.nixosModules.jetbrains + self.nixosModules.bootvine ]; }; diff --git a/modules/features/terminal/nixd.nix b/modules/features/terminal/nixd.nix index 0c1a1f3..91b2f5c 100644 --- a/modules/features/terminal/nixd.nix +++ b/modules/features/terminal/nixd.nix @@ -4,10 +4,26 @@ { pkgs, user-parts, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ]; + + # fnm's zstd-sys dependency needs pkg-config and libzstd at build time. + nixpkgs.overlays = [ + (final: prev: { + fnm = prev.fnm.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ final.zstd ]; + }); + # The forced system-library hook lacks matching inputs in this package. + # Keep upstream's bundled libraries until nixpkgs supplies those inputs. + #codex = prev.codex.overrideAttrs (old: { + # dontCargoUseSystemLibs = true; + #}); + }) + ]; + environment.systemPackages = with pkgs; [ nixd fnm - codex + #codex bubblewrap ]; programs.nix-ld = { diff --git a/modules/system/hosts/fractal/default.nix b/modules/system/hosts/fractal/default.nix index b96d802..f70d77d 100644 --- a/modules/system/hosts/fractal/default.nix +++ b/modules/system/hosts/fractal/default.nix @@ -45,12 +45,14 @@ 5100 25565 3923 + 7547 ]; networking.firewall.allowedUDPPorts = [ 25565 5100 443 8443 + 7547 ]; virtualisation.docker.enable = true; @@ -61,23 +63,23 @@ enable = true; device = "nodev"; efiSupport = true; - double-minegrub-menu = { - enable = true; - main_menu_background = "random"; - splash_text = "100% Declarative"; - world_selection_background_scaled = "1920x1080"; - }; + #double-minegrub-menu = { + # enable = true; + # main_menu_background = "random"; + # splash_text = "100% Declarative"; + # world_selection_background_scaled = "1920x1080"; + #}; }; efi.canTouchEfiVariables = true; timeout = lib.mkDefault 5; }; # initrd.systemd.enable = true; - plymouth.plymouth-minecraft-theme.enable = true; + #plymouth.plymouth-minecraft-theme.enable = true; }; # Minegrub supplies its own GRUB theme; don't layer Stylix's GRUB theme over it. - stylix.targets.grub.enable = false; + #stylix.targets.grub.enable = false; # The local Minecraft theme supplies Plymouth's theme and assets. - stylix.targets.plymouth.enable = false; + #stylix.targets.plymouth.enable = false; hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;