Compare commits

..

No commits in common. "cf2fb321958d624eb813907f35f85201c3c82025" and "1be48af602f3ba5d36acca02ea773ee0ef0a779f" have entirely different histories.

7 changed files with 48 additions and 128 deletions

View file

@ -1,6 +1,5 @@
zipline: ENC[AES256_GCM,data:oz+3ZOVaIUF+b/pkWgEQnfcSKgoTOUdxN76ggaMxaVPag/1AwizhzWaHxTHPcu2MEL/cWdtr9+7egXjkF/9dZKxucmUJBXUp9KSoBQAd/xaDOts/sLJKdEqF7dG7UfxgL4P6tiUyRpr0XIspyDXB8w9o0orrT2VoIUJQpTSrclAqqOF7p3bRktl5IDOfZZKqkT7eSepFHRs6bXbTLHyDehAWhy+GDpWY23p3rqj5CWGXhO6poPH9kLgKA0v5hNCVrKgdfgj4yiSuNo8RBJ9RTumrDvsFQs+8sCLK+gVSAkuIqd3Df+XjuGqT3R1/xmL/yWz5/6NDhAvACvPbmnHfan07xJKbfJAZk7KqSalxxn7r0XuGfKbdkC4=,iv:Z2POj0P4VXmZZPom5TqdXu6W8IKEIgSCf/6KSwQhTm4=,tag:ue77bVCS7GDI2Z4oq+GXwQ==,type:str] zipline: ENC[AES256_GCM,data:oz+3ZOVaIUF+b/pkWgEQnfcSKgoTOUdxN76ggaMxaVPag/1AwizhzWaHxTHPcu2MEL/cWdtr9+7egXjkF/9dZKxucmUJBXUp9KSoBQAd/xaDOts/sLJKdEqF7dG7UfxgL4P6tiUyRpr0XIspyDXB8w9o0orrT2VoIUJQpTSrclAqqOF7p3bRktl5IDOfZZKqkT7eSepFHRs6bXbTLHyDehAWhy+GDpWY23p3rqj5CWGXhO6poPH9kLgKA0v5hNCVrKgdfgj4yiSuNo8RBJ9RTumrDvsFQs+8sCLK+gVSAkuIqd3Df+XjuGqT3R1/xmL/yWz5/6NDhAvACvPbmnHfan07xJKbfJAZk7KqSalxxn7r0XuGfKbdkC4=,iv:Z2POj0P4VXmZZPom5TqdXu6W8IKEIgSCf/6KSwQhTm4=,tag:ue77bVCS7GDI2Z4oq+GXwQ==,type:str]
coastalcommits: ENC[AES256_GCM,data:a3raKZsPs8AMxFnt17ckUlsjNykWUmd9vDC60D4bdxIOWHSBn2BziQ==,iv:nnUZLy+jkUkHM9RcUZSdz5xNWPwBEGOUhlHZC6PqLAs=,tag:luOBlOcXrOJijYxOhmR8LA==,type:str] coastalcommits: ENC[AES256_GCM,data:VVpY/T93GUf7eeGrfCtpeujrY27CTBbpquGlZo6m9a20Tiy32hwiAw==,iv:R2rQUF4MbA/n6z9Vd9LpTPM2y8dFL726IXErprpQqOc=,tag:N5duDIWbHHVVAWidzF3dpw==,type:str]
codeberg: ENC[AES256_GCM,data:Rny42N6K3VvzGDgqambLEclzznJpm6lRQVKha4U8M7rWg2HHgZqKHQ==,iv:YQ80nWm4z7wt7/jyWO7FjAa7zeDhkOWn6CLJYUNJ0tQ=,tag:4TZAfd5NUHB6Y32oH5CbSA==,type:str]
users: users:
cswimr: cswimr:
password: ENC[AES256_GCM,data:KPB3C8z1vBB6M6hcuLQyIzoID23v/syTui3eFfrVKwzDwL4X7BdYbnYfuJSXedce+KHmvZv+AE6w3PTD9c7CPpLUlUQmteAY6w==,iv:a393VckzNy+vRqb9vDr9QRBQe27bHOUJR3JwrHAP5g4=,tag:UDl+3dWV+GrJ7Wva3y9VsQ==,type:str] password: ENC[AES256_GCM,data:KPB3C8z1vBB6M6hcuLQyIzoID23v/syTui3eFfrVKwzDwL4X7BdYbnYfuJSXedce+KHmvZv+AE6w3PTD9c7CPpLUlUQmteAY6w==,iv:a393VckzNy+vRqb9vDr9QRBQe27bHOUJR3JwrHAP5g4=,tag:UDl+3dWV+GrJ7Wva3y9VsQ==,type:str]
@ -28,8 +27,8 @@ sops:
b1JvNi9YODZPN1FObWpOVHN3aU85NFEK1dN5pV8g3nG3D2l482z1JCRzmJ/9m495 b1JvNi9YODZPN1FObWpOVHN3aU85NFEK1dN5pV8g3nG3D2l482z1JCRzmJ/9m495
YEobjXbEqQDhvA47ueWojoMjvQ3CgrPyiL6v+DLj7VfI5cyuo+89IQ== YEobjXbEqQDhvA47ueWojoMjvQ3CgrPyiL6v+DLj7VfI5cyuo+89IQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-01-30T20:20:54Z" lastmodified: "2025-01-22T13:13:52Z"
mac: ENC[AES256_GCM,data:fOHHQ8mZ1QAV2Q5fKig2DQ87wTLVdssyxmGrHVtP9Bkt42cIcZ0XfNOrUkOZWFs8xLP37zDgGSQck6BMsDExN5Lh00QMWAEVpZ1YS/eEUBwcwsIEuWnJ7f3smkISI/Rvm5OLXj/NdTwMePWKPQO5sEHd062vem1P9PL2vRLIR00=,iv:6C0nxp1KyZ2SmjgyuJbRoiE4PFsTqwmg0CAoJ/ESe4U=,tag:99K9yz87AKR/brzHYy/M8g==,type:str] mac: ENC[AES256_GCM,data:42EEOtKLohLi5oBSEZZ2Z/KsCHDg96M/XORQk7C05pg7FdeuIl+Inxc/KjWUDuLnuyom9qXbUkBqJp3HbXS16zHroFi4axd100av2N4DgrIC7f/cxeAsScdmcCRvDI9VUANMtV95PZHjlhuDqe0+MVoLxIkA6C/2e3PPXC0C5os=,iv:Mk+/2uNHVwSSAzoHOdI/1FEvSZ+uzEj1rJ/hsT4V3xY=,tag:5Vw9voVdj5eZzWgrr10JZQ==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.4 version: 3.9.2

View file

@ -147,8 +147,6 @@ alias_dictionary = {
"cat": "bat", "cat": "bat",
"git": "hub", "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", "l": "eza -lhg --time-style=long-iso --icons=auto --hyperlink",
"la": "eza -lAh --time-style=long-iso --icons=auto --hyperlink", "la": "eza -lAh --time-style=long-iso --icons=auto --hyperlink",

149
flake.lock generated
View file

@ -45,11 +45,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1738343111, "lastModified": 1738213515,
"narHash": "sha256-y9st4Y0p5ry+6QdlIGeqxAA6rbEIOO1uXdAc5jxV2Bc=", "narHash": "sha256-0cYr91WBMCmlPCKxZrH8habV9tkAA1SkeKPnI+A76WU=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "51b9cce097da369550f45ac07879274dc8be81e4", "rev": "ddbaf00ce2a74478278aa17459dda5c5893d998d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,7 +285,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -303,7 +303,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -319,25 +319,6 @@
"type": "github" "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": { "gauntlet": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@ -346,20 +327,20 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1738189623, "lastModified": 1735207841,
"narHash": "sha256-ndk7FY3m5VEukLcqcCCFiUnyN1HkLLTaZKI1MEXrohk=", "narHash": "sha256-m/TOVOqnlfHWg+jXLSNFW5cJC3Hf6I7mk7W1WH1viuI=",
"owner": "project-gauntlet", "owner": "project-gauntlet",
"repo": "gauntlet", "repo": "gauntlet",
"rev": "792baa7e6aa6262416d18babda2ef81eb3cd3f30", "rev": "11af8eaff2416c94b70705e5db17369feb307b7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "project-gauntlet", "owner": "project-gauntlet",
"repo": "gauntlet", "repo": "gauntlet",
"rev": "792baa7e6aa6262416d18babda2ef81eb3cd3f30", "rev": "11af8eaff2416c94b70705e5db17369feb307b7a",
"type": "github" "type": "github"
} }
}, },
@ -440,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738275749, "lastModified": 1738257949,
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "narHash": "sha256-Q/xbvWHqCNcw+nDXgRaKH31fggZiA0Ciqs0t1H28fL8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "rev": "7a457746847c9cb3a1e46e5bc86b205fbadf5da8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -462,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738275749, "lastModified": 1738228963,
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738277753, "lastModified": 1738033138,
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -612,14 +593,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1738287944, "lastModified": 1738201509,
"narHash": "sha256-q8pOnhaA95ZZf+CJ4ahScSzt5pbnL7lShFuMwTwiw7I=", "narHash": "sha256-gyKBLziqn47BqpELlorHxlQTQxBS2GFQah2KNqh8Uzg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "529e0a84346f34db86ea24203c0b2e975fefb4f2", "rev": "1b54a1707f1388b457792736b9903980ab26afaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +639,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1738163270, "lastModified": 1738023785,
"narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -705,22 +686,6 @@
} }
}, },
"nixpkgs_3": { "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": { "locked": {
"lastModified": 1713805509, "lastModified": 1713805509,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
@ -736,7 +701,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1738142207,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
@ -767,11 +732,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738366771, "lastModified": 1738255431,
"narHash": "sha256-nyEBrP5t1g4vmy7YBkiGaIu19eG8zV3T4IQLQbJsVU8=", "narHash": "sha256-n0NCyg7JYGl7AcfDkYpB7RwtUGSxnX6WCqLqjaGMFU0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c75e4ea37f25ec98aa6f2035e03e748e7369662c", "rev": "e4ed227f99be42cd0ce28b6ae0c85c306ef70d40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -789,11 +754,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1738362438, "lastModified": 1738256454,
"narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", "narHash": "sha256-vxU2VrAsmQ6XD6pOwIV63Yx7HXsliCybyrLG0D0XmB4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", "rev": "5caeb6744cd9a201a82908f6deafac63b7ef234e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -902,14 +867,13 @@
"catppuccin-vsc": "catppuccin-vsc", "catppuccin-vsc": "catppuccin-vsc",
"compose2nix": "compose2nix", "compose2nix": "compose2nix",
"cosmic": "cosmic", "cosmic": "cosmic",
"forgejo-cli": "forgejo-cli",
"gauntlet": "gauntlet", "gauntlet": "gauntlet",
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
@ -946,11 +910,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738291974, "lastModified": 1737411508,
"narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -977,11 +941,11 @@
}, },
"staging-next": { "staging-next": {
"locked": { "locked": {
"lastModified": 1738368923, "lastModified": 1738245746,
"narHash": "sha256-mzDpk6rf/9DKbaKgL2hPgETtEtPPnUPABJ54SGXsXTE=", "narHash": "sha256-etDp3EzvIzSdYCI4tybEAP9IGw7uVgkOaHRLqPeXCrM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c27f09976fd7f57a856ba24b5581d0563f6ac519", "rev": "97fc6f36d0a5c2e03b89dc98b0ed86d6953da172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1036,21 +1000,6 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1092,24 +1041,6 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "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", "root": "root",

View file

@ -41,9 +41,8 @@
}; };
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
forgejo-cli.url = "git+https://codeberg.org/Cyborus/forgejo-cli";
gauntlet = { gauntlet = {
url = "github:/project-gauntlet/gauntlet/792baa7e6aa6262416d18babda2ef81eb3cd3f30"; # main, 1/31/2025 url = "github:/project-gauntlet/gauntlet/11af8eaff2416c94b70705e5db17369feb307b7a"; # v12
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

View file

@ -1,4 +1,4 @@
{ pkgs, user, ... }: { pkgs, ... }:
let let
extensions-repo = pkgs.nur.repos.rycee.firefox-addons; extensions-repo = pkgs.nur.repos.rycee.firefox-addons;
extensions = with extensions-repo; [ extensions = with extensions-repo; [
@ -44,7 +44,7 @@ in
}; };
}; };
profiles = { profiles = {
${user} = { "cswimr (personal)" = {
id = 0; id = 0;
isDefault = true; isDefault = true;
extensions = extensions; extensions = extensions;

View file

@ -67,10 +67,7 @@ let
python311Packages.python-lsp-server python311Packages.python-lsp-server
python311Packages.rich python311Packages.rich
]; ];
flakePackages = with inputs; [ flakePackages = with inputs; [ compose2nix.packages.${system}.default ];
compose2nix.packages.${system}.default
forgejo-cli.packages.${system}.default
];
in in
{ {
environment.systemPackages = lib.lists.unique (packages ++ flakePackages); environment.systemPackages = lib.lists.unique (packages ++ flakePackages);

View file

@ -8,10 +8,6 @@
owner = user; owner = user;
path = "/home/${user}/.secrets/coastalcommits"; path = "/home/${user}/.secrets/coastalcommits";
}; };
"codeberg" = {
owner = user;
path = "/home/${user}/.secrets/codeberg";
};
"zipline" = { "zipline" = {
owner = user; owner = user;
path = "/home/${user}/.secrets/zipline"; path = "/home/${user}/.secrets/zipline";