From 44eb4e24030dd052e929ac45292f59cac3e79448 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 7 Dec 2025 17:35:43 -0500 Subject: [PATCH] decouple hydra nix from flake nix --- flake.lock | 176 +++++++++++++----------- flake.nix | 4 +- modules/nix.nix | 2 +- systems/palatine-hill/configuration.nix | 4 +- systems/palatine-hill/postgresql.nix | 3 +- users/alice/home/git.nix | 32 ++--- users/alice/non-server.nix | 2 +- 7 files changed, 120 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index 570bf65..9c597e2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1760884519, - "narHash": "sha256-pVXPc7SZ7/rUzI+ULimgY3heq05EZND5YSREnyx6nrI=", + "lastModified": 1765080359, + "narHash": "sha256-BvAgmqgswcokD2eWoyO3uB1k1VTdpxDHGSx0RYRFjDg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "60f04fa045bbe3bf05b2d9504e028c2ab5dd0824", + "rev": "35f8ab2ecd954b3a348aa0e253878211c48a0aa7", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -146,11 +146,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -219,18 +219,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -240,11 +242,11 @@ ] }, "locked": { - "lastModified": 1761005073, - "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -257,16 +259,14 @@ "inputs": { "nix": "nix", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761009616, - "narHash": "sha256-blolC1JpQXyEC+DAHnCWrWi6WItO3dCm3/6XnZa6Pgs=", + "lastModified": 1764967565, + "narHash": "sha256-abU6ikAK96VFhqkyBBMpoCQedyVbXSObn5aPq+s/wr0=", "ref": "add-gitea-pulls", - "rev": "9ebc15e7093539939616981962da0c072847d7ce", - "revCount": 4446, + "rev": "7123dd8981bc1dfadbea009441c5e7d3ad770578", + "revCount": 4450, "type": "git", "url": "https://nayeonie.com/ahuston-0/hydra" }, @@ -283,11 +283,11 @@ ] }, "locked": { - "lastModified": 1759613406, - "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=", + "lastModified": 1765113580, + "narHash": "sha256-b8YOwGDFprkQJjXsKGuSNS1pWe8w4cUW36YxlUelNpU=", "owner": "hyprwm", "repo": "contrib", - "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a", + "rev": "db18f83bebbc2cf43a21dbb26cd99aabe672d923", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1760846226, - "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", + "lastModified": 1765080594, + "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", + "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1760876488, - "narHash": "sha256-pPLANFUvT7Zr9B0o0A81MZhQleRH88vrpKRNdYDcwPs=", + "lastModified": 1764726320, + "narHash": "sha256-0AD/V/uCDG15xZSkQayaKjn/4Rlvoilwa+PsoSaubco=", "owner": "NuschtOS", "repo": "nixos-modules", - "rev": "ba7c3ebea905f01814d2e27a6fe824e1ee1506ee", + "rev": "1e03233c1b662f91c5ff8c7dba1a0a693a930e51", "type": "github" }, "original": { @@ -455,27 +455,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", - "owner": "nixos", + "lastModified": 1765053261, + "narHash": "sha256-CBVtkpfM7pMgXuXvByXn53p5lSm7fiDZK4EGOMnhaoo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "60a511057b110094129bdfb99f343548b59f0aba", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -500,6 +500,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -512,11 +528,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -536,11 +552,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -563,7 +579,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-modules": "nixos-modules", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": "rust-overlay", @@ -580,11 +596,11 @@ ] }, "locked": { - "lastModified": 1760927964, - "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -600,11 +616,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1765079830, + "narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "aeb517262102f13683d7a191c7e496b34df8d24c", "type": "github" }, "original": { @@ -634,11 +650,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1765047449, + "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "owner": "danth", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "type": "github" }, "original": { @@ -713,11 +729,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -729,11 +745,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -745,11 +761,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4cffae7..feebc9a 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,7 @@ hydra = { url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls"; inputs = { - nixpkgs.follows = "nixpkgs"; + #nixpkgs.follows = "nixpkgs"; }; }; @@ -170,7 +170,7 @@ rec { inherit lib; # for allowing use of custom functions in nix repl - hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; }; + #hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; }; formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); nixosConfigurations = genSystems inputs outputs src (src + "/systems"); diff --git a/modules/nix.nix b/modules/nix.nix index 5800a05..8d22b67 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { nix = { - package = pkgs.nixVersions.latest; + #package = pkgs.nixVersions.latest; diffSystem = true; settings = { experimental-features = [ diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index 5cf4a9b..c41c3e8 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -49,8 +49,8 @@ enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau + intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + libva-vdpau-driver libvdpau-va-gl intel-compute-runtime vpl-gpu-rt # replaces intel-media-sdk diff --git a/systems/palatine-hill/postgresql.nix b/systems/palatine-hill/postgresql.nix index 1c3f0f7..aed5901 100644 --- a/systems/palatine-hill/postgresql.nix +++ b/systems/palatine-hill/postgresql.nix @@ -20,7 +20,8 @@ in enableJIT = true; package = pkgs.postgresql_16; configurePgStatStatements = true; - enableAllPreloadedLibraries = true; + #enableAllPreloadedLibraries = true; + installAllAvailableExtensions = true; #preloadAllExtensions = true; identMap = '' # ArbitraryMapName systemUser DBUser diff --git a/users/alice/home/git.nix b/users/alice/home/git.nix index 4f79be1..cb4a4c8 100644 --- a/users/alice/home/git.nix +++ b/users/alice/home/git.nix @@ -8,22 +8,7 @@ key = "5EFFB75F7C9B74EAA5C4637547940175096C1330"; signByDefault = true; }; - userEmail = "aliceghuston@gmail.com"; - userName = "ahuston-0"; - aliases = { - gone = '' - !git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches - awk 'NF < 2 {print $1}' | # get nuked branches - grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash - sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons - xargs -r git branch -D # nuke the branches - # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches - # awk '$2 == "[gone]" {print $1}' | # get nuked branches - # sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons - # xargs -r git branch -D; # nuke the branches # - ''; - }; - extraConfig = { + settings = { push.autosetupremote = true; pull.rebase = true; color.ui = true; @@ -31,6 +16,21 @@ format.signoff = true; pack.windowMemory = "2g"; pack.packSizeLimit = "1g"; + user.email = "aliceghuston@gmail.com"; + user.name = "ahuston-0"; + alias = { + gone = '' + !git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches + awk 'NF < 2 {print $1}' | # get nuked branches + grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash + sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons + xargs -r git branch -D # nuke the branches + # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches + # awk '$2 == "[gone]" {print $1}' | # get nuked branches + # sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons + # xargs -r git branch -D; # nuke the branches # + ''; + }; }; }; } diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix index 5e23e8e..e0ed056 100644 --- a/users/alice/non-server.nix +++ b/users/alice/non-server.nix @@ -83,7 +83,7 @@ rust-analyzer clang clang-tools - wakatime + wakatime-cli enchant nuspell hunspellDicts.en-us