From aa945446a6b6d835ca24ecce934e8c791193bb9a Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 16 Jan 2026 12:30:30 -0500 Subject: [PATCH 1/4] update flake lock, swap off of adb and nixfmt-rfc-style --- flake.lock | 102 ++++++++++++++++---------------- flake.nix | 2 +- shell.nix | 2 +- systems/artemision/programs.nix | 1 + users/alice/non-server.nix | 2 +- 5 files changed, 55 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 30da11e..1bdc962 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1767473845, - "narHash": "sha256-Pvd0l14qYA4jBS+JSCufoj8qFpeu2dt0Q9zBvpeLKac=", + "lastModified": 1768536226, + "narHash": "sha256-d1VSTNa7ajTxT39QBp3gKSbgmgn7yx8RxTZuvZwNX9Y=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7f7d9e8b61abade02c6dc0d530ba6b43a50acead", + "rev": "b092ea4a7d083e09e0aa2de909c1b35b9efb3ee0", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -146,11 +146,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1767556355, - "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", + "lastModified": 1768530555, + "narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=", "owner": "nix-community", "repo": "home-manager", - "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", + "rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6", "type": "github" }, "original": { @@ -283,11 +283,11 @@ ] }, "locked": { - "lastModified": 1766066098, - "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=", + "lastModified": 1768426687, + "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=", "owner": "hyprwm", "repo": "contrib", - "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690", + "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1768583413, + "narHash": "sha256-tF5UD4D/s0kERXxhu5mzTo7FF/2jnU8PYf7wWk8guB0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "45bf76ef956c7ac771b56c54a3009506dc6c7af6", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1766370075, - "narHash": "sha256-gbhR8+gNrhmYxKaNJpTjFivuibr3ZdlB5eU0a8yE36I=", + "lastModified": 1768443651, + "narHash": "sha256-hmIo/e6mo40Y2v1DaH2yTtvB3lZ/zcf6gVNmgYhBgYc=", "owner": "NuschtOS", "repo": "nixos-modules", - "rev": "db6f2a33500dadb81020b6e5d4281b4820d1b862", + "rev": "31108e0d75bd47ddfc217b58df598e78fe3bcd42", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -596,11 +596,11 @@ ] }, "locked": { - "lastModified": 1767495280, - "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", + "lastModified": 1768531678, + "narHash": "sha256-tf4xEp5Zq8+Zce0WtU8b0VNMxhQtwes67sN2phnbkpk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", + "rev": "0a9de73f3c23206a2fce3c7656a42d3a3f07be9f", "type": "github" }, "original": { @@ -616,11 +616,11 @@ ] }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1768481291, + "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767559556, - "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=", + "lastModified": 1768492720, + "narHash": "sha256-aHos307HyVtOriYZppyUjrkcEKQzyp9F5WzxpMjPFH8=", "owner": "danth", "repo": "stylix", - "rev": "b135edbdd403896d1ef507934c045f716deb5609", + "rev": "5287bc719dbb6efb26f48c1677a221c966a4a4d9", "type": "github" }, "original": { @@ -729,11 +729,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -761,11 +761,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f2df361..d01f8d1 100644 --- a/flake.nix +++ b/flake.nix @@ -171,7 +171,7 @@ inherit lib; # for allowing use of custom functions in nix repl hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; }; - formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); + formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt); nixosConfigurations = genSystems inputs outputs src (src + "/systems"); homeConfigurations = { diff --git a/shell.nix b/shell.nix index 662d47d..cbe060c 100644 --- a/shell.nix +++ b/shell.nix @@ -44,7 +44,7 @@ forEachSystem ( pre-commit treefmt statix - nixfmt-rfc-style + nixfmt jsonfmt mdformat shfmt diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index 1db14ec..4e5f267 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -5,6 +5,7 @@ alacritty attic-client amdgpu_top + android-tools bat bitwarden-cli bfg-repo-cleaner diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix index 2affbf2..a1a14f0 100644 --- a/users/alice/non-server.nix +++ b/users/alice/non-server.nix @@ -66,7 +66,7 @@ # nix tools nil - nixfmt-rfc-style + nixfmt nix-init # markdown From 0f4c578c40cba92e85dc90298bec3d09353c2599 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 16 Jan 2026 18:10:04 -0500 Subject: [PATCH 2/4] add temurin --- systems/artemision/programs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index 4e5f267..2cb7c63 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -37,6 +37,9 @@ ipmiview iperf3 # ipscan + javaPackages.compiler.temurin-bin.jdk-25 + javaPackages.compiler.temurin-bin.jdk-21 + javaPackages.compiler.temurin-bin.jdk-17 jp2a jq kdePackages.kdenlive From 9db5a4c07355555f84af9396f1b0a07d01a778ad Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 16 Jan 2026 18:10:38 -0500 Subject: [PATCH 3/4] remove adb --- systems/artemision/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/systems/artemision/configuration.nix b/systems/artemision/configuration.nix index f49433b..79a6c1b 100644 --- a/systems/artemision/configuration.nix +++ b/systems/artemision/configuration.nix @@ -82,8 +82,6 @@ system.stateVersion = "24.05"; - programs.adb.enable = true; - environment.variables = { "KWIN_DRM_NO_DIRECT_SCANOUT" = "1"; }; From a52250876b41cd5989b4d024603317ed96ed2d2a Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 16 Jan 2026 18:16:56 -0500 Subject: [PATCH 4/4] remove adb --- users/alice/default.nix | 3 +++ users/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/users/alice/default.nix b/users/alice/default.nix index 4c71933..2b12a5a 100644 --- a/users/alice/default.nix +++ b/users/alice/default.nix @@ -17,4 +17,7 @@ import ../default.nix { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588" ]; + groups = [ + "adbusers" + ]; } diff --git a/users/default.nix b/users/default.nix index cb43e5f..7de3767 100644 --- a/users/default.nix +++ b/users/default.nix @@ -4,6 +4,7 @@ pkgs, name, publicKeys ? [ ], + groups ? [ ], defaultShell ? "zsh", }: @@ -18,7 +19,6 @@ "wheel" "media" (lib.mkIf config.networking.networkmanager.enable "networkmanager") - (lib.mkIf config.programs.adb.enable "adbusers") (lib.mkIf config.programs.wireshark.enable "wireshark") (lib.mkIf config.virtualisation.docker.enable "docker") (lib.mkIf (with config.services.locate; (enable && package == pkgs.plocate)) "plocate") @@ -28,5 +28,6 @@ "plugdev" "uaccess" "ydotool" - ]; + ] + ++ groups; }