mirror of
https://github.com/ryanccn/flake.git
synced 2025-12-06 08:10:43 +01:00
feat: add atuin and nom, adjust configs
This commit is contained in:
parent
2186255b7e
commit
3ea99dd18a
SSH key fingerprint:
SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
15 changed files with 113 additions and 91 deletions
29
.github/workflows/build.yml
vendored
Normal file
29
.github/workflows/build.yml
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
name: Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
label:
|
||||
- Ryans-MacBook-Pro
|
||||
include:
|
||||
- label: Ryans-MacBook-Pro
|
||||
path: darwinConfigurations.Ryans-MacBook-Pro.config.system.build.toplevel
|
||||
runner: macos-14
|
||||
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install Nix
|
||||
uses: DeterminateSystems/nix-installer-action@v7
|
||||
|
||||
- name: Build
|
||||
run: nix build -L --show-trace .#${{ matrix.path }}
|
||||
54
flake.lock
generated
54
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707355110,
|
||||
"narHash": "sha256-S3mesqNxuY4kEHrTaqX5zVs8u31/YcpZ52GGl7sq7PE=",
|
||||
"lastModified": 1709872877,
|
||||
"narHash": "sha256-zRNhX4j/c/3FAJuUMYzsWEJCaE1D0xSiIfgeuhVdbSo=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "am",
|
||||
"rev": "75deb936a48ad74c647d3890893a601d91f1f04d",
|
||||
"rev": "b5b653adea4dbfcd3ad150e73ca694228e479a2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -78,11 +78,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708064520,
|
||||
"narHash": "sha256-m0teYrbf7kAainkHBJ+zpClBNaTIOX6QNkn5W8on4uY=",
|
||||
"lastModified": 1710138244,
|
||||
"narHash": "sha256-vl41HMQ9WrLgUto7EpxWgAjAksYxKddUKQCfcF2Tpac=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "2f24d67fad634ecf1820a73bb40d709eb12862bf",
|
||||
"rev": "5708f08c8bcb6dd98b573a162e05cd5aa506091e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -140,11 +140,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -160,11 +160,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708031129,
|
||||
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
|
||||
"lastModified": 1710062421,
|
||||
"narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
|
||||
"rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -220,11 +220,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707707289,
|
||||
"narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
|
||||
"lastModified": 1709771483,
|
||||
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
|
||||
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -235,11 +235,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1708001613,
|
||||
"narHash": "sha256-woOmAXW05XnqlLn7dKzCkRAEOSOdA/Z2ndVvKcjid94=",
|
||||
"lastModified": 1710097495,
|
||||
"narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "085589047343aad800c4d305cf7b98e8a3d51ae2",
|
||||
"rev": "d40e866b1f98698d454dad8f592fe7616ff705a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -256,11 +256,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707057654,
|
||||
"narHash": "sha256-WrpyT5h+eoCu7cspf9KGaM0FgLmnBm8tOHIWbj8sYpo=",
|
||||
"lastModified": 1708768548,
|
||||
"narHash": "sha256-asoXJl5tRnyM8jQzUFEa7lR5zpKWVFJObku3FTu2zCo=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "nrr",
|
||||
"rev": "73d2e8e419498cca910a41a32ce933b1fb0d043c",
|
||||
"rev": "7eba97bc83cfaca9e2ecaaa1e874b4d7d4e897f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -291,11 +291,11 @@
|
|||
"ohmyzsh": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1707909248,
|
||||
"narHash": "sha256-0bU/wJkICS+KwTMVzs/NqFJ0QBhiHiO6NLI9rCJbxv4=",
|
||||
"lastModified": 1710036976,
|
||||
"narHash": "sha256-eCWw3OaNJVYrxSKZeUcfheqss53R38FgkmGrB+dT1Xc=",
|
||||
"owner": "ohmyzsh",
|
||||
"repo": "ohmyzsh",
|
||||
"rev": "872b5cd4086a5547dbf788dda4e96ab3868cf59b",
|
||||
"rev": "4fd2af0a82e2826317d9551ecd8d5f44553828d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -328,11 +328,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1708018577,
|
||||
"narHash": "sha256-B75VUqKvQeIqAUnYw4bGjY3xxrCqzRBJHLbmD0MAWEw=",
|
||||
"lastModified": 1709978501,
|
||||
"narHash": "sha256-NfeDjQZUrVb9hzBPcqO19s0p/zSOatD5ZK+J7rZiE3c=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "b9b0d29b8e69b02457cfabe20c4c69cdb45f3cc5",
|
||||
"rev": "574e23ec508064613783cba3d1833a95fd9a5080",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -89,9 +89,9 @@ in {
|
|||
|
||||
"git.autofetch" = true;
|
||||
"git.confirmSync" = false;
|
||||
"diffEditor.renderSideBySide" = false;
|
||||
"git.inputValidation" = "off";
|
||||
"git.inputValidation" = false;
|
||||
"git.suggestSmartCommit" = false;
|
||||
"diffEditor.renderSideBySide" = false;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
"gitlens.showWelcomeOnInstall" = false;
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ in {
|
|||
"editor.insertSpaces" = true;
|
||||
"editor.formatOnSave" = true;
|
||||
|
||||
"terminal.integrated.fontFamily" = "\"Ryan Term\", \"Symbols Nerd Font\", \"Apple Color Emoji\", monospace";
|
||||
"terminal.integrated.fontFamily" = "\"Ryan Term\", \"Symbols Nerd Font Mono\", \"Apple Color Emoji\", monospace";
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"terminal.integrated.lineHeight" = 1.5;
|
||||
"terminal.integrated.cursorBlinking" = true;
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
./apps/vscode.nix
|
||||
./apps/ghostty.nix
|
||||
|
||||
./programs/zsh.nix
|
||||
./programs/fish.nix
|
||||
./programs/zsh.nix
|
||||
./programs/starship.nix
|
||||
./programs/fzf.nix
|
||||
./programs/zoxide.nix
|
||||
./programs/direnv.nix
|
||||
./programs/atuin.nix
|
||||
|
||||
./programs/git.nix
|
||||
./programs/bat.nix
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
./programs/tealdeer.nix
|
||||
];
|
||||
|
||||
programs.bash.enable = true;
|
||||
xdg.enable = true;
|
||||
|
||||
services.am-discord-rich-presence = {
|
||||
|
|
|
|||
18
home/programs/atuin.nix
Normal file
18
home/programs/atuin.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
_: {
|
||||
programs.atuin = {
|
||||
enable = true;
|
||||
|
||||
enableBashIntegration = false;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
flags = ["--disable-up-arrow"];
|
||||
|
||||
settings = {
|
||||
update_check = false;
|
||||
history_filter = [
|
||||
"^clear"
|
||||
"^exit"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,12 @@ in {
|
|||
enable = true;
|
||||
inherit shellAbbrs shellAliases;
|
||||
|
||||
shellInit = ''
|
||||
for config in ${./fish/configs}/*.fish
|
||||
source "$config"
|
||||
end
|
||||
'';
|
||||
|
||||
functions = {
|
||||
take = ''
|
||||
set dir $argv[1]
|
||||
|
|
@ -28,8 +34,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
home.file.".config/fish/conf.d" = {
|
||||
source = ./fish/conf.d;
|
||||
recursive = true;
|
||||
};
|
||||
# home.file.".config/fish/conf.d" = {
|
||||
# source = ./fish/conf.d;
|
||||
# recursive = true;
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
if status is-interactive
|
||||
# nix-your-shell
|
||||
nix-your-shell fish | source
|
||||
|
||||
string match -q "$TERM_PROGRAM" "iTerm.app"
|
||||
and source "$HOME/.iterm2_shell_integration.fish"
|
||||
|
||||
string match -q "$TERM_PROGRAM" ghostty
|
||||
and source "/Applications/Ghostty.app/Contents/Resources/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
|
||||
end
|
||||
15
home/programs/fish/configs/99_interactive.fish
Normal file
15
home/programs/fish/configs/99_interactive.fish
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
if status is-interactive
|
||||
nix-your-shell fish | source
|
||||
|
||||
set -l iterm2_shell_integration "$HOME/.iterm2_shell_integration.fish"
|
||||
|
||||
string match -q "$TERM_PROGRAM" "iTerm.app"
|
||||
and test -f "$iterm2_shell_integration"
|
||||
and source "$iterm2_shell_integration"
|
||||
|
||||
set -l ghostty_shell_integration "/Applications/Ghostty.app/Contents/Resources/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
|
||||
|
||||
string match -q "$TERM_PROGRAM" ghostty
|
||||
and test -f "$ghostty_shell_integration"
|
||||
and source "$ghostty_shell_integration"
|
||||
end
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
_: {
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
enableFishIntegration = true;
|
||||
|
||||
colors = {
|
||||
"bg+" = "#414559";
|
||||
"bg" = "#303446";
|
||||
"fg+" = "#c6d0f5";
|
||||
"fg" = "#c6d0f5";
|
||||
"hl+" = "#e78284";
|
||||
"hl" = "#e78284";
|
||||
"spinner" = "#f2d5cf";
|
||||
"header" = "#e78284";
|
||||
"info" = "#ca9ee6";
|
||||
"pointer" = "#f2d5cf";
|
||||
"marker" = "#f2d5cf";
|
||||
"prompt" = "#ca9ee6";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -28,40 +28,25 @@ _: {
|
|||
python.format = "[\${symbol}\${pyenv_prefix}(\${version} )(\($virtualenv\) )]($style)";
|
||||
rust.format = "[$symbol($version )]($style)";
|
||||
|
||||
aws.symbol = " ";
|
||||
aws.symbol = " ";
|
||||
bun.symbol = " ";
|
||||
buf.symbol = " ";
|
||||
c.symbol = " ";
|
||||
conda.symbol = " ";
|
||||
dart.symbol = " ";
|
||||
directory.read_only = " ";
|
||||
docker_context.symbol = " ";
|
||||
elixir.symbol = " ";
|
||||
elm.symbol = " ";
|
||||
fossil_branch.symbol = " ";
|
||||
git_branch.symbol = " ";
|
||||
golang.symbol = " ";
|
||||
guix_shell.symbol = " ";
|
||||
haskell.symbol = " ";
|
||||
haxe.symbol = "⌘ ";
|
||||
hg_branch.symbol = " ";
|
||||
hostname.ssh_symbol = " ";
|
||||
java.symbol = " ";
|
||||
julia.symbol = " ";
|
||||
lua.symbol = " ";
|
||||
memory_usage.symbol = " ";
|
||||
meson.symbol = " ";
|
||||
nim.symbol = " ";
|
||||
nix_shell.symbol = " ";
|
||||
nodejs.symbol = " ";
|
||||
package.symbol = " ";
|
||||
pijul_channel.symbol = "🪺 ";
|
||||
python.symbol = " ";
|
||||
rlang.symbol = " ";
|
||||
ruby.symbol = " ";
|
||||
rust.symbol = " ";
|
||||
scala.symbol = " ";
|
||||
spack.symbol = "🅢 ";
|
||||
|
||||
os.symbols = {
|
||||
Alpaquita = " ";
|
||||
|
|
|
|||
4
justfile
4
justfile
|
|
@ -1,5 +1,5 @@
|
|||
switch:
|
||||
darwin-rebuild switch --flake . --verbose --show-trace
|
||||
switch *args:
|
||||
darwin-rebuild switch --flake . --verbose --show-trace {{args}}
|
||||
|
||||
delete-old:
|
||||
sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old && home-manager expire-generations now
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
deadnix
|
||||
|
||||
nix-your-shell
|
||||
nix-output-monitor
|
||||
nix-melt
|
||||
# fh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
(_: prev: let
|
||||
version = "2024.02.16";
|
||||
version = "2024.03.11";
|
||||
|
||||
mkFontVariant = {
|
||||
variant,
|
||||
|
|
@ -33,11 +33,11 @@
|
|||
in {
|
||||
ryan-mono-bin = mkFontVariant {
|
||||
variant = "RyanMono";
|
||||
hash = "sha256-4h9T3r/kngeGUYMj6N05QFuvg0rPICqZBKDloB/WtMc=";
|
||||
hash = "sha256-+ReEWd8Kpdgnq9zKA0+7KVkwwrV7tcVM9ldes2UeiG0=";
|
||||
};
|
||||
|
||||
ryan-term-bin = mkFontVariant {
|
||||
variant = "RyanTerm";
|
||||
hash = "sha256-NBl4Z2JT88WbgcPuei3Jcfb5n7T89oWCzOm9vBtAmkc=";
|
||||
hash = "sha256-eAu26f/pJPMwV4BiABPwNJI1HRF4HbPsm/fL6/tseq4=";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
programs.bash.enable = true;
|
||||
programs.fish.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue