From dbe87c7babebd6899f6be93e23e2cf0f5fa09b91 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 17 Nov 2025 23:54:36 +0100 Subject: [PATCH] git: update paths for projects --- flake.lock | 138 +++++++++++++++---------------- modules/base/fish.nix | 2 +- modules/base/git.nix | 2 +- modules/dev/gh.nix | 29 +++---- modules/users/cholli/default.nix | 15 +++- 5 files changed, 97 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index a733d47..f39d2c9 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1762791812, - "narHash": "sha256-O7Ne62r8hKE3FPqUsukMblxyYCFTh2jV5gHgIsI3rnE=", + "lastModified": 1762889687, + "narHash": "sha256-oKvHfeYDZ0LfuHSaFLA0w/dfZ9R6C5W8pCGUjUWawGI=", "owner": "cachix", "repo": "devenv", - "rev": "1faab0d28c573f2a8dba2cf457b9d383adba252a", + "rev": "3b4fb549962342c928aae1bbea3a13f0eeed2703", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1762757174, - "narHash": "sha256-i2CZAiJNQsC7Wwk8fUZHS130W8HHLbmYqgT6ErYp5Zw=", + "lastModified": 1763016383, + "narHash": "sha256-eYmo7FNvm3q08iROzwIi8i9dWuUbJJl3uLR3OLnSmdI=", "owner": "nix-community", "repo": "fenix", - "rev": "9ada5aa8ebd5062c8c399ae59c3f77f266216a24", + "rev": "0fad5c0e5c531358e7174cd666af4608f08bc3ba", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762810396, - "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -350,11 +350,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763032142, + "narHash": "sha256-M+2QBQoC0lzkCdUQRXylR2RkcT6BCRfW3KDs+c/IGLw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "84255025dee4c8701a99fbff65ac3c9095952f99", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762716787, - "narHash": "sha256-YfcY28igFL5ZPCTtVBaVUvnhcWg8tyiBVSlULpXEIeQ=", + "lastModified": 1762973522, + "narHash": "sha256-CFyvvZvKDkTFF7niIQp5hhks5OR1u10H3e89chURCkg=", "owner": "helix-editor", "repo": "helix", - "rev": "a79292b630ae4a0e6e37814ad21411ab50926c73", + "rev": "948ac05aa0db64e0e5d00710db36eb244076e988", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1762787259, - "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -701,11 +701,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1762755326, - "narHash": "sha256-YYTzQUQDnVdtN3k40sC5kq6yL70riU8bM8cQLz38jzk=", + "lastModified": 1762992484, + "narHash": "sha256-KsMb0niSk2zxZcSWjIkgcDIGwoKZXDYXdw9lVKdgga8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b1d690676589503f0addece30e936a240733699", + "rev": "64ee8f8a72d62069a6bef45ca05bef1d0d412e1f", "type": "github" }, "original": { @@ -777,11 +777,11 @@ ] }, "locked": { - "lastModified": 1762115485, - "narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=", + "lastModified": 1762989208, + "narHash": "sha256-NBTbKW0MVIMFCjAqeoJWkg5iUucAZ9jS4Lbyax6rIBE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c", + "rev": "befb2670803cf7c1b9f0323449c8d9ccdaa485e2", "type": "github" }, "original": { @@ -1072,11 +1072,11 @@ ] }, "locked": { - "lastModified": 1762341531, - "narHash": "sha256-wlWo/A1lOkzvo6PHMnVMKiXuv+dyX1UBCjFpJJ6tNiY=", + "lastModified": 1762969037, + "narHash": "sha256-TUZRnrg5ZRGx0VNS+YY2OT0AS5i6+jGHUXqJEHepe20=", "owner": "nix-community", "repo": "nh", - "rev": "6c77c9371ed92ac1f93d2b7eaf9fb86ad3433bae", + "rev": "c81b763f6bb5c22d77617150ea96606cd6ddcd5e", "type": "github" }, "original": { @@ -1093,11 +1093,11 @@ "rust-overlay": [] }, "locked": { - "lastModified": 1762804232, - "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", + "lastModified": 1763014447, + "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", "owner": "YaLTeR", "repo": "niri", - "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", + "rev": "a52df533c4694b5ed0a04140af60fd26146df911", "type": "github" }, "original": { @@ -1120,11 +1120,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762810134, - "narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=", + "lastModified": 1763030490, + "narHash": "sha256-U1xBvM3vbh7GZyc2ahziMVhi4qQyQ8pRwb9l8jD4ShI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b", + "rev": "7920a7b0553e0bebce825b0d9deb575e26f6f6ac", "type": "github" }, "original": { @@ -1136,11 +1136,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762804232, - "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", + "lastModified": 1763014447, + "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", "owner": "YaLTeR", "repo": "niri", - "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", + "rev": "a52df533c4694b5ed0a04140af60fd26146df911", "type": "github" }, "original": { @@ -1197,11 +1197,11 @@ ] }, "locked": { - "lastModified": 1762740007, - "narHash": "sha256-CtMgV9vfm16x/0NBQmQQe/Vbv423cPWeNfBtiVYcUBk=", + "lastModified": 1762999310, + "narHash": "sha256-G1GAqeJPD3ILR2ahmU++r1RscTTpjba/uURYITi6x5c=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "8dce0b23e30b03efbdc94e8db7cb27298446e4cc", + "rev": "4e7b35681a36b19f8dd40b15993869a479da17e4", "type": "github" }, "original": { @@ -1232,11 +1232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -1253,11 +1253,11 @@ ] }, "locked": { - "lastModified": 1762251193, - "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=", + "lastModified": 1762908663, + "narHash": "sha256-HqdYfzBaidYX+EYAcXDFCggXJPZBv2fusMwhc7/4+cI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "e001844d4553aef268f97b32d3a825b6370eed91", + "rev": "debc562c48c445f9f08778ecb9fc6b35197623ad", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1762815089, - "narHash": "sha256-s4bnfnNMsKvbV4Jk5YCSks690q+MCsjmGjekqXHJsg8=", + "lastModified": 1763036381, + "narHash": "sha256-BmcyaNCmvT+3LzHjIA463YJGa0/XSjys8WHPPShi9pQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d119b962754c8bcaf782aee7e83306d44e42c954", + "rev": "b58839b04498171c0d143d72dd72f79f9012fe9a", "type": "github" }, "original": { @@ -1362,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -1394,11 +1394,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -1533,11 +1533,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1762722525, - "narHash": "sha256-cM1u88yehAW7S4Y4t7+fDHwmtXSOZUh24ELmAtYH37c=", + "lastModified": 1762860488, + "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "21f8445ea523e83cd4f11b0a67a3a5ced2b1f56f", + "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", "type": "github" }, "original": { @@ -1594,11 +1594,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1762812535, - "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=", + "lastModified": 1763023272, + "narHash": "sha256-TCVNCn/GcKhwm+WlSJEZEPW4ISQdU9ICIU3lTiOLBYc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7", + "rev": "b80c966e70fa0615352c9596315678df1de75801", "type": "github" }, "original": { @@ -1672,11 +1672,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1762410071, - "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97a30861b13c3731a84e09405414398fbf3e109f", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { @@ -1765,11 +1765,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1762748864, - "narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=", + "lastModified": 1763007974, + "narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3", + "rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52", "type": "github" }, "original": { @@ -1787,11 +1787,11 @@ ] }, "locked": { - "lastModified": 1762735003, - "narHash": "sha256-F5mQBMc1fNZnyVzBWTB6RsSglWwpTTBekHxzPeGegD4=", + "lastModified": 1762907712, + "narHash": "sha256-VNW/+VYIg6N4b9Iq+F0YZmm22n74IdFS7hsPLblWuOY=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "b4dc0184e0cff5094d4a746a5cd34ef30f6fdc12", + "rev": "d16453ee78765e49527c56d23386cead799b6b53", "type": "github" }, "original": { diff --git a/modules/base/fish.nix b/modules/base/fish.nix index 07424dc..f4a91c6 100644 --- a/modules/base/fish.nix +++ b/modules/base/fish.nix @@ -52,7 +52,7 @@ checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)"; deployNixberry = "nixos-rebuild switch --flake .#nixberry --target-host nixberry --sudo --ask-sudo-password"; deployLoptland = "nixos-rebuild switch --flake .#loptland --target-host christophhollizeck.dev --sudo --ask-sudo-password"; - checkPR = ''cd /home/cholli/projects/nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --systems "x86_64-linux aarch64-linux"''; + checkPR = ''cd /home/cholli/projects/NixOS/nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --systems "x86_64-linux aarch64-linux"''; }; plugins = with pkgs.fishPlugins; [ { diff --git a/modules/base/git.nix b/modules/base/git.nix index f6f35ed..81d165f 100644 --- a/modules/base/git.nix +++ b/modules/base/git.nix @@ -56,7 +56,7 @@ topLevel: { }; maintenance = { repo = [ - "/home/${username}/projects/nixpkgs" + "/home/${username}/projects/NixOS/nixpkgs" "/home/${username}/projects/config" ]; strategy = "incremental"; diff --git a/modules/dev/gh.nix b/modules/dev/gh.nix index a6dcb1e..f1bd6a1 100644 --- a/modules/dev/gh.nix +++ b/modules/dev/gh.nix @@ -8,22 +8,6 @@ enable = true; settings = { prSections = [ - { - title = "To review"; - filters = "repo:NixOS/nixpkgs is:open draft:false status:success"; - } - { - title = "1st contribution"; - filters = ''repo:NixOS/nixpkgs is:open draft:false label:"12. first-time contribution"''; - } - { - title = "1st approval"; - filters = ''repo:NixOS/nixpkgs is:open draft:false status:success label:"12.approvals: 1"''; - } - { - title = "From r-ryantm only"; - filters = ''repo:NixOS/nixpkgs is:open draft:false status:success base:master -label:"1.severity: mass-rebuild" -label:"1.severity: mass-darwin-rebuild" author:r-ryantm''; - } { title = "My PRs"; filters = "is:open author:@me"; @@ -32,6 +16,14 @@ title = "Needs my review"; filters = "is:open review-requested:@me"; } + { + title = "To review"; + filters = "repo:NixOS/nixpkgs is:open draft:false status:success"; + } + { + title = "1st contribution"; + filters = ''repo:NixOS/nixpkgs is:open draft:false label:"12. first-time contribution"''; + } { title = "Involved"; filters = "is:open involves:@me -author:@me"; @@ -47,6 +39,11 @@ }; refetchIntervalMinutes = 10; }; + repoPaths = { + "NixOS/*" = "~/projects/NixOS/*"; + "nix-community/*" = "~/projects/nix-community/*"; + "sodiboo/niri-flake" = "~/projects/niri/niri-flake/"; + }; theme.ui.table.showSeparator = false; }; }; diff --git a/modules/users/cholli/default.nix b/modules/users/cholli/default.nix index e6abbf2..323184b 100644 --- a/modules/users/cholli/default.nix +++ b/modules/users/cholli/default.nix @@ -50,7 +50,12 @@ }; homeManager.cholli = - { pkgs, ... }: + { + lib, + osConfig, + pkgs, + ... + }: let defaultIconFileName = "profile.png"; in @@ -63,9 +68,15 @@ "Music/.keep".text = ""; "Pictures/.keep".text = ""; "Videos/.keep".text = ""; - "projects/.keep".text = ""; ".face".source = ./${defaultIconFileName}; "Pictures/${defaultIconFileName}".source = ./${defaultIconFileName}; + } + // lib.optionalAttrs (osConfig.networking.hostName == "yggdrasil") { + # Some Paths for my main machine + "projects/NixOS/.keep".text = ""; + "projects/nix-community/.keep".text = ""; + "projects/niri/.keep".text = ""; + "work/.keep".text = ""; }; packages = with pkgs; [ graphviz ];