even more cleanup
This commit is contained in:
parent
88f9bd9dd7
commit
92679e4716
SSH key fingerprint:
SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
12 changed files with 172 additions and 464 deletions
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
self,
|
||||
inputs,
|
||||
homeImports,
|
||||
...
|
||||
}: let
|
||||
inherit (inputs.nixpkgs.lib) nixosSystem;
|
||||
|
|
@ -13,24 +12,13 @@ in {
|
|||
kidney = nixosSystem {
|
||||
modules = [
|
||||
./kidney
|
||||
|
||||
../systemProfiles/core/tools.nix
|
||||
../systemProfiles/core/users.nix
|
||||
../systemProfiles/core/locale.nix
|
||||
|
||||
../systemProfiles/programs/tools.nix
|
||||
../systemProfiles/programs/zsh.nix
|
||||
../systemProfiles/programs/home-manager.nix
|
||||
../systemProfiles/hardware/graphics.nix
|
||||
|
||||
../systemProfiles/services/flatpak.nix
|
||||
../systemProfiles/services/xdg-portals.nix
|
||||
|
||||
../systemProfiles/nix/default.nix
|
||||
../systemProfiles/nix/gc.nix
|
||||
{
|
||||
home-manager = {
|
||||
users.xun.imports = homeImports."xun@kidney";
|
||||
users.xun.imports = [
|
||||
../../home
|
||||
../../home/profiles/kidney
|
||||
{home.stateVersion = "24.05";}
|
||||
];
|
||||
extraSpecialArgs = specialArgs;
|
||||
};
|
||||
}
|
||||
|
|
@ -41,71 +29,15 @@ in {
|
|||
nixdesk = nixosSystem {
|
||||
modules = [
|
||||
./nixdesk
|
||||
|
||||
inputs.stylix.nixosModules.stylix
|
||||
|
||||
../systemProfiles/secrets/default.nix
|
||||
../systemProfiles/secrets/nixdesk/default.nix
|
||||
|
||||
../systemProfiles/core/security.nix
|
||||
../systemProfiles/core/users.nix
|
||||
../systemProfiles/core/ssh.nix
|
||||
../systemProfiles/core/locale.nix
|
||||
../systemProfiles/nix/default.nix
|
||||
../systemProfiles/programs/zsh.nix
|
||||
../systemProfiles/core/tools.nix
|
||||
../systemProfiles/core/compat.nix
|
||||
../systemProfiles/core/boot.nix
|
||||
../systemProfiles/core/docs.nix
|
||||
../systemProfiles/core/gvfs.nix
|
||||
|
||||
../systemProfiles/nix/gc.nix
|
||||
|
||||
../systemProfiles/hardware/graphics.nix
|
||||
../systemProfiles/hardware/steam-hardware.nix
|
||||
../systemProfiles/hardware/bluetooth.nix
|
||||
../systemProfiles/hardware/qmk.nix
|
||||
|
||||
../systemProfiles/network/networkd.nix
|
||||
../systemProfiles/network/avahi.nix
|
||||
../systemProfiles/network/localsend.nix
|
||||
../systemProfiles/network/tailscale.nix
|
||||
../systemProfiles/network/goldberg.nix
|
||||
|
||||
../systemProfiles/desktop/sway.nix
|
||||
|
||||
../systemProfiles/programs/dconf.nix
|
||||
../systemProfiles/programs/fonts.nix
|
||||
../systemProfiles/programs/home-manager.nix
|
||||
# ../systemProfiles/programs/qt.nix
|
||||
../systemProfiles/programs/adb.nix
|
||||
../systemProfiles/programs/kanidm.nix
|
||||
../systemProfiles/programs/openrgb.nix
|
||||
../systemProfiles/programs/tools.nix
|
||||
../systemProfiles/programs/thunar.nix
|
||||
../systemProfiles/programs/corectrl.nix
|
||||
|
||||
../systemProfiles/services/default.nix
|
||||
../systemProfiles/services/pipewire.nix
|
||||
../systemProfiles/services/flatpak.nix
|
||||
|
||||
../systemProfiles/services/syncthing.nix
|
||||
../systemProfiles/services/virt/waydroid.nix
|
||||
../systemProfiles/services/virt/virt-manager.nix
|
||||
../systemProfiles/services/sunshine.nix
|
||||
# ../systemProfiles/network/wifi.nix
|
||||
|
||||
../systemProfiles/themes/dark.nix
|
||||
|
||||
../systemProfiles/programs/gamemode.nix
|
||||
../systemProfiles/programs/gamescope.nix
|
||||
../systemProfiles/programs/steam.nix
|
||||
../systemProfiles/programs/RE/default.nix
|
||||
|
||||
{
|
||||
home-manager = {
|
||||
backupFileExtension = "hm-backup";
|
||||
users.xun.imports = homeImports."xun@nixdesk";
|
||||
users.xun.imports = [
|
||||
../../home
|
||||
../../home/profiles/nixdesk
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
{home.stateVersion = "23.11";}
|
||||
];
|
||||
extraSpecialArgs = specialArgs;
|
||||
};
|
||||
}
|
||||
|
|
@ -114,24 +46,7 @@ in {
|
|||
inherit specialArgs;
|
||||
};
|
||||
hopper = nixosSystem {
|
||||
modules = [
|
||||
./hopper
|
||||
|
||||
../systemProfiles/secrets/default.nix
|
||||
../systemProfiles/secrets/hopper/default.nix
|
||||
|
||||
../systemProfiles/core/security.nix
|
||||
../systemProfiles/core/locale.nix
|
||||
../systemProfiles/core/tools.nix
|
||||
../systemProfiles/core/ssh.nix
|
||||
../systemProfiles/core/deploy.nix
|
||||
../systemProfiles/nix/default.nix # TODO slim this down
|
||||
|
||||
../systemProfiles/network/tailscale.nix
|
||||
../systemProfiles/network/avahi.nix
|
||||
../systemProfiles/network/networkd.nix
|
||||
# services.syncthing # TODO make syncthing not rely on having "xun" user
|
||||
];
|
||||
modules = [./hopper];
|
||||
|
||||
inherit specialArgs;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,27 @@
|
|||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.hardware.nixosModules.common-cpu-intel
|
||||
|
||||
inputs.vpn-confinement.nixosModules.default
|
||||
|
||||
./hardware.nix
|
||||
./newlab.nix
|
||||
|
||||
../../systemProfiles/secrets/default.nix
|
||||
../../systemProfiles/secrets/hopper/default.nix
|
||||
|
||||
../../systemProfiles/core/security.nix
|
||||
../../systemProfiles/core/locale.nix
|
||||
../../systemProfiles/core/tools.nix
|
||||
../../systemProfiles/core/ssh.nix
|
||||
../../systemProfiles/core/deploy.nix
|
||||
|
||||
../../systemProfiles/nix/default.nix # TODO slim this down
|
||||
|
||||
../../systemProfiles/network/tailscale.nix
|
||||
../../systemProfiles/network/avahi.nix
|
||||
../../systemProfiles/network/networkd.nix
|
||||
|
||||
# ../../services/syncthing.nix # TODO make syncthing not rely on having "xun" user
|
||||
];
|
||||
|
||||
networking.hostName = "hopper";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,21 @@
|
|||
./wsl.nix
|
||||
./hardware.nix
|
||||
./fonts.nix
|
||||
|
||||
../../systemProfiles/core/tools.nix
|
||||
../../systemProfiles/core/users.nix
|
||||
../../systemProfiles/core/locale.nix
|
||||
|
||||
../../systemProfiles/programs/tools.nix
|
||||
../../systemProfiles/programs/zsh.nix
|
||||
../../systemProfiles/programs/home-manager.nix
|
||||
../../systemProfiles/hardware/graphics.nix
|
||||
|
||||
../../systemProfiles/services/flatpak.nix
|
||||
../../systemProfiles/services/xdg-portals.nix
|
||||
|
||||
../../systemProfiles/nix/default.nix
|
||||
../../systemProfiles/nix/gc.nix
|
||||
];
|
||||
|
||||
networking.hostName = "kidney";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,76 @@
|
|||
{lib, ...}: {
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./hibernate-boot.nix
|
||||
./samba-mount.nix
|
||||
|
||||
inputs.stylix.nixosModules.stylix
|
||||
|
||||
../../systemProfiles/secrets/default.nix
|
||||
../../systemProfiles/secrets/nixdesk/default.nix
|
||||
|
||||
../../systemProfiles/core/security.nix
|
||||
../../systemProfiles/core/users.nix
|
||||
../../systemProfiles/core/ssh.nix
|
||||
../../systemProfiles/core/locale.nix
|
||||
../../systemProfiles/nix/default.nix
|
||||
../../systemProfiles/programs/zsh.nix
|
||||
../../systemProfiles/core/tools.nix
|
||||
../../systemProfiles/core/compat.nix
|
||||
../../systemProfiles/core/boot.nix
|
||||
../../systemProfiles/core/docs.nix
|
||||
../../systemProfiles/core/gvfs.nix
|
||||
|
||||
../../systemProfiles/nix/gc.nix
|
||||
|
||||
../../systemProfiles/hardware/graphics.nix
|
||||
../../systemProfiles/hardware/steam-hardware.nix
|
||||
../../systemProfiles/hardware/bluetooth.nix
|
||||
../../systemProfiles/hardware/qmk.nix
|
||||
|
||||
../../systemProfiles/network/networkd.nix
|
||||
../../systemProfiles/network/avahi.nix
|
||||
../../systemProfiles/network/localsend.nix
|
||||
../../systemProfiles/network/tailscale.nix
|
||||
../../systemProfiles/network/goldberg.nix
|
||||
|
||||
../../systemProfiles/desktop/sway.nix
|
||||
|
||||
../../systemProfiles/programs/dconf.nix
|
||||
../../systemProfiles/programs/fonts.nix
|
||||
../../systemProfiles/programs/home-manager.nix
|
||||
# ../../systemProfiles/programs/qt.nix
|
||||
../../systemProfiles/programs/adb.nix
|
||||
../../systemProfiles/programs/kanidm.nix
|
||||
../../systemProfiles/programs/openrgb.nix
|
||||
../../systemProfiles/programs/tools.nix
|
||||
../../systemProfiles/programs/thunar.nix
|
||||
../../systemProfiles/programs/corectrl.nix
|
||||
|
||||
../../systemProfiles/services/default.nix
|
||||
../../systemProfiles/services/pipewire.nix
|
||||
../../systemProfiles/services/flatpak.nix
|
||||
|
||||
../../systemProfiles/services/syncthing.nix
|
||||
../../systemProfiles/services/virt/waydroid.nix
|
||||
../../systemProfiles/services/virt/virt-manager.nix
|
||||
../../systemProfiles/services/sunshine.nix
|
||||
# ../../systemProfiles/network/wifi.nix
|
||||
|
||||
../../systemProfiles/themes/dark.nix
|
||||
|
||||
../../systemProfiles/programs/gamemode.nix
|
||||
../../systemProfiles/programs/gamescope.nix
|
||||
../../systemProfiles/programs/steam.nix
|
||||
../../systemProfiles/programs/RE/default.nix
|
||||
];
|
||||
|
||||
networking.hostName = "nixdesk";
|
||||
|
||||
#swapDevices = lib.singleton {
|
||||
# device = "/dev/disk/by-uuid/1dcce4ab-71da-4928-83d5-62b20fd0fddf";
|
||||
#};
|
||||
|
||||
#boot.resumeDevice = "/dev/disk/by-uuid/1dcce4ab-71da-4928-83d5-62b20fd0fddf";
|
||||
|
||||
#boot.kernelParams = [
|
||||
# "resume=UUID=1dcce4ab-71da-4928-83d5-62b20fd0fddf"
|
||||
# "resume_offset=3841492992" # fdisk -l
|
||||
#];
|
||||
|
||||
nixpkgs.config = {
|
||||
# rocmSupport = true; # TODO enable once nixpkgs fixes their shit and llvm libc doesnt fail to compile (https://github.com/NixOS/nixpkgs/issues/368672)
|
||||
allowUnfreePredicate = pkg:
|
||||
|
|
|
|||
|
|
@ -81,14 +81,7 @@
|
|||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
services.xserver.videoDrivers = [
|
||||
"amdgpu"
|
||||
#"nvidia"
|
||||
];
|
||||
#hardware.nvidia = {
|
||||
# modesetting.enable = true;
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
#};
|
||||
services.xserver.videoDrivers = ["amdgpu"];
|
||||
|
||||
nixpkgs.hostPlatform.system = "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = true;
|
||||
|
|
|
|||
|
|
@ -4,32 +4,21 @@
|
|||
self,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = let
|
||||
il2cppdumper = pkgs.callPackage ./il2cppdumper {};
|
||||
ilspy = pkgs.callPackage ./ilspy {};
|
||||
in
|
||||
with pkgs; [
|
||||
(ghidra.withExtensions (ps:
|
||||
with ps; [
|
||||
gnudisassembler
|
||||
machinelearning
|
||||
]))
|
||||
environment.systemPackages = with pkgs; [
|
||||
(ghidra.withExtensions (ps:
|
||||
with ps; [
|
||||
gnudisassembler
|
||||
machinelearning
|
||||
]))
|
||||
|
||||
# (cutter.withPlugins (ps:
|
||||
# with ps; [
|
||||
# rz-ghidra
|
||||
# ]))
|
||||
|
||||
self.packages.${pkgs.system}.binaryninja-personal
|
||||
self.packages.${pkgs.system}.ida-pro
|
||||
# il2cppdumper
|
||||
# ilspy
|
||||
gdb
|
||||
];
|
||||
self.packages.${pkgs.system}.binaryninja-personal
|
||||
self.packages.${pkgs.system}.ida-pro
|
||||
# (pkgs.callPackage ./il2cppdumper {})
|
||||
# (pkgs.callPackage ./ilspy {})
|
||||
gdb
|
||||
];
|
||||
|
||||
networking.hosts = {
|
||||
"0.0.0.0" = ["master.binary.ninja"]; # idk my binary ninja crack [AMPED] told me to
|
||||
};
|
||||
}
|
||||
## NOTE: you still need to run keygen.exe to generate a key
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue