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

chore: update configs

Browse source
This commit is contained in:
Ryan Cao 2025-08-15 18:22:33 +08:00
parent 79bc61a28e
commit 2e1d4ef8f2
Signed by: ryanccn
GPG key ID: F605AB4AF937D5D0
10 changed files with 63 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
checks/default.nix
View file

@ -45,5 +45,7 @@
nativeBuildInputs = with pkgs; [ reuse ]; nativeBuildInputs = with pkgs; [ reuse ];
}; };
}; };
formatter = pkgs.nixfmt-rfc-style;
}; };
} }

54
flake.lock generated
View file

@ -47,11 +47,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749223974, "lastModified": 1755247639,
"narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", "narHash": "sha256-YBjSqGgNAejwIIqUv+NTYpm+peXLro79qNBi0SF1JqM=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", "rev": "bd14b47481c996e2a5d5e5704d55092edf18e892",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1754487366,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749944797, "lastModified": 1755229570,
"narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c5f345153397f62170c18ded1ae1f0875201d49a", "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +107,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748955242, "lastModified": 1755246866,
"narHash": "sha256-fO0lSogrPRCMhjboUNKDzkeSoU1+Vo8DjfNof7QCw80=", "narHash": "sha256-GFP/HgnF3DVIFj9ijRnlkLBONd5hcojAjBnPn0o1qBI=",
"owner": "ryanccn", "owner": "ryanccn",
"repo": "moldau", "repo": "moldau",
"rev": "4fdf575e56a9e09161d09da060321bffac4607e0", "rev": "a1c05ecb8f7bebae83261759e376e80f4ca1043d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749873626, "lastModified": 1751313918,
"narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749355504, "lastModified": 1754800038,
"narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749871736, "lastModified": 1755175540,
"narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", "narHash": "sha256-V0j2S1r25QnbqBLzN2Rg/dKKil789bI3P3id7bDPVc4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6afe187897bef7933475e6af374c893f4c84a293", "rev": "a595dde4d0d31606e19dcec73db02279db59d201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747309661, "lastModified": 1751032768,
"narHash": "sha256-p/+O/WK2yd/RvmFNA52e9VZRczSrgB8DNzghw/1nVPM=", "narHash": "sha256-RBKFDm6MpK2lDCUvbX0EFEuOASKtHM+5QknWM0A6AKE=",
"owner": "ryanccn", "owner": "ryanccn",
"repo": "nrr", "repo": "nrr",
"rev": "76f0d1097efc76b29b3be3dcc60cd47fb3acbf65", "rev": "4da425b64c46eae492e87a30ddee6952835da046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,11 +261,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749868581, "lastModified": 1755225702,
"narHash": "sha256-oWO5KAIjhclLwYJp7kJiNbNqCcZo8ZLuKQEJd9WL6r4=", "narHash": "sha256-i7Rgs943NqX0RgQW0/l1coi8eWBj3XhxVggMpjjzTsk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2ff6d56a67d75559f7b5d9edf9aa1fcf8e15f461", "rev": "4abaeba6b176979be0da0195b9e4ce86bc501ae4",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
systems/caladan/homebrew.nix
View file

@ -27,19 +27,8 @@
"pandoc" "pandoc"
]; ];
casks = casks = [
let "blackhole-16ch"
noQuarantine = name: { ];
inherit name;
args = {
no_quarantine = true;
};
};
in
[
"blackhole-16ch"
(noQuarantine "librewolf")
(noQuarantine "eloston-chromium")
];
}; };
} }

4
systems/caladan/nix.nix
View file

@ -47,4 +47,8 @@
config.allowUnfree = true; config.allowUnfree = true;
hostPlatform = "aarch64-darwin"; hostPlatform = "aarch64-darwin";
}; };
environment.variables = {
NIX_INSTALLER_DIAGNOSTIC_ENDPOINT = "";
};
} }

2
systems/caladan/packages.nix
View file

@ -22,7 +22,7 @@ in
nix-melt nix-melt
fnm fnm
# deno (hydra build failure) deno
bun bun
uv uv

2
users/ryan/apps/vscode.nix
View file

@ -112,6 +112,7 @@ in
"git.suggestSmartCommit" = false; "git.suggestSmartCommit" = false;
"git.branchRandomName.enable" = true; "git.branchRandomName.enable" = true;
"git.blame.editorDecoration.enabled" = true; "git.blame.editorDecoration.enabled" = true;
"git.useIntegratedAskPass" = false;
"diffEditor.renderSideBySide" = false; "diffEditor.renderSideBySide" = false;
"diffEditor.ignoreTrimWhitespace" = false; "diffEditor.ignoreTrimWhitespace" = false;
@ -122,6 +123,7 @@ in
"editor.lineHeight" = 1.5; "editor.lineHeight" = 1.5;
# "editor.cursorBlinking" = "phase"; # "editor.cursorBlinking" = "phase";
# "editor.cursorSmoothCaretAnimation" = "on"; # "editor.cursorSmoothCaretAnimation" = "on";
"editor.minimap.enabled" = false;
# "editor.minimap.renderCharacters" = false; # "editor.minimap.renderCharacters" = false;
"workbench.editor.highlightModifiedTabs" = true; "workbench.editor.highlightModifiedTabs" = true;
"workbench.editor.empty.hint" = "hidden"; "workbench.editor.empty.hint" = "hidden";

2
users/ryan/default.nix
View file

@ -11,7 +11,7 @@
imports = [ imports = [
inputs.catppuccin.homeModules.catppuccin inputs.catppuccin.homeModules.catppuccin
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.homeModules.nix-index
./variables.nix ./variables.nix
./fonts.nix ./fonts.nix

25
users/ryan/programs/aliases.nix
View file

@ -1,25 +0,0 @@
# SPDX-FileCopyrightText: 2025 Ryan Cao <hello@ryanccn.dev>
#
# SPDX-License-Identifier: Apache-2.0
{
"g".command = "git";
"j".command = "just";
"nb".command = "nix build";
"nfu".command = "nix flake update";
"glol".command =
"git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
"glol".fishAlias = true;
"ghrvw".command = "gh repo view --web";
"opr".command = "op run --env-file=.env.1password --";
"dr".command = "doppler run --";
"dequarantine".command = "xattr -d com.apple.quarantine";
"bcpa".command = "brew cleanup --prune=all";
"puil".command = "pnpm update --interactive --latest";
}

32
users/ryan/programs/fish.nix
View file

@ -2,22 +2,30 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
{ lib, ... }:
let
aliases = import ./aliases.nix;
shellAbbrs = builtins.mapAttrs (lib.const (builtins.getAttr "command")) (
lib.filterAttrs (_: a: !(lib.maybeAttr "fishAlias" false a)) aliases
);
shellAliases = builtins.mapAttrs (lib.const (builtins.getAttr "command")) (
lib.filterAttrs (_: a: lib.maybeAttr "fishAlias" false a) aliases
);
in
{ {
programs.fish = { programs.fish = {
enable = true; enable = true;
inherit shellAbbrs shellAliases; shellAbbrs = {
g = "git";
j = "just";
nb = "nix build";
nfu = "nix flake update";
glol = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
ghrvw = "gh repo view --web";
opr = "op run --env-file=.env.1password --";
dr = "doppler run --";
dequarantine = "xattr -d com.apple.quarantine";
bcpa = "brew cleanup --prune=all";
puil = "pnpm update --interactive --latest";
};
shellAliases = { };
shellInit = '' shellInit = ''
for config in ${./fish/configs}/*.fish for config in ${./fish/configs}/*.fish

5
users/ryan/programs/zsh.nix
View file

@ -2,9 +2,10 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
_: { { config, ... }:
{
programs.zsh = { programs.zsh = {
enable = true; enable = true;
dotDir = ".config/zsh"; dotDir = "${config.xdg.configHome}/zsh";
}; };
} }