From 40b0d84f53d0d6046306f10e7d047b4df3f6ae7d Mon Sep 17 00:00:00 2001 From: xunuwu Date: Fri, 6 Jun 2025 10:48:07 +0200 Subject: [PATCH] cleanup --- flake.nix | 22 +- home/profiles/secrets/default.nix | 7 - home/suites/nixdesk/default.nix | 2 - lib/default.nix | 10 - .../secrets => secrets}/hopper/cloudflare | 0 .../secrets => secrets}/hopper/default.nix | 0 .../secrets => secrets}/hopper/miniflux | 0 .../secrets => secrets}/hopper/navidrome | 0 .../hopper/restic-password | 0 .../hopper/roblox-playtime | 0 .../secrets => secrets}/hopper/samba-pass | 0 .../profiles/secrets => secrets}/hopper/slskd | 0 .../secrets => secrets}/hopper/transmission | 0 .../hopper/vaultwarden-env | 0 .../secrets => secrets}/hopper/wireguard | 0 .../secrets => secrets}/nixdesk/brawlstars | 0 .../secrets => secrets}/nixdesk/cloudflare | 0 .../secrets => secrets}/nixdesk/default.nix | 0 .../secrets => secrets}/nixdesk/samba | 0 .../secrets => secrets}/nixdesk/wireguard | 0 .../nixdesk/wireguard.yaml | 0 .../secrets => secrets}/rackserv/cloudflare | 0 .../secrets => secrets}/rackserv/default.nix | 0 .../rackserv/restic-password | 0 .../rackserv/wireguard-private | 0 sys/machines/hopper/default.nix | 3 - sys/machines/nixdesk/default.nix | 5 +- sys/machines/rackserv/default.nix | 3 - .../programs/RE/il2cppdumper/default.nix | 33 -- .../programs/RE/il2cppdumper/deps.nix | 22 -- sys/profiles/programs/RE/ilspy/default.nix | 27 -- sys/profiles/programs/RE/ilspy/deps.nix | 374 ------------------ .../default.nix => reverse-engineering.nix} | 2 - sys/profiles/secrets/default.nix | 6 - sys/profiles/secrets/global/default.nix | 8 - .../secrets/global/tailscale-auth.yaml | 34 -- 36 files changed, 16 insertions(+), 542 deletions(-) delete mode 100644 home/profiles/secrets/default.nix delete mode 100644 lib/default.nix rename {sys/profiles/secrets => secrets}/hopper/cloudflare (100%) rename {sys/profiles/secrets => secrets}/hopper/default.nix (100%) rename {sys/profiles/secrets => secrets}/hopper/miniflux (100%) rename {sys/profiles/secrets => secrets}/hopper/navidrome (100%) rename {sys/profiles/secrets => secrets}/hopper/restic-password (100%) rename {sys/profiles/secrets => secrets}/hopper/roblox-playtime (100%) rename {sys/profiles/secrets => secrets}/hopper/samba-pass (100%) rename {sys/profiles/secrets => secrets}/hopper/slskd (100%) rename {sys/profiles/secrets => secrets}/hopper/transmission (100%) rename {sys/profiles/secrets => secrets}/hopper/vaultwarden-env (100%) rename {sys/profiles/secrets => secrets}/hopper/wireguard (100%) rename {sys/profiles/secrets => secrets}/nixdesk/brawlstars (100%) rename {sys/profiles/secrets => secrets}/nixdesk/cloudflare (100%) rename {sys/profiles/secrets => secrets}/nixdesk/default.nix (100%) rename {sys/profiles/secrets => secrets}/nixdesk/samba (100%) rename {sys/profiles/secrets => secrets}/nixdesk/wireguard (100%) rename {sys/profiles/secrets => secrets}/nixdesk/wireguard.yaml (100%) rename {sys/profiles/secrets => secrets}/rackserv/cloudflare (100%) rename {sys/profiles/secrets => secrets}/rackserv/default.nix (100%) rename {sys/profiles/secrets => secrets}/rackserv/restic-password (100%) rename {sys/profiles/secrets => secrets}/rackserv/wireguard-private (100%) delete mode 100644 sys/profiles/programs/RE/il2cppdumper/default.nix delete mode 100644 sys/profiles/programs/RE/il2cppdumper/deps.nix delete mode 100644 sys/profiles/programs/RE/ilspy/default.nix delete mode 100644 sys/profiles/programs/RE/ilspy/deps.nix rename sys/profiles/programs/{RE/default.nix => reverse-engineering.nix} (86%) delete mode 100644 sys/profiles/secrets/default.nix delete mode 100644 sys/profiles/secrets/global/default.nix delete mode 100644 sys/profiles/secrets/global/tailscale-auth.yaml diff --git a/flake.nix b/flake.nix index b2b7ba3..85db717 100644 --- a/flake.nix +++ b/flake.nix @@ -5,21 +5,29 @@ nixpkgs, ... } @ inputs: let - mylib = import ./lib nixpkgs.lib; systemProfiles = ./sys/profiles; homeProfiles = ./home/profiles; homeSuites = ./home/suites; vars = import ./vars; + l = nixpkgs.lib; + b = builtins; in flake-parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux"]; - flake.nixosConfigurations = mylib.loadConfigurations ./sys/machines (hostname: { - inherit inputs self systemProfiles homeProfiles homeSuites vars mylib; - hostVars = ./vars/${hostname}; - }); - - flake._mylib = mylib; + flake.nixosConfigurations = + b.readDir ./sys/machines + |> b.mapAttrs (hostname: _: + l.nixosSystem { + modules = [ + ./sys/machines/${hostname} + ./secrets/${hostname} + inputs.sops-nix.nixosModules.sops + ]; + specialArgs = { + inherit inputs self systemProfiles homeProfiles homeSuites vars; + }; + }); perSystem = {pkgs, ...}: { imports = [ diff --git a/home/profiles/secrets/default.nix b/home/profiles/secrets/default.nix deleted file mode 100644 index 557c163..0000000 --- a/home/profiles/secrets/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{config, ...}: { - sops = { - age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt"; - }; - - imports = []; -} diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix index 2c20355..12a406d 100644 --- a/home/suites/nixdesk/default.nix +++ b/home/suites/nixdesk/default.nix @@ -11,8 +11,6 @@ ./outputs.nix ] ++ (map (x: homeProfiles + x) [ - /secrets - /default.nix /terminal/shell/zsh.nix diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index a2fde45..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -l: let - b = builtins; -in { - loadConfigurations = dir: specialArgsFromHost: - (b.mapAttrs (name: _: - l.nixosSystem { - modules = [(dir + /${name})]; - specialArgs = specialArgsFromHost name; - })) (b.readDir dir); -} diff --git a/sys/profiles/secrets/hopper/cloudflare b/secrets/hopper/cloudflare similarity index 100% rename from sys/profiles/secrets/hopper/cloudflare rename to secrets/hopper/cloudflare diff --git a/sys/profiles/secrets/hopper/default.nix b/secrets/hopper/default.nix similarity index 100% rename from sys/profiles/secrets/hopper/default.nix rename to secrets/hopper/default.nix diff --git a/sys/profiles/secrets/hopper/miniflux b/secrets/hopper/miniflux similarity index 100% rename from sys/profiles/secrets/hopper/miniflux rename to secrets/hopper/miniflux diff --git a/sys/profiles/secrets/hopper/navidrome b/secrets/hopper/navidrome similarity index 100% rename from sys/profiles/secrets/hopper/navidrome rename to secrets/hopper/navidrome diff --git a/sys/profiles/secrets/hopper/restic-password b/secrets/hopper/restic-password similarity index 100% rename from sys/profiles/secrets/hopper/restic-password rename to secrets/hopper/restic-password diff --git a/sys/profiles/secrets/hopper/roblox-playtime b/secrets/hopper/roblox-playtime similarity index 100% rename from sys/profiles/secrets/hopper/roblox-playtime rename to secrets/hopper/roblox-playtime diff --git a/sys/profiles/secrets/hopper/samba-pass b/secrets/hopper/samba-pass similarity index 100% rename from sys/profiles/secrets/hopper/samba-pass rename to secrets/hopper/samba-pass diff --git a/sys/profiles/secrets/hopper/slskd b/secrets/hopper/slskd similarity index 100% rename from sys/profiles/secrets/hopper/slskd rename to secrets/hopper/slskd diff --git a/sys/profiles/secrets/hopper/transmission b/secrets/hopper/transmission similarity index 100% rename from sys/profiles/secrets/hopper/transmission rename to secrets/hopper/transmission diff --git a/sys/profiles/secrets/hopper/vaultwarden-env b/secrets/hopper/vaultwarden-env similarity index 100% rename from sys/profiles/secrets/hopper/vaultwarden-env rename to secrets/hopper/vaultwarden-env diff --git a/sys/profiles/secrets/hopper/wireguard b/secrets/hopper/wireguard similarity index 100% rename from sys/profiles/secrets/hopper/wireguard rename to secrets/hopper/wireguard diff --git a/sys/profiles/secrets/nixdesk/brawlstars b/secrets/nixdesk/brawlstars similarity index 100% rename from sys/profiles/secrets/nixdesk/brawlstars rename to secrets/nixdesk/brawlstars diff --git a/sys/profiles/secrets/nixdesk/cloudflare b/secrets/nixdesk/cloudflare similarity index 100% rename from sys/profiles/secrets/nixdesk/cloudflare rename to secrets/nixdesk/cloudflare diff --git a/sys/profiles/secrets/nixdesk/default.nix b/secrets/nixdesk/default.nix similarity index 100% rename from sys/profiles/secrets/nixdesk/default.nix rename to secrets/nixdesk/default.nix diff --git a/sys/profiles/secrets/nixdesk/samba b/secrets/nixdesk/samba similarity index 100% rename from sys/profiles/secrets/nixdesk/samba rename to secrets/nixdesk/samba diff --git a/sys/profiles/secrets/nixdesk/wireguard b/secrets/nixdesk/wireguard similarity index 100% rename from sys/profiles/secrets/nixdesk/wireguard rename to secrets/nixdesk/wireguard diff --git a/sys/profiles/secrets/nixdesk/wireguard.yaml b/secrets/nixdesk/wireguard.yaml similarity index 100% rename from sys/profiles/secrets/nixdesk/wireguard.yaml rename to secrets/nixdesk/wireguard.yaml diff --git a/sys/profiles/secrets/rackserv/cloudflare b/secrets/rackserv/cloudflare similarity index 100% rename from sys/profiles/secrets/rackserv/cloudflare rename to secrets/rackserv/cloudflare diff --git a/sys/profiles/secrets/rackserv/default.nix b/secrets/rackserv/default.nix similarity index 100% rename from sys/profiles/secrets/rackserv/default.nix rename to secrets/rackserv/default.nix diff --git a/sys/profiles/secrets/rackserv/restic-password b/secrets/rackserv/restic-password similarity index 100% rename from sys/profiles/secrets/rackserv/restic-password rename to secrets/rackserv/restic-password diff --git a/sys/profiles/secrets/rackserv/wireguard-private b/secrets/rackserv/wireguard-private similarity index 100% rename from sys/profiles/secrets/rackserv/wireguard-private rename to secrets/rackserv/wireguard-private diff --git a/sys/machines/hopper/default.nix b/sys/machines/hopper/default.nix index 0782b7c..d0db51d 100644 --- a/sys/machines/hopper/default.nix +++ b/sys/machines/hopper/default.nix @@ -31,9 +31,6 @@ } ] ++ (map (x: systemProfiles + x) [ - /secrets/default.nix - /secrets/hopper/default.nix - /programs/home-manager.nix /core/security.nix diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix index eca015c..d155185 100644 --- a/sys/machines/nixdesk/default.nix +++ b/sys/machines/nixdesk/default.nix @@ -34,9 +34,6 @@ } ] ++ (map (x: systemProfiles + x) [ - /secrets - /secrets/nixdesk - /core/security.nix /core/keyring.nix /core/users.nix @@ -92,7 +89,7 @@ /programs/gamemode.nix /programs/gamescope.nix /programs/steam.nix - /programs/RE + /programs/reverse-engineering.nix ]); services.locate.prunePaths = lib.mkOptionDefault ["/home/xun/backup"]; diff --git a/sys/machines/rackserv/default.nix b/sys/machines/rackserv/default.nix index 1665f87..aa3c095 100644 --- a/sys/machines/rackserv/default.nix +++ b/sys/machines/rackserv/default.nix @@ -15,9 +15,6 @@ ./caddy.nix ] ++ (map (x: systemProfiles + x) [ - /secrets/default.nix - /secrets/rackserv/default.nix - /core/security.nix /core/tools.nix /core/ssh.nix diff --git a/sys/profiles/programs/RE/il2cppdumper/default.nix b/sys/profiles/programs/RE/il2cppdumper/default.nix deleted file mode 100644 index eafa1a7..0000000 --- a/sys/profiles/programs/RE/il2cppdumper/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - buildDotnetModule, - dotnetCorePackages, - fetchFromGitHub, -}: -buildDotnetModule rec { - pname = "il2cppdumper"; - version = "6.7.46"; - - src = fetchFromGitHub { - owner = "Perfare"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-pMxxwBpuZ2EuP7O99XTJcnS3Dq8MdxvUGQHJ0U3bnTY="; - }; - - projectFile = "Il2CppDumper/Il2CppDumper.csproj"; - - nugetDeps = ./deps.nix; - - dotnet-sdk = with dotnetCorePackages; combinePackages [sdk_7_0 sdk_6_0]; - dotnet-runtime = dotnetCorePackages.runtime_7_0; - - dotnetBuildFlags = [ - "-f" - "net7.0" - ]; - dotnetInstallFlags = dotnetBuildFlags; - - executables = [ - "Il2CppDumper" - ]; -} diff --git a/sys/profiles/programs/RE/il2cppdumper/deps.nix b/sys/profiles/programs/RE/il2cppdumper/deps.nix deleted file mode 100644 index 59aa2a1..0000000 --- a/sys/profiles/programs/RE/il2cppdumper/deps.nix +++ /dev/null @@ -1,22 +0,0 @@ -{fetchNuGet}: [ - (fetchNuGet { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "6.0.31"; - sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "6.0.31"; - sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.App.Ref"; - version = "6.0.31"; - sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; - }) - (fetchNuGet { - pname = "Mono.Cecil"; - version = "0.11.4"; - sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; - }) -] diff --git a/sys/profiles/programs/RE/ilspy/default.nix b/sys/profiles/programs/RE/ilspy/default.nix deleted file mode 100644 index cbbb047..0000000 --- a/sys/profiles/programs/RE/ilspy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - buildDotnetModule, - dotnetCorePackages, - fetchFromGitHub, - powershell, -}: -buildDotnetModule rec { - pname = "ilspy"; - version = "9.0-preview2"; - src = fetchFromGitHub { - owner = "icsharpcode"; - repo = "ILSpy"; - rev = "v${version}"; - sha256 = "sha256-JaFyKq5ZyHLvodY2/Ybwb/FmDeWQ5BawmA1ss+Qry20="; - }; - - buildInputs = [ - powershell - ]; - - projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj"; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - - nugetDeps = ./deps.nix; -} diff --git a/sys/profiles/programs/RE/ilspy/deps.nix b/sys/profiles/programs/RE/ilspy/deps.nix deleted file mode 100644 index 4750f99..0000000 --- a/sys/profiles/programs/RE/ilspy/deps.nix +++ /dev/null @@ -1,374 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! -{fetchNuGet}: [ - (fetchNuGet { - pname = "K4os.Compression.LZ4"; - version = "1.3.8"; - sha256 = "0813zra3gp35z9nwzqps534v2b34d8hsmmxy1hcrkamq0ckzfr1s"; - }) - (fetchNuGet { - pname = "McMaster.Extensions.CommandLineUtils"; - version = "4.1.1"; - sha256 = "0jp4q30lfh42y3h8057y2icllnil7cbigkry4l514wbayj8jwp9b"; - }) - (fetchNuGet { - pname = "McMaster.Extensions.Hosting.CommandLine"; - version = "4.1.1"; - sha256 = "0w18sn248pga1g83z5qakdfvzp8729h9da01kd14xg5l115jngj3"; - }) - (fetchNuGet { - pname = "Microsoft.Build.Tasks.Git"; - version = "8.0.0"; - sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "8.0.0"; - sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "6.0.0"; - sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "8.0.0"; - sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Binder"; - version = "8.0.0"; - sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.CommandLine"; - version = "8.0.0"; - sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "8.0.0"; - sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "8.0.0"; - sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Json"; - version = "8.0.0"; - sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.UserSecrets"; - version = "8.0.0"; - sha256 = "1br01zhzhnxjzqx63bxd25x48y9xs69hcs71pjni8y9kl50zja7z"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection"; - version = "8.0.0"; - sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "6.0.0"; - sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "8.0.0"; - sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Diagnostics"; - version = "8.0.0"; - sha256 = "0ghwkld91k20hcbmzg2137w81mzzdh8hfaapdwckhza0vipya4kw"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Diagnostics.Abstractions"; - version = "8.0.0"; - sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "6.0.0"; - sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "8.0.0"; - sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "8.0.0"; - sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "8.0.0"; - sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Hosting"; - version = "8.0.0"; - sha256 = "1f2af5m1yny8b43251gsj75hjd9ixni1clcldy8cg91z1vxxm8dh"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Hosting.Abstractions"; - version = "6.0.0"; - sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Hosting.Abstractions"; - version = "8.0.0"; - sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging"; - version = "8.0.0"; - sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "6.0.0"; - sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "8.0.0"; - sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Configuration"; - version = "8.0.0"; - sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Console"; - version = "8.0.0"; - sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Debug"; - version = "8.0.0"; - sha256 = "1h7mg97lj0ss47kq7zwnihh9c6xcrkwrr8ffhc16qcsrh36sg6q0"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.EventLog"; - version = "8.0.0"; - sha256 = "05vfrxw7mlwlwhsl6r4yrhxk3sd8dv5sl0hdlcpgw62n53incw5x"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.EventSource"; - version = "8.0.0"; - sha256 = "0gbjll6p03rmw0cf8fp0p8cxzn9awmzv8hvnyqbczrkax5h7p94i"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options"; - version = "8.0.0"; - sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; - version = "8.0.0"; - sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "6.0.0"; - sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "8.0.0"; - sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.App.Ref"; - version = "8.0.0"; - sha256 = "0hyvbh86433764qqqhw9i7ga0ax7bbdmzh77jw58pq0ggm41cff9"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.Common"; - version = "8.0.0"; - sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.GitHub"; - version = "8.0.0"; - sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; - }) - (fetchNuGet { - pname = "Mono.Cecil"; - version = "0.11.5"; - sha256 = "1l388sy7ibsq4b2pj08g3di0g8yppq47chd7ip10kwml6mpp1wcw"; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "13.0.3"; - sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; - }) - (fetchNuGet { - pname = "NuGet.Common"; - version = "6.10.0"; - sha256 = "0nizrnilmlcqbm945293h8q3wfqfchb4xi8g50x4kjn0rbpd1kbh"; - }) - (fetchNuGet { - pname = "NuGet.Configuration"; - version = "6.10.0"; - sha256 = "1aqaknaawnqx4mnvx9qw73wvj48jjzv0d78dzwl7m9zjlrl9myhz"; - }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "6.10.0"; - sha256 = "0hrd8y31zx9a0wps49czw0qgbrakb49zn3abfgylc9xrq990zkqk"; - }) - (fetchNuGet { - pname = "NuGet.Packaging"; - version = "6.10.0"; - sha256 = "18s53cvrf51lihmaqqdf48p2qi6ky1l48jv0hvbp76cxwdg7rba4"; - }) - (fetchNuGet { - pname = "NuGet.Protocol"; - version = "6.10.0"; - sha256 = "0hmv4q0ks9i34mfgpb13l01la9v3jjllfh1qd3aqv105xrqrdxac"; - }) - (fetchNuGet { - pname = "NuGet.Versioning"; - version = "6.10.0"; - sha256 = "1x19njx4x0sw9fz8y5fibi15xfsrw5avir0cx0599yd7p3ykik5g"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.1"; - sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "6.0.0"; - sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "8.0.0"; - sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; - }) - (fetchNuGet { - pname = "System.ComponentModel.Annotations"; - version = "5.0.0"; - sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; - }) - (fetchNuGet { - pname = "System.ComponentModel.Composition"; - version = "8.0.0"; - sha256 = "02hmqwrdvqzq4ka4kpf88i7n3qp6lw1xwp7424kg08pa9y69swij"; - }) - (fetchNuGet { - pname = "System.Composition"; - version = "8.0.0"; - sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; - }) - (fetchNuGet { - pname = "System.Composition.AttributedModel"; - version = "8.0.0"; - sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; - }) - (fetchNuGet { - pname = "System.Composition.Convention"; - version = "8.0.0"; - sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; - }) - (fetchNuGet { - pname = "System.Composition.Hosting"; - version = "8.0.0"; - sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; - }) - (fetchNuGet { - pname = "System.Composition.Runtime"; - version = "8.0.0"; - sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; - }) - (fetchNuGet { - pname = "System.Composition.TypedParts"; - version = "8.0.0"; - sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; - }) - (fetchNuGet { - pname = "System.Diagnostics.DiagnosticSource"; - version = "8.0.0"; - sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; - }) - (fetchNuGet { - pname = "System.Diagnostics.EventLog"; - version = "8.0.0"; - sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; - }) - (fetchNuGet { - pname = "System.Formats.Asn1"; - version = "6.0.0"; - sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.4"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) - (fetchNuGet { - pname = "System.Reflection.Metadata"; - version = "6.0.0"; - sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; - }) - (fetchNuGet { - pname = "System.Reflection.Metadata"; - version = "8.0.0"; - sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "6.0.0"; - sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Pkcs"; - version = "6.0.4"; - sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.ProtectedData"; - version = "4.4.0"; - sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; - }) - (fetchNuGet { - pname = "System.Text.Encodings.Web"; - version = "8.0.0"; - sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; - }) - (fetchNuGet { - pname = "System.Text.Json"; - version = "8.0.0"; - sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; - }) - (fetchNuGet { - pname = "TunnelVisionLabs.ReferenceAssemblyAnnotator"; - version = "1.0.0-alpha.160"; - sha256 = "1wvfa3098a984kydjgjvx43gncnr89fw20if2gqvz8kqn9pxqjbq"; - }) -] diff --git a/sys/profiles/programs/RE/default.nix b/sys/profiles/programs/reverse-engineering.nix similarity index 86% rename from sys/profiles/programs/RE/default.nix rename to sys/profiles/programs/reverse-engineering.nix index 3544461..1d8e892 100644 --- a/sys/profiles/programs/RE/default.nix +++ b/sys/profiles/programs/reverse-engineering.nix @@ -13,8 +13,6 @@ self.packages.${pkgs.system}.binaryninja-personal self.packages.${pkgs.system}.ida-pro - # (pkgs.callPackage ./il2cppdumper {}) - # (pkgs.callPackage ./ilspy {}) gdb ]; diff --git a/sys/profiles/secrets/default.nix b/sys/profiles/secrets/default.nix deleted file mode 100644 index 271d286..0000000 --- a/sys/profiles/secrets/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.sops-nix.nixosModules.sops - # ./global - ]; -} diff --git a/sys/profiles/secrets/global/default.nix b/sys/profiles/secrets/global/default.nix deleted file mode 100644 index 4eb90ff..0000000 --- a/sys/profiles/secrets/global/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - sops.secrets = { - tailscale-auth = { - key = "tailscale-auth"; - sopsFile = ./tailscale-auth.yaml; - }; - }; -} diff --git a/sys/profiles/secrets/global/tailscale-auth.yaml b/sys/profiles/secrets/global/tailscale-auth.yaml deleted file mode 100644 index 06fceb7..0000000 --- a/sys/profiles/secrets/global/tailscale-auth.yaml +++ /dev/null @@ -1,34 +0,0 @@ -tailscale-auth: ENC[AES256_GCM,data:8+XTTS0YoJpQPYMhES6YTWGehQH992cfIjFed+kl2sXZ551PyvaA4Y0/7CuNM9udJe2ba2yte3DkN+AILWk=,iv:EK6ifjTYD4Y5zEjfty0eJyfDaQO8ooOHXdCcEAF3W0w=,tag:wfbrkPqHFk8dJaDkNeaChg==,type:str] -sops: - age: - - recipient: age17pdqkpfh6kc6wm7gxzdnwf6vphlwddv9yfpdu3j76e24y3amd9tq3avfc8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlSXcvNTBOR29sMUhJV2tu - QXlySGFqNnZKaXNnOE5GZG82S1NsVkhKNDBzCjhBTjNJVTlPYlAwcmREV0dMUTFk - aG1UbXhtVklCK2UzekFjT3VGS1lVeXMKLS0tIG94V1hramdiNmJ6SDE3NkNoVlFO - ZGdTdGVqOE03VEM4MjNFeTZ1cE1iMVEKmc0l/Tfi2YEJQaxj4/T7sZDxGBP9gDBf - VGiKTOqfzOeZZ8LDELcC2vqf7LBDS3eiT9IgR1hhW0Ty/+o0tcuAcg== - -----END AGE ENCRYPTED FILE----- - - recipient: age155sscpw0x36t6s9usdrz7relpxqrtqnk98mrc7s0qcv2n0v3zd7sfl2xn8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuc0d1SklGYXlxTXVxdVBu - NTRhT0h4TUptQTRWKzAyNmZ1S3pVKy9lSzB3CjZxTDIrTmhBRWF0WTZNL21kZkk3 - QURLbW5JOEhBQ09iTS9KeGZINWdJeWMKLS0tIC9LeDRocS9KUXdYSHNCMVd4bXZI - N00zNXVrNEdLblM0M1RGTE0rVk9vOHcKtlIHbYAHJVBowOsn34+9FSTSOV1S1TYw - ve3VRmy71qkDZrazqgaOpbqtqMzQL2vWb/MI7nXfBU+S7GKnl542dg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1e9nhfwfcg9krc03re4fwh0wu0cwf6jq4js5vfn26hcdqc2apgdes98fea7 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZR0ZBVTlmS28va0RPTzJa - OEljcFJEMzM5NndIL0I4aWl6TS9rdjZnQ0VZCmlBajR3bnJ5aDdZTDU1MUFOTmw0 - ZWFYZVZkQmYyMlBSaENybDRoTzBTREkKLS0tIGdvbyt4Vk0yTU01Um9qMU1idWEw - ZFFENlZONzEvK05pQjlORGZoL0pBMVEK/YhL92eTd/Kn1OawH0Ib/s2TMwdbFFzM - kMGltakjqVeHTORWNKbonfk+X4bxm4a3xnOTfvGschQnPN7ySziBMg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-17T00:06:06Z" - mac: ENC[AES256_GCM,data:EWKH7alUhTJWmHd1Y/hrtN7N2rc9DnIUxRghgGL6YwXz4kk1VoTlzEACw9NTv0qrQSfTVbFmD5f24vvdlrn7/SERmacv3GOe1/OM6kC11MTgO8rUCCwUGa+c5ublke7DQW/wQR7ay9a4pHRHf1DVBB3PrO7+A34CYWGP6gt0jcM=,iv:YzccaJSS14OPqEUftQUOhnFnF0vUNAtRvdCaDuZFoMM=,tag:R/fKcXST7LbzTahXD4uO6Q==,type:str] - unencrypted_suffix: _unencrypted - version: 3.9.1