diff --git a/config/xonsh/aliases.py b/config/xonsh/aliases.py index c6f07b5..eac8bb3 100644 --- a/config/xonsh/aliases.py +++ b/config/xonsh/aliases.py @@ -147,6 +147,8 @@ alias_dictionary = { "cat": "bat", "git": "hub", + "cc": "fj --host=https://www.coastalcommits.com --style=fancy", + "cb": "fj --host=https://codeberg.org --style=fancy", "l": "eza -lhg --time-style=long-iso --icons=auto --hyperlink", "la": "eza -lAh --time-style=long-iso --icons=auto --hyperlink", diff --git a/flake.lock b/flake.lock index adbccae..9c75848 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1738213515, - "narHash": "sha256-0cYr91WBMCmlPCKxZrH8habV9tkAA1SkeKPnI+A76WU=", + "lastModified": 1738343111, + "narHash": "sha256-y9st4Y0p5ry+6QdlIGeqxAA6rbEIOO1uXdAc5jxV2Bc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "ddbaf00ce2a74478278aa17459dda5c5893d998d", + "rev": "51b9cce097da369550f45ac07879274dc8be81e4", "type": "github" }, "original": { @@ -285,7 +285,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -303,7 +303,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -319,6 +319,25 @@ "type": "github" } }, + "forgejo-cli": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "utils": "utils" + }, + "locked": { + "lastModified": 1734534828, + "narHash": "sha256-TrCoO37Rjf7ToBq1R8O7mz2J6HgY6F42S93yxc2hEu0=", + "ref": "refs/heads/main", + "rev": "a58080e87240fde7f2783432022cbc751fb2d624", + "revCount": 313, + "type": "git", + "url": "https://codeberg.org/Cyborus/forgejo-cli" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/Cyborus/forgejo-cli" + } + }, "gauntlet": { "inputs": { "crane": "crane", @@ -327,20 +346,20 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1735207841, - "narHash": "sha256-m/TOVOqnlfHWg+jXLSNFW5cJC3Hf6I7mk7W1WH1viuI=", + "lastModified": 1738189623, + "narHash": "sha256-ndk7FY3m5VEukLcqcCCFiUnyN1HkLLTaZKI1MEXrohk=", "owner": "project-gauntlet", "repo": "gauntlet", - "rev": "11af8eaff2416c94b70705e5db17369feb307b7a", + "rev": "792baa7e6aa6262416d18babda2ef81eb3cd3f30", "type": "github" }, "original": { "owner": "project-gauntlet", "repo": "gauntlet", - "rev": "11af8eaff2416c94b70705e5db17369feb307b7a", + "rev": "792baa7e6aa6262416d18babda2ef81eb3cd3f30", "type": "github" } }, @@ -421,11 +440,11 @@ ] }, "locked": { - "lastModified": 1738257949, - "narHash": "sha256-Q/xbvWHqCNcw+nDXgRaKH31fggZiA0Ciqs0t1H28fL8=", + "lastModified": 1738275749, + "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a457746847c9cb3a1e46e5bc86b205fbadf5da8", + "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "type": "github" }, "original": { @@ -443,11 +462,11 @@ ] }, "locked": { - "lastModified": 1738228963, - "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", + "lastModified": 1738275749, + "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", + "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "type": "github" }, "original": { @@ -518,11 +537,11 @@ ] }, "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", + "lastModified": 1738277753, + "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", + "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "type": "github" }, "original": { @@ -593,14 +612,14 @@ "inputs": { "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1738201509, - "narHash": "sha256-gyKBLziqn47BqpELlorHxlQTQxBS2GFQah2KNqh8Uzg=", + "lastModified": 1738287944, + "narHash": "sha256-q8pOnhaA95ZZf+CJ4ahScSzt5pbnL7lShFuMwTwiw7I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1b54a1707f1388b457792736b9903980ab26afaf", + "rev": "529e0a84346f34db86ea24203c0b2e975fefb4f2", "type": "github" }, "original": { @@ -639,11 +658,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738023785, - "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { @@ -686,6 +705,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1723151389, + "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1713805509, "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", @@ -701,7 +736,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1738142207, "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", @@ -732,11 +767,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738255431, - "narHash": "sha256-n0NCyg7JYGl7AcfDkYpB7RwtUGSxnX6WCqLqjaGMFU0=", + "lastModified": 1738366771, + "narHash": "sha256-nyEBrP5t1g4vmy7YBkiGaIu19eG8zV3T4IQLQbJsVU8=", "owner": "nix-community", "repo": "nixvim", - "rev": "e4ed227f99be42cd0ce28b6ae0c85c306ef70d40", + "rev": "c75e4ea37f25ec98aa6f2035e03e748e7369662c", "type": "github" }, "original": { @@ -754,11 +789,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738256454, - "narHash": "sha256-vxU2VrAsmQ6XD6pOwIV63Yx7HXsliCybyrLG0D0XmB4=", + "lastModified": 1738362438, + "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", "owner": "nix-community", "repo": "NUR", - "rev": "5caeb6744cd9a201a82908f6deafac63b7ef234e", + "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", "type": "github" }, "original": { @@ -867,13 +902,14 @@ "catppuccin-vsc": "catppuccin-vsc", "compose2nix": "compose2nix", "cosmic": "cosmic", + "forgejo-cli": "forgejo-cli", "gauntlet": "gauntlet", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nur": "nur", "plasma-manager": "plasma-manager", @@ -910,11 +946,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1738291974, + "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", "type": "github" }, "original": { @@ -941,11 +977,11 @@ }, "staging-next": { "locked": { - "lastModified": 1738245746, - "narHash": "sha256-etDp3EzvIzSdYCI4tybEAP9IGw7uVgkOaHRLqPeXCrM=", + "lastModified": 1738368923, + "narHash": "sha256-mzDpk6rf/9DKbaKgL2hPgETtEtPPnUPABJ54SGXsXTE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97fc6f36d0a5c2e03b89dc98b0ed86d6953da172", + "rev": "c27f09976fd7f57a856ba24b5581d0563f6ac519", "type": "github" }, "original": { @@ -1000,6 +1036,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1041,6 +1092,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a120d82..3d9160a 100644 --- a/flake.nix +++ b/flake.nix @@ -41,8 +41,9 @@ }; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; + forgejo-cli.url = "git+https://codeberg.org/Cyborus/forgejo-cli"; gauntlet = { - url = "github:/project-gauntlet/gauntlet/11af8eaff2416c94b70705e5db17369feb307b7a"; # v12 + url = "github:/project-gauntlet/gauntlet/792baa7e6aa6262416d18babda2ef81eb3cd3f30"; # main, 1/31/2025 inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/nixos/pkg.nix b/nixos/pkg.nix index d07dad1..aa54bc7 100644 --- a/nixos/pkg.nix +++ b/nixos/pkg.nix @@ -67,7 +67,10 @@ let python311Packages.python-lsp-server python311Packages.rich ]; - flakePackages = with inputs; [ compose2nix.packages.${system}.default ]; + flakePackages = with inputs; [ + compose2nix.packages.${system}.default + forgejo-cli.packages.${system}.default + ]; in { environment.systemPackages = lib.lists.unique (packages ++ flakePackages);