Compare commits
No commits in common. "dc0ec2f3f18a2f39ca1f0492b061df37c3771832" and "70ed4a9a38ddef2c8b6378a7457d54af2281368c" have entirely different histories.
dc0ec2f3f1
...
70ed4a9a38
3 changed files with 7 additions and 48 deletions
|
|
@ -7,16 +7,15 @@
|
||||||
}: let
|
}: let
|
||||||
home-manager = builtins.fetchTarball {
|
home-manager = builtins.fetchTarball {
|
||||||
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
|
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
|
||||||
sha256 = "0d41gr0c89a4y4lllzdgmbm54h9kn9fjnmavwpgw0w9xwqwnzpax";
|
sha256 = "026rvynmzmpigax9f8gy9z67lsl6dhzv2p6s8wz4w06v3gjvspm1";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
(import "${home-manager}/nixos")
|
(import "${home-manager}/nixos")
|
||||||
|
|
||||||
# ./mailserver.nix # TEMP: location
|
./mailserver.nix # TEMP: location
|
||||||
# ./minecraft-server.nix # TEMP: location
|
./minecraft-server.nix # TEMP: location
|
||||||
|
|
||||||
#../modules/server/nginx.nix
|
#../modules/server/nginx.nix
|
||||||
#../modules/server/ssh.nix
|
#../modules/server/ssh.nix
|
||||||
#../modules/server/fail2ban.nix
|
#../modules/server/fail2ban.nix
|
||||||
|
|
|
||||||
|
|
@ -266,9 +266,6 @@ in {
|
||||||
binutils
|
binutils
|
||||||
strace
|
strace
|
||||||
ltrace
|
ltrace
|
||||||
perf-tools # ftrace + perf
|
|
||||||
radare2
|
|
||||||
gdb
|
|
||||||
hexyl
|
hexyl
|
||||||
# ASM
|
# ASM
|
||||||
nasm
|
nasm
|
||||||
|
|
@ -276,16 +273,15 @@ in {
|
||||||
# C Family
|
# C Family
|
||||||
gcc
|
gcc
|
||||||
clang
|
clang
|
||||||
|
|
||||||
clang-tools
|
clang-tools
|
||||||
# Rust
|
# Rust
|
||||||
cargo
|
cargo
|
||||||
rustc
|
rustc
|
||||||
# Go
|
|
||||||
go
|
|
||||||
# Nim
|
# Nim
|
||||||
nim
|
nim
|
||||||
nimble
|
nimble
|
||||||
|
# Go
|
||||||
|
go
|
||||||
# Haskell
|
# Haskell
|
||||||
ghc
|
ghc
|
||||||
ghcid
|
ghcid
|
||||||
|
|
|
||||||
|
|
@ -30,13 +30,6 @@ in {
|
||||||
"nix-command"
|
"nix-command"
|
||||||
"flakes"
|
"flakes"
|
||||||
];
|
];
|
||||||
# nixpkgs.overlays = [
|
|
||||||
# (self: super: {
|
|
||||||
# jdk17 = super.jdk17.override (prev: {
|
|
||||||
# enableJavaFX = true;
|
|
||||||
# });
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = let
|
nixpkgs.config.allowUnfreePredicate = let
|
||||||
whitelist = map lib.getName [
|
whitelist = map lib.getName [
|
||||||
|
|
@ -46,7 +39,6 @@ in {
|
||||||
pkgs.steamcmd
|
pkgs.steamcmd
|
||||||
pkgs.steam-unwrapped
|
pkgs.steam-unwrapped
|
||||||
pkgs.dwarf-fortress
|
pkgs.dwarf-fortress
|
||||||
pkgs.discord
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
pkg: builtins.elem (lib.getName pkg) whitelist;
|
pkg: builtins.elem (lib.getName pkg) whitelist;
|
||||||
|
|
@ -255,9 +247,6 @@ in {
|
||||||
binutils
|
binutils
|
||||||
strace
|
strace
|
||||||
ltrace
|
ltrace
|
||||||
perf-tools # ftrace + perf
|
|
||||||
radare2
|
|
||||||
gdb
|
|
||||||
# ASM
|
# ASM
|
||||||
nasm
|
nasm
|
||||||
(callPackage ../packages/x86-manpages {})
|
(callPackage ../packages/x86-manpages {})
|
||||||
|
|
@ -265,33 +254,20 @@ in {
|
||||||
gcc
|
gcc
|
||||||
clang
|
clang
|
||||||
clang-tools
|
clang-tools
|
||||||
|
|
||||||
# Rust
|
# Rust
|
||||||
cargo
|
cargo
|
||||||
rustc
|
rustc
|
||||||
# Go
|
|
||||||
go
|
|
||||||
# Nim
|
# Nim
|
||||||
nim
|
nim
|
||||||
nimble
|
nimble
|
||||||
|
# Go
|
||||||
|
go
|
||||||
# Haskell
|
# Haskell
|
||||||
ghc
|
ghc
|
||||||
ghcid
|
ghcid
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
ormolu
|
ormolu
|
||||||
|
|
||||||
# Java
|
|
||||||
# jdk17
|
|
||||||
# (jre8.overrideAttrs
|
|
||||||
# (oldAttrs: {
|
|
||||||
# enableJavaFX = true;
|
|
||||||
# }))
|
|
||||||
# (jdk8.overrideAttrs
|
|
||||||
# (oldAttrs: {
|
|
||||||
# enableJavaFX = true;
|
|
||||||
# }))
|
|
||||||
visualvm
|
|
||||||
|
|
||||||
# Python
|
# Python
|
||||||
python312 # I use 3.12 since it's in a pretty stable state now
|
python312 # I use 3.12 since it's in a pretty stable state now
|
||||||
python314 # also 3.14 for latest features
|
python314 # also 3.14 for latest features
|
||||||
|
|
@ -428,18 +404,6 @@ in {
|
||||||
|
|
||||||
# mozilla's email client
|
# mozilla's email client
|
||||||
thunderbird.enable = true;
|
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 -----
|
# ----- FONTS -----
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue