11 Commits

Author SHA1 Message Date
github-actions[bot]
4e12851039 automated: Update flake.lock
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 18s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m24s
Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2026-01-17 12:09:44 +00:00
ef7287c76e Merge pull request 'switch to CF' (#176) from feature/pii into main
Some checks failed
Check flake.lock / Check health of `flake.lock` (push) Successful in 11s
Check Nix flake / Perform Nix flake checks (push) Failing after 13m23s
Update flakes / update_lockfile (push) Successful in 10m17s
Reviewed-on: #176
2026-01-16 19:58:39 -05:00
1614015fca remove agg jobs
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m30s
2026-01-16 19:54:56 -05:00
0a215cb588 switch to CF
Some checks failed
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s
Check Nix flake / Perform Nix flake checks (pull_request) Failing after 3m19s
2026-01-16 19:50:45 -05:00
e802e32e58 Merge pull request 'update flake lock, swap off of adb and nixfmt-rfc-style' (#173) from update_flake_lock_action into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 11s
Check Nix flake / Perform Nix flake checks (push) Successful in 3m40s
Reviewed-on: #173
2026-01-16 18:31:09 -05:00
a52250876b remove adb
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m49s
2026-01-16 18:27:16 -05:00
9db5a4c073 remove adb 2026-01-16 18:27:16 -05:00
0f4c578c40 add temurin 2026-01-16 18:27:16 -05:00
aa945446a6 update flake lock, swap off of adb and nixfmt-rfc-style 2026-01-16 18:27:16 -05:00
21fe5efd26 Merge pull request 'fix pii' (#175) from feature/pii into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 10s
Check Nix flake / Perform Nix flake checks (push) Successful in 3m27s
Reviewed-on: #175
2026-01-16 18:08:39 -05:00
ccff72ace2 fix pii
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 13s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m17s
2026-01-16 18:04:18 -05:00
7 changed files with 34 additions and 38 deletions

36
flake.lock generated
View File

@@ -76,11 +76,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1768536226, "lastModified": 1768622624,
"narHash": "sha256-d1VSTNa7ajTxT39QBp3gKSbgmgn7yx8RxTZuvZwNX9Y=", "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "b092ea4a7d083e09e0aa2de909c1b35b9efb3ee0", "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768530555, "lastModified": 1768598210,
"narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=", "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6", "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -417,11 +417,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1768583413, "lastModified": 1768584846,
"narHash": "sha256-tF5UD4D/s0kERXxhu5mzTo7FF/2jnU8PYf7wWk8guB0=", "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45bf76ef956c7ac771b56c54a3009506dc6c7af6", "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -502,11 +502,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1768305791, "lastModified": 1768564909,
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -596,11 +596,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768531678, "lastModified": 1768617670,
"narHash": "sha256-tf4xEp5Zq8+Zce0WtU8b0VNMxhQtwes67sN2phnbkpk=", "narHash": "sha256-Z3+6dxoWZn+QFwjxAt5ZGXkiuCvCLgQP6pTS5eSWXqk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0a9de73f3c23206a2fce3c7656a42d3a3f07be9f", "rev": "56d0fbdd732f3686e8414b857cf885038fc17d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -650,11 +650,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1768492720, "lastModified": 1768603455,
"narHash": "sha256-aHos307HyVtOriYZppyUjrkcEKQzyp9F5WzxpMjPFH8=", "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "5287bc719dbb6efb26f48c1677a221c966a4a4d9", "rev": "590e5c68c4d5e8c766420473c0185d75113f653b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -8,10 +8,7 @@ let
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
getCfg = _: cfg: cfg.config.system.build.toplevel; getCfg = _: cfg: cfg.config.system.build.toplevel;
hostToAgg = _: cfg: cfg;
getHome = _: cfg: cfg.config.home.activationPackage; getHome = _: cfg: cfg.config.home.activationPackage;
homeToAgg = _: cfg: cfg;
# get per-system check derivation (with optional postfix) # get per-system check derivation (with optional postfix)
mapSystems = mapSystems =
@@ -27,15 +24,6 @@ rec {
host = lib.mapAttrs getCfg outputs.nixosConfigurations; host = lib.mapAttrs getCfg outputs.nixosConfigurations;
home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage
hosts = pkgs.releaseTools.aggregate {
name = "hosts";
constituents = lib.mapAttrsToList hostToAgg host;
};
homes = pkgs.releaseTools.aggregate {
name = "homes";
constituents = lib.mapAttrsToList homeToAgg home;
};
devChecks = pkgs.releaseTools.aggregate { devChecks = pkgs.releaseTools.aggregate {
name = "devChecks"; name = "devChecks";
constituents = lib.flatten [ constituents = lib.flatten [

View File

@@ -82,8 +82,6 @@
system.stateVersion = "24.05"; system.stateVersion = "24.05";
programs.adb.enable = true;
environment.variables = { environment.variables = {
"KWIN_DRM_NO_DIRECT_SCANOUT" = "1"; "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
}; };

View File

@@ -37,6 +37,9 @@
ipmiview ipmiview
iperf3 iperf3
# ipscan # ipscan
javaPackages.compiler.temurin-bin.jdk-25
javaPackages.compiler.temurin-bin.jdk-21
javaPackages.compiler.temurin-bin.jdk-17
jp2a jp2a
jq jq
kdePackages.kdenlive kdePackages.kdenlive

View File

@@ -23,7 +23,7 @@ let
STOP_DURATION = "600"; STOP_DURATION = "600";
SYNC_CHUNK_WRITES = "false"; SYNC_CHUNK_WRITES = "false";
USE_AIKAR_FLAGS = "true"; USE_AIKAR_FLAGS = "true";
MEMORY = "12GB"; MEMORY = "12G";
ALLOW_FLIGHT = "true"; ALLOW_FLIGHT = "true";
MAX_TICK_TIME = "-1"; MAX_TICK_TIME = "-1";
ENABLE_RCON = "true"; ENABLE_RCON = "true";
@@ -86,17 +86,20 @@ in
hostname = "pii"; hostname = "pii";
environment = defaultEnv // { environment = defaultEnv // {
VERSION = "1.20.1"; VERSION = "1.20.1";
TYPE = "modrinth"; CF_SLUG = "prominence-2-hasturian-era";
MODRINTH_MODPACK = "prominence-2-fabric"; CF_FILENAME_MATCHER = "3.9.14hf";
MODRINTH_VERSION = "3.9.14hf";
USE_AIKAR_FLAGS = "false"; USE_AIKAR_FLAGS = "false";
USE_MEOWICE_FLAGS = "true"; USE_MEOWICE_FLAGS = "true";
USE_MEOWICE_GRAALVM_FLAGS = "true"; USE_MEOWICE_GRAALVM_FLAGS = "true";
DIFFICULTY = "hard"; DIFFICULTY = "hard";
ENABLE_COMMAND_BLOCK = "true"; ENABLE_COMMAND_BLOCK = "true";
CF_FORCE_INCLUDE_FILES = ''
emi
'';
}; };
extraOptions = defaultOptions; extraOptions = defaultOptions;
log-driver = "local"; log-driver = "local";
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
}; };
#stop_signal: SIGTERM #stop_signal: SIGTERM
#stop_grace_period: 5m #stop_grace_period: 5m

View File

@@ -17,4 +17,7 @@ import ../default.nix {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588"
]; ];
groups = [
"adbusers"
];
} }

View File

@@ -4,6 +4,7 @@
pkgs, pkgs,
name, name,
publicKeys ? [ ], publicKeys ? [ ],
groups ? [ ],
defaultShell ? "zsh", defaultShell ? "zsh",
}: }:
@@ -18,7 +19,6 @@
"wheel" "wheel"
"media" "media"
(lib.mkIf config.networking.networkmanager.enable "networkmanager") (lib.mkIf config.networking.networkmanager.enable "networkmanager")
(lib.mkIf config.programs.adb.enable "adbusers")
(lib.mkIf config.programs.wireshark.enable "wireshark") (lib.mkIf config.programs.wireshark.enable "wireshark")
(lib.mkIf config.virtualisation.docker.enable "docker") (lib.mkIf config.virtualisation.docker.enable "docker")
(lib.mkIf (with config.services.locate; (enable && package == pkgs.plocate)) "plocate") (lib.mkIf (with config.services.locate; (enable && package == pkgs.plocate)) "plocate")
@@ -28,5 +28,6 @@
"plugdev" "plugdev"
"uaccess" "uaccess"
"ydotool" "ydotool"
]; ]
++ groups;
} }