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

chore: update inputs, miscellaneous changes

Browse source
This commit is contained in:
Ryan Cao 2024-04-28 14:53:10 +08:00
parent 3861c0442b
commit 46cf265a54
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
12 changed files with 48 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

156
flake.lock generated
View file

@ -22,16 +22,16 @@
},
"catppuccin": {
"locked": {
"lastModified": 1710663401,
"narHash": "sha256-pA1l9dBv85e7r0UWRmgZMYLDa4S1LXFtRLvXCAJGcfI=",
"owner": "Stonks3141",
"repo": "ctp-nix",
"rev": "03b95cad3bbeb9913db6d89dc3f4fccc6c8fcbd4",
"lastModified": 1713895615,
"narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=",
"owner": "catppuccin",
"repo": "nix",
"rev": "a48e70a31616cb63e4794fd3465bff1835cc4246",
"type": "github"
},
"original": {
"owner": "Stonks3141",
"repo": "ctp-nix",
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
@ -70,71 +70,6 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1712298178,
"narHash": "sha256-590fpCPXYAkaAeBz/V91GX4/KGzPObdYtqsTWzT6AhI=",
"owner": "nix-community",
"repo": "fenix",
"rev": "569b5b5781395da08e7064e825953c548c26af76",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"fh": {
"inputs": {
"fenix": [
"fenix"
],
"flake-compat": [
"flake-compat"
],
"naersk": [
"naersk"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711118970,
"narHash": "sha256-fRaKydMSwd1zl6ptBKvn5ej2pqtI8xi9dioFmR8QA+g=",
"rev": "73fed26f0231ae650122beb3ac1b7654b5cc682c",
"revCount": 425,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.10/018e66b1-a218-7f23-949d-ace71c4e4c8b/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/fh/0.%2A.tar.gz"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -160,11 +95,11 @@
]
},
"locked": {
"lastModified": 1712317700,
"narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
"lastModified": 1713992342,
"narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
"rev": "2f072c127c041eec36621b8e38a531fe0fe07961",
"type": "github"
},
"original": {
@ -173,26 +108,6 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nish": {
"inputs": {
"nixpkgs": [
@ -220,11 +135,11 @@
]
},
"locked": {
"lastModified": 1711763326,
"narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"lastModified": 1713946171,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github"
},
"original": {
@ -235,11 +150,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712222121,
"narHash": "sha256-8f3glF4uwsPlDvaKDRgXD9xGe4YoCH4jA8ICxy/NbCo=",
"lastModified": 1713805509,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "23ff7d9dc4f3d553939e7bfe0d2667198f993536",
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
"type": "github"
},
"original": {
@ -262,11 +177,11 @@
]
},
"locked": {
"lastModified": 1712368415,
"narHash": "sha256-QRYDTQ2Bs3dP0gx3X5qo6iAfIZRB3KpetDWNdkjZ38E=",
"lastModified": 1713944914,
"narHash": "sha256-QxuqKjmgea6WKjHDjw1i7rm1Jo+bM2fRlxXb8foWxTk=",
"owner": "ryanccn",
"repo": "nrr",
"rev": "a8a485922abd742bd6f4acd9c50e11d1a72ca7ab",
"rev": "3aaedaa3b3ef79f28d9eebbb5414313f83eebb1e",
"type": "github"
},
"original": {
@ -297,11 +212,11 @@
"ohmyzsh": {
"flake": false,
"locked": {
"lastModified": 1712295516,
"narHash": "sha256-sorDPoslcg4wEnOuykYwuSncLnesYXECN8ucpHLavRc=",
"lastModified": 1714025058,
"narHash": "sha256-spfi3Jdd9yjZ+1l4uz6QX7HF996VvbHwgtlTaHSrAXM=",
"owner": "ohmyzsh",
"repo": "ohmyzsh",
"rev": "038931039030911852d456215d6f39385d5b7a6e",
"rev": "803e1a784cd520f101d126b47deea3297e6a82fc",
"type": "github"
},
"original": {
@ -316,12 +231,8 @@
"catppuccin": "catppuccin",
"choirpack": "choirpack",
"darwin-custom-icons": "darwin-custom-icons",
"fenix": "fenix",
"fh": "fh",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"naersk": "naersk",
"nish": "nish",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs",
@ -332,23 +243,6 @@
"vivid-zsh": "vivid-zsh"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1712156296,
"narHash": "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "8e581ac348e223488622f4d3003cb2bd412bf27e",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
@ -359,11 +253,11 @@
]
},
"locked": {
"lastModified": 1712369449,
"narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=",
"lastModified": 1714011248,
"narHash": "sha256-vKk9IOxZJ52Ao3uIRIjHRYYe+IpVOY6NzwToSxaO1J0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779",
"rev": "9a2a11479b94afaf1ecc46384b27abda0d3d5f9d",
"type": "github"
},
"original": {

25
flake.nix
View file

@ -17,7 +17,7 @@
};
catppuccin = {
url = "github:Stonks3141/ctp-nix";
url = "github:catppuccin/nix";
};
am = {
@ -47,30 +47,12 @@
inputs.nixpkgs.follows = "nixpkgs";
};
fh = {
url = "https://flakehub.com/f/DeterminateSystems/fh/0.*.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.fenix.follows = "fenix";
inputs.naersk.follows = "naersk";
inputs.flake-compat.follows = "flake-compat";
};
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
naersk = {
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin-custom-icons = {
url = "github:ryanccn/nix-darwin-custom-icons";
};
@ -88,11 +70,6 @@
flake-utils = {
url = "github:numtide/flake-utils";
};
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
};
outputs = {

2
home/apps/ghostty.conf
View file

@ -1,7 +1,9 @@
theme = catppuccin-frappe
window-colorspace = display-p3
font-family = "Ryan Term"
font-size = 13
font-feature = -calt
font-feature = -dlig
adjust-cell-height = 50%

2
home/default.nix
View file

@ -18,9 +18,7 @@
./programs/fish.nix
./programs/zsh.nix
./programs/starship.nix
./programs/zoxide.nix
./programs/direnv.nix
./programs/atuin.nix
./programs/git.nix
./programs/bat.nix

18
home/programs/atuin.nix
View file

@ -1,18 +0,0 @@
_: {
programs.atuin = {
enable = true;
enableBashIntegration = false;
enableFishIntegration = true;
enableZshIntegration = true;
flags = ["--disable-up-arrow"];
settings = {
update_check = false;
history_filter = [
"^clear"
"^exit"
];
};
};
}

5
home/programs/direnv.nix
View file

@ -1,11 +1,6 @@
_: {
programs.direnv = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
# enableFishIntegration = true;
nix-direnv.enable = true;
};
}

14
home/programs/fish.nix
View file

@ -5,6 +5,8 @@
in {
programs.fish = {
enable = true;
catppuccin.enable = true;
inherit shellAbbrs shellAliases;
shellInit = ''
@ -34,8 +36,12 @@ in {
};
};
# home.file.".config/fish/conf.d" = {
# source = ./fish/conf.d;
# recursive = true;
# };
programs.fzf = {
enable = true;
catppuccin.enable = true;
};
programs.zoxide = {
enable = true;
};
}

5
home/programs/rust.nix
View file

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

14
home/programs/starship.nix
View file

@ -2,10 +2,6 @@ _: {
programs.starship = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
settings = {
command_timeout = 1000;
@ -16,17 +12,17 @@ _: {
gcloud.disabled = true;
bun.format = "[$symbol($version )]($style)";
bun.format = "[$symbol($version)]($style) ";
cmd_duration.format = "[$duration]($style) ";
deno.format = "[$symbol($version )]($style)";
deno.format = "[$symbol($version)]($style) ";
docker_context.format = "[$symbol$context]($style) ";
git_branch.format = "[$symbol$branch(:$remote_branch)]($style) ";
golang.format = "[$symbol($version )]($style)";
golang.format = "[$symbol($version)]($style) ";
nix_shell.format = "[$symbol$state( \($name\))]($style) ";
nodejs.format = "[$symbol($version )]($style)";
nodejs.format = "[$symbol($version)]($style) ";
package.format = "[$symbol$version]($style) ";
python.format = "[\${symbol}\${pyenv_prefix}(\${version} )(\($virtualenv\) )]($style)";
rust.format = "[$symbol($version )]($style)";
rust.format = "[$symbol($version)]($style) ";
aws.symbol = " ";
bun.symbol = "󰳮 ";

9
home/programs/zoxide.nix
View file

@ -1,9 +0,0 @@
_: {
programs.zoxide = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
};
}

1
modules/nix.nix
View file

@ -37,7 +37,6 @@
inputs.nrr.overlays.default
inputs.choirpack.overlays.default
inputs.nyoom.overlays.default
inputs.fh.overlays.default
self.overlays.ryan-mono-bin
self.overlays.ibm-plex
];

3
modules/packages.nix
View file

@ -14,13 +14,12 @@
nix-your-shell
nix-output-monitor
nix-melt
# fh
fnm
deno
bun
(python311.withPackages (ps: with ps; [pip]))
(python312.withPackages (ps: with ps; [pip]))
ruff
yt-dlp
xkcdpass