ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
Code Activity

feat(git): use PGP for signing (for now)

Browse source
This commit is contained in:
Ryan Cao 2024-08-04 18:25:08 +08:00
parent 76e232b630
commit 8f347ee1ec
Signed by: ryanccn
GPG key ID: 48C96B2057D71CB1
6 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

75
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1709872877,
"narHash": "sha256-zRNhX4j/c/3FAJuUMYzsWEJCaE1D0xSiIfgeuhVdbSo=",
"lastModified": 1720108828,
"narHash": "sha256-+U7vAYqOUQMu1sq5mJGBf1lgADZl7zP+K/L9FAP3BnY=",
"owner": "ryanccn",
"repo": "am",
"rev": "b5b653adea4dbfcd3ad150e73ca694228e479a2c",
"rev": "17b26b26cb9aa06cd112a0c44ecdb4987fec2e29",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1718339789,
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
"lastModified": 1722661201,
"narHash": "sha256-2JX3S1hmmUhHuyGyGWnaM4xT0SiaDdVkNzmBrEowwK0=",
"owner": "catppuccin",
"repo": "nix",
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
"rev": "19a0f144f0204a12a89243363efb6a493b8cfc83",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
},
"darwin-custom-icons": {
"locked": {
"lastModified": 1693410673,
"narHash": "sha256-oHw98kktSorqgd73tOskTkE7AfWfNee7QTxJeMkd640=",
"lastModified": 1719071371,
"narHash": "sha256-SPazmoL3Pls4QTiZ2CRtavecNJgzpL4GeiwafTmtdJ8=",
"owner": "ryanccn",
"repo": "nix-darwin-custom-icons",
"rev": "347800c2704b4adb76aaf06fbf0be7831431785b",
"rev": "ad3e8cf49ef0b276ccf67410f544ff33d965d821",
"type": "github"
},
"original": {
@ -110,11 +110,11 @@
]
},
"locked": {
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"lastModified": 1722630065,
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"rev": "afc892db74d65042031a093adb6010c4c3378422",
"type": "github"
},
"original": {
@ -154,11 +154,11 @@
]
},
"locked": {
"lastModified": 1717647344,
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=",
"lastModified": 1722485024,
"narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=",
"ref": "refs/heads/main",
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164",
"revCount": 87,
"rev": "e350380d72f94035c309e19fda2fd550f6ab7376",
"revCount": 102,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@ -194,11 +194,11 @@
]
},
"locked": {
"lastModified": 1718440858,
"narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=",
"lastModified": 1722609272,
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "58b905ea87674592aa84c37873e6c07bc3807aba",
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
"type": "github"
},
"original": {
@ -209,11 +209,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718276985,
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"lastModified": 1722640603,
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
"type": "github"
},
"original": {
@ -236,11 +236,11 @@
]
},
"locked": {
"lastModified": 1718038477,
"narHash": "sha256-D8y2lO+wClhgZ8NFxvnr5QOmYm2pN82NpsDbCNT6iiE=",
"lastModified": 1722254729,
"narHash": "sha256-YyOR1TRtDB7c6/6R9TEZzhrkD+eDYApQgxzndWa19EU=",
"owner": "ryanccn",
"repo": "nrr",
"rev": "ce64c3f4d1dd99f9c33610e3c494810a8adb6da8",
"rev": "d00398e93b341cb1e89f56966de753ccfd7cc7b2",
"type": "github"
},
"original": {
@ -256,12 +256,12 @@
]
},
"locked": {
"lastModified": 1705150397,
"narHash": "sha256-vanzV4QLle7AbXywX7x50YWYZZhtWzKa4IZl4u1CRis=",
"rev": "0a0d471e476bda2c6b031e291c4192712d9fbe31",
"revCount": 159,
"lastModified": 1722051904,
"narHash": "sha256-gypsHQRmSH+SvmOh/swhiX0gES+EznnbTzroVWB3dyQ=",
"rev": "854c3be2c22bd492d2b0f356d69ed079f2ca2878",
"revCount": 172,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.4/018d02e2-e4be-79a2-9e02-33bd5e483d6c/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.6/0190f24b-8743-7f04-94aa-81d334f7326d/source.tar.gz"
},
"original": {
"type": "tarball",
@ -271,11 +271,11 @@
"ohmyzsh": {
"flake": false,
"locked": {
"lastModified": 1718294894,
"narHash": "sha256-8ZVYN97K4KJOG+JnVpCVbMx2HGypvk7KZmwNzUfcovo=",
"lastModified": 1722610855,
"narHash": "sha256-iD8wKlrytTI8Ohyl7A8vwDkHDku23zod/B+vheRcHJ8=",
"owner": "ohmyzsh",
"repo": "ohmyzsh",
"rev": "0c9b42a863778d67aee22bbd43f296110fe1f047",
"rev": "3b5f018f7025a347e4888408b566caeaef2fabd7",
"type": "github"
},
"original": {
@ -306,19 +306,16 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1718417877,
"narHash": "sha256-s8QrTANEtY6UxzfkcBfoN93bgW9aCRIq54LPRVNu/4c=",
"lastModified": 1722738111,
"narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7c2d603cb67c974ef8c5cfee1150060dbb299e04",
"rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -62,7 +62,6 @@
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
darwin-custom-icons = {

2
home/apps/vscode.nix
View file

@ -199,7 +199,7 @@ in
"nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = {
nixd = {
formatting.command = [ (lib.getExe pkgs.alejandra) ];
formatting.command = [ (lib.getExe pkgs.nixfmt-rfc-style) ];
nixpkgs.expr = "(builtins.getFlake \"${self}\").pkgs";
};
};

5
home/programs/git.nix
View file

@ -12,12 +12,11 @@ _: {
userEmail = "70191398+ryanccn@users.noreply.github.com";
extraConfig = {
user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM4VfgP5+HdCmM/VpTcW8jLKLyR8s0qqoIDXv7iTnWlR";
init.defaultBranch = "main";
commit.gpgsign = true;
gpg.format = "ssh";
"gpg \"ssh\"".program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
gpg.format = "openpgp";
user.signingkey = "48C96B2057D71CB1";
log.date = "iso";
merge.conflictstyle = "zdiff3";

1
home/programs/rust.nix
View file

@ -19,6 +19,7 @@ in
home.packages = with pkgs; [
(rust-bin.stable.latest.default.override { extensions = [ "llvm-tools-preview" ]; })
cargo-audit
cargo-bloat
cargo-cache
cargo-deny

2
modules/packages.nix
View file

@ -3,9 +3,9 @@
environment.systemPackages = with pkgs; [
inputs.home-manager.packages.${pkgs.system}.home-manager
nixfmt-rfc-style
alejandra
nixpkgs-fmt
nixfmt-rfc-style
statix
deadnix