mirror of
https://github.com/nmasur/dotfiles
synced 2025-08-23 12:34:42 +00:00
Compare commits
3 Commits
6a9d1c14a7
...
eb1c08f5da
Author | SHA1 | Date | |
---|---|---|---|
|
eb1c08f5da | ||
|
3e7afdc0b3 | ||
|
45aa5d01e5 |
@@ -24,7 +24,7 @@ in
|
||||
# These are useful for triggering from zellij (rather than running directly in the shell)
|
||||
nmasur.presets.programs.nixpkgs.commands.rebuildNixos = pkgs.writeShellScriptBin "rebuild-darwin" ''
|
||||
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
|
||||
darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
|
||||
sudo darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
|
||||
'';
|
||||
|
||||
programs.fish = {
|
||||
@@ -40,13 +40,13 @@ in
|
||||
rebuild-darwin = {
|
||||
body = ''
|
||||
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
|
||||
echo "darwin-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
|
||||
echo "sudo darwin-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
|
||||
'';
|
||||
};
|
||||
rebuild-darwin-offline = {
|
||||
body = ''
|
||||
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
|
||||
echo "darwin-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
|
||||
echo "sudo darwin-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#lookingglass"
|
||||
'';
|
||||
};
|
||||
rebuild-home = lib.mkForce {
|
||||
|
@@ -19,6 +19,7 @@ in
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
enableTransience = true; # Replace previous prompts with custom string
|
||||
settings = {
|
||||
add_newline = false; # Don't print new line at the start of the prompt
|
||||
format = lib.concatStrings [
|
||||
@@ -80,6 +81,17 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.fish = {
|
||||
functions = {
|
||||
# Adjust the prompt in previous commands
|
||||
starship_transient_prompt_func = {
|
||||
body = "echo '$ '";
|
||||
};
|
||||
starship_transient_rprompt_func = {
|
||||
body = "echo ' '";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
@@ -17,10 +17,6 @@ in
|
||||
|
||||
nmasur.presets.programs = {
|
||||
zed-editor.enable = lib.mkDefault true;
|
||||
ghostty.enable = lib.mkDefault true;
|
||||
helix.enable = lib.mkDefault true;
|
||||
zellij.enable = lib.mkDefault true;
|
||||
lazygit.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
@@ -32,8 +28,6 @@ in
|
||||
pkgs.charm # Manage account and filesystem
|
||||
pkgs.pop # Send emails from a TUI
|
||||
|
||||
pkgs.yazi # TUI file explorer
|
||||
|
||||
];
|
||||
|
||||
programs.gh-dash.enable = lib.mkDefault true;
|
||||
|
@@ -28,14 +28,16 @@ in
|
||||
pkgs.nixfmt-rfc-style # Format Nix code
|
||||
pkgs.nmasur.jqr # FZF fq JSON tool
|
||||
pkgs.nmasur.osc # Clipboard over SSH
|
||||
# pkgs.nmasur.ren-find # Rename files
|
||||
# pkgs.nmasur.rep-grep # Replace text in files
|
||||
pkgs.nmasur.ren-find # Rename files
|
||||
pkgs.nmasur.rep-grep # Replace text in files
|
||||
pkgs.pandoc # Convert text documents
|
||||
pkgs.qrencode # Generate qr codes
|
||||
pkgs.spacer # Output lines in terminal
|
||||
pkgs.tealdeer # Cheatsheets
|
||||
pkgs.tree # Print tree in terminal
|
||||
pkgs.vimv-rs # Batch rename files
|
||||
pkgs.yazi # TUI file explorer
|
||||
|
||||
];
|
||||
|
||||
programs.fish.shellAliases = {
|
||||
@@ -58,8 +60,10 @@ in
|
||||
fd.enable = lib.mkDefault true;
|
||||
fish.enable = lib.mkDefault true;
|
||||
fzf.enable = lib.mkDefault true;
|
||||
ghostty.enable = lib.mkDefault true;
|
||||
git.enable = lib.mkDefault true;
|
||||
helix.enable = lib.mkDefault true;
|
||||
lazygit.enable = lib.mkDefault true;
|
||||
neovim.enable = lib.mkDefault true;
|
||||
nix-index.enable = lib.mkDefault true;
|
||||
nixpkgs.enable = lib.mkDefault true;
|
||||
@@ -68,6 +72,7 @@ in
|
||||
ripgrep.enable = lib.mkDefault true;
|
||||
weather.enable = lib.mkDefault true;
|
||||
yt-dlp.enable = lib.mkDefault true;
|
||||
zellij.enable = lib.mkDefault true;
|
||||
zoxide.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user