diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 6ac57a5..325e467 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -7,15 +7,16 @@ }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "026rvynmzmpigax9f8gy9z67lsl6dhzv2p6s8wz4w06v3gjvspm1"; + sha256 = "0d41gr0c89a4y4lllzdgmbm54h9kn9fjnmavwpgw0w9xwqwnzpax"; }; in { imports = [ ./hardware-configuration.nix (import "${home-manager}/nixos") - ./mailserver.nix # TEMP: location - ./minecraft-server.nix # TEMP: location + # ./mailserver.nix # TEMP: location + # ./minecraft-server.nix # TEMP: location + #../modules/server/nginx.nix #../modules/server/ssh.nix #../modules/server/fail2ban.nix diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index dbdaba0..9075286 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -266,6 +266,9 @@ in { binutils strace ltrace + perf-tools # ftrace + perf + radare2 + gdb hexyl # ASM nasm @@ -273,15 +276,16 @@ in { # C Family gcc clang + clang-tools # Rust cargo rustc + # Go + go # Nim nim nimble - # Go - go # Haskell ghc ghcid diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 6844dcc..af9b257 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -30,6 +30,13 @@ in { "nix-command" "flakes" ]; + # nixpkgs.overlays = [ + # (self: super: { + # jdk17 = super.jdk17.override (prev: { + # enableJavaFX = true; + # }); + # }) + # ]; nixpkgs.config.allowUnfreePredicate = let whitelist = map lib.getName [ @@ -39,6 +46,7 @@ in { pkgs.steamcmd pkgs.steam-unwrapped pkgs.dwarf-fortress + pkgs.discord ]; in pkg: builtins.elem (lib.getName pkg) whitelist; @@ -247,6 +255,9 @@ in { binutils strace ltrace + perf-tools # ftrace + perf + radare2 + gdb # ASM nasm (callPackage ../packages/x86-manpages {}) @@ -254,20 +265,33 @@ in { gcc clang clang-tools + # Rust cargo rustc + # Go + go # Nim nim nimble - # Go - go # Haskell ghc ghcid haskell-language-server ormolu + # Java + # jdk17 + # (jre8.overrideAttrs + # (oldAttrs: { + # enableJavaFX = true; + # })) + # (jdk8.overrideAttrs + # (oldAttrs: { + # enableJavaFX = true; + # })) + visualvm + # Python python312 # I use 3.12 since it's in a pretty stable state now python314 # also 3.14 for latest features @@ -404,6 +428,18 @@ in { # mozilla's email client thunderbird.enable = true; + + java = let + # XXX: WARNING: TEST :WARNING: XXX + # Test for CrazyCraft VoidLauncher + myjdk = pkgs.jdk17.override { + enableJavaFX = true; + # openjfx_jdk = pkgs.openjfx17.override {withWebKit = true;}; + }; + in { + enable = true; + package = myjdk; + }; }; # ----- FONTS -----