diff --git a/flake.lock b/flake.lock index 4af4b86..4f172f2 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1747037349, - "narHash": "sha256-713+WCKwPBC5rsW+/8emVRDNlU0tKXJR03ahDGOfM30=", + "lastModified": 1747498222, + "narHash": "sha256-yCu9iBrUTzFxWyYOsUo0hXkKYO/mHvcKjcub/7MhKXM=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "042c12af41ecb32dd05b3b4911224c43980b49e9", + "rev": "ed2c3b8b80fababa7ad018850d3e5008f35168f2", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1747274630, + "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", "type": "github" }, "original": { @@ -267,28 +267,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -352,11 +330,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1746999930, - "narHash": "sha256-Y2sj7S8bmqTaUB5dIfOvg08MVxf+IujS0GssRXbGfpE=", + "lastModified": 1747426608, + "narHash": "sha256-ygRFvCVdVEAU95tH2EMMacYH/T42tC3mtDkt5lBJT9U=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "0eebebb75e6c5db9ab7947508ee0d8346d628339", + "rev": "b1af4a597f359491f4b3197a845b39ec86db475a", "type": "github" }, "original": { @@ -438,11 +416,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747056424, - "narHash": "sha256-hemqYn6ivGLGn1fC32/rK3xyby63lTNrG5/IK3vX5Xs=", + "lastModified": 1747493001, + "narHash": "sha256-neFgj702FumseozJ8ny/MDaqKd9PE+hteM7TqkoxRvM=", "owner": "helix-editor", "repo": "helix", - "rev": "47547e94ad89cda4dbab15b57abcf4981d101b85", + "rev": "ebf96bd4692dfa02c6318b15b11f8a7bc127e7ca", "type": "github" }, "original": { @@ -459,11 +437,11 @@ ] }, "locked": { - "lastModified": 1747021744, - "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", + "lastModified": 1747439237, + "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", + "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", "type": "github" }, "original": { @@ -483,11 +461,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1747057235, - "narHash": "sha256-PT7HKest+t1eNRem79d3Ypvgn/dkwppjooZNOOs+tmg=", + "lastModified": 1747496697, + "narHash": "sha256-444zLVDy5OTnZGmgJG/7Sq8xegcEhg0qnIKLx2jevwE=", "owner": "jj-vcs", "repo": "jj", - "rev": "9d1f799a8a554c15d3c986741f5bb0a718971bea", + "rev": "53619359e29160a6708b70eaa4689a4a226c0776", "type": "github" }, "original": { @@ -548,11 +526,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747055269, - "narHash": "sha256-c1NBnpBj7PpcW4Pz4niMqVl2UgsPwOt7xF15cSyNVpE=", + "lastModified": 1747491150, + "narHash": "sha256-UpHzUfmxpKko/4f/Nw971wfw+0EgHEJHkoJ3mGQKDkg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dde1f313e068a7171b685fdf4ef399f10343037c", + "rev": "ea61079b4d48031087c0c994782c24c846d4b95e", "type": "github" }, "original": { @@ -581,11 +559,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747048431, - "narHash": "sha256-JdvI6LBy7RSyTsIauqMZcxWQxyD+EKL2FQ3pymMvc1k=", + "lastModified": 1747486745, + "narHash": "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI=", "owner": "YaLTeR", "repo": "niri", - "rev": "defd4c5c4db8b22b2a5db468c0618c37b30e95dd", + "rev": "ae89cb6017668f3a81ccd92461cbbc70ab8377d0", "type": "github" }, "original": { @@ -602,11 +580,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1747048878, - "narHash": "sha256-YSGK+etuuFrMo0PSMWdiIHSuEDybrgCIuyOq0V7Hmt8=", + "lastModified": 1747491978, + "narHash": "sha256-Jn7um1fnf2bI9N8gvG5jIHvIJxxLaXd+2+wHXyW0Frs=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "f430a256db90c7d6035f2d738e2e8acd5c633f16", + "rev": "2a7be063557ffc19ab1d8ab18bfd1721df8355c5", "type": "github" }, "original": { @@ -617,11 +595,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -633,11 +611,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { @@ -680,11 +658,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "type": "github" }, "original": { @@ -696,11 +674,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "type": "github" }, "original": { @@ -712,11 +690,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { @@ -728,7 +706,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -752,11 +733,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1747022610, - "narHash": "sha256-d6SvA0gTHDrOqt4tZRVD0Gm5G4w6jAFJ6lis79PjSPw=", + "lastModified": 1747454607, + "narHash": "sha256-E6Z01BGqHtjIKktUtkX7SDET8KRkzM57smUuHnmulYY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d4b3ffe3e719e42b175ccdef13598516f0a8025d", + "rev": "b4e226b3485a9c3c6f224393975400b38d1e7b67", "type": "gitlab" }, "original": { @@ -839,11 +820,11 @@ ] }, "locked": { - "lastModified": 1747017456, - "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", + "lastModified": 1747449297, + "narHash": "sha256-veyXchTz6eWwvuW5X49UluHkheHkFcqHJSwGuKBhrmQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5b07506ae89b025b14de91f697eba23b48654c52", + "rev": "f44db7d7cea4528288780c6347756173a8248225", "type": "github" }, "original": { @@ -880,8 +861,8 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_4", - "flake-utils": [ - "flake-utils" + "flake-parts": [ + "flake-parts" ], "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -900,11 +881,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747005453, - "narHash": "sha256-78PfIpo3jCuX7pT3k4DkEES+KEy7pnrFGugsQ2w652o=", + "lastModified": 1747441332, + "narHash": "sha256-On+cwR/dMW9s+YWsYifIaRs18nNyK5HVFJav6HsRrU8=", "owner": "danth", "repo": "stylix", - "rev": "6b8309550e50358b63366d9bf3edb7ef08b9a7cc", + "rev": "101d23dfacbb2704c40639ae9b6ac1d41de7143a", "type": "github" }, "original": { @@ -1067,11 +1048,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1746978389, - "narHash": "sha256-X2iAGQm5pheZ4VRnGCik4laxB6hyJh1i5cexGyis3oo=", + "lastModified": 1747111562, + "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "51300780f84cb61d04a3c469099c758461b2a816", + "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 51106b0..f669447 100644 --- a/flake.nix +++ b/flake.nix @@ -120,7 +120,7 @@ repo = "stylix"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; + flake-parts.follows = "flake-parts"; home-manager.follows = "home-manager"; }; }; diff --git a/home/modules/programs/jujutsu.nix b/home/modules/programs/jujutsu.nix index 939ee2c..4c046e5 100644 --- a/home/modules/programs/jujutsu.nix +++ b/home/modules/programs/jujutsu.nix @@ -62,8 +62,9 @@ in { show-cryptographic-signatures = true; pager = "delta"; diff = { - tool = "delta"; - format = "git"; + color-words = { + conflict = "pair"; + }; }; default-command = "log"; }; diff --git a/nixos/modules/programs/radicle.nix b/nixos/modules/programs/radicle.nix index d652cc2..120a0ef 100644 --- a/nixos/modules/programs/radicle.nix +++ b/nixos/modules/programs/radicle.nix @@ -37,6 +37,9 @@ in { "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776" ]; web = { + bannerUrl = "https://radicle.${config.youthlic.programs.caddy.baseDomain}/images/youthlic-seed-header.png"; + avatarUrl = "https://radicle.${config.youthlic.programs.caddy.baseDomain}/images/youthlic-seed-avatar.jpg"; + description = "Private Seed Server."; pinned = { repositories = [ "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5" diff --git a/pkgs/default.nix b/pkgs/default.nix index 32e3c0a..2c8199c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,7 @@ in rime-ice = callPackage ./rime-ice.nix {}; dioxionary = callPackage ./dioxionary.nix {}; spotifyx = callPackage ./spotifyx.nix {}; - radicle-explorer = callPackage ./radicle-explorer.nix {}; + radicle-explorer = callPackage ./radicle-explorer {}; noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; diff --git a/pkgs/radicle-explorer.nix b/pkgs/radicle-explorer/default.nix similarity index 58% rename from pkgs/radicle-explorer.nix rename to pkgs/radicle-explorer/default.nix index 27ef720..edca0fa 100644 --- a/pkgs/radicle-explorer.nix +++ b/pkgs/radicle-explorer/default.nix @@ -1,5 +1,5 @@ {pkgs, ...}: -pkgs.radicle-explorer.withConfig { +(pkgs.radicle-explorer.withConfig { preferredSeeds = [ { hostname = "seed.youthlic.fun"; @@ -22,4 +22,11 @@ pkgs.radicle-explorer.withConfig { scheme = "https"; } ]; -} +}).overrideAttrs (prev: { + postInstall = + (prev.postInstall or "") + + '' + ln -s ${./youthlic-seed-header.png} $out/images/youthlic-seed-header.png + ln -s ${./youthlic-seed-avatar.jpg} $out/images/youthlic-seed-avatar.jpg + ''; +}) diff --git a/pkgs/radicle-explorer/youthlic-seed-avatar.jpg b/pkgs/radicle-explorer/youthlic-seed-avatar.jpg new file mode 100644 index 0000000..d6a026f Binary files /dev/null and b/pkgs/radicle-explorer/youthlic-seed-avatar.jpg differ diff --git a/pkgs/radicle-explorer/youthlic-seed-header.png b/pkgs/radicle-explorer/youthlic-seed-header.png new file mode 100644 index 0000000..f0ccdec Binary files /dev/null and b/pkgs/radicle-explorer/youthlic-seed-header.png differ