updated some configs and theming

This commit is contained in:
Tyler Mayoff 2025-07-18 23:06:28 -04:00
parent bd56720268
commit 8a2031c511
9 changed files with 80 additions and 181 deletions

View file

@ -1,20 +1,5 @@
{
"nodes": {
"crane": {
"locked": {
"lastModified": 1727974419,
"narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
"owner": "ipetkov",
"repo": "crane",
"rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -23,6 +8,7 @@
},
"locked": {
"lastModified": 1749744770,
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
"owner": "nix-darwin",
"repo": "nix-darwin",
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
@ -133,24 +119,6 @@
"url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks-nix": {
"inputs": {
"flake-compat": "flake-compat",
@ -177,27 +145,6 @@
"url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
}
},
"helix": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737319839,
"owner": "helix-editor",
"repo": "helix",
"rev": "e7ac2fcdecfdbf43a4f772e7f7c163b43b3d0b9b",
"type": "github"
},
"original": {
"owner": "helix-editor",
"ref": "25.01.1",
"repo": "helix",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -205,10 +152,11 @@
]
},
"locked": {
"lastModified": 1752783339,
"lastModified": 1752814804,
"narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7c78e592a895f2f1921f0024848fe193e2f8518e",
"rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"type": "github"
},
"original": {
@ -286,10 +234,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1752480373,
"lastModified": 1752687322,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"type": "github"
},
"original": {
@ -314,24 +263,9 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1752620740,
"narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
@ -348,47 +282,10 @@
"inputs": {
"darwin": "darwin",
"determinate": "determinate",
"helix": "helix",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728268235,
"narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -6,7 +6,7 @@
imports = [
./shell.nix
./fish.nix
./nushell.nix
./helix.nix
];
home.packages = with pkgs; [
@ -39,57 +39,6 @@
alejandra # nix formatting
];
programs.helix = {
enable = true;
package = pkgs.unstable.helix;
settings = {
theme = "catppuccin_macchiato";
editor = {
auto-format = false;
end-of-line-diagnostics = "warning";
bufferline = "multiple";
line-number = "relative";
inline-diagnostics = {
cursor-line = "error";
};
statusline = {
left = ["mode" "spinner" "spacer" "version-control" "file-name"];
};
file-picker = {
git-ignore = true;
};
lsp = {
display-inlay-hints = true;
display-messages = true;
};
cursor-shape.insert = "bar";
soft-wrap.enable = true;
};
keys = {
normal = {
C-right = "move_next_word_start";
C-left = "move_prev_word_end";
"=" = ":format";
space = {
F = "file_picker_in_current_buffer_directory";
};
};
insert = {
C-right = "move_next_word_start";
C-left = "move_prev_word_end";
};
};
};
};
programs.bat = {
enable = true;
};
@ -129,6 +78,7 @@
programs.zoxide = {
enable = true;
enableFishIntegration = true;
};
# home.stateVersion = "23.11";

View file

@ -14,8 +14,6 @@ in {
set -gx DEBEMAIL "tyler@tylermayoff.com"
fish_add_path $HOME/.local/bin
# fish_add_path /opt/homebrew/bin
# fish_add_path /opt/homebrew/opt/llvm@18/bin
if test -e $HOME/.config/fish/variables-$(hostname).fish
source $HOME/.config/fish/variables-$(hostname).fish
@ -23,8 +21,6 @@ in {
bind \cz 'fg 2>/dev/null; commandline -f repaint'
export GPG_TTY=$(tty)
zoxide init fish | source
'';
shellInit = ''

View file

@ -0,0 +1,9 @@
{...}: {
programs.ghostty = {
enable = true;
settings = {
theme = "dark:catppuccin-macchiato,light:catppuccin-latte";
};
};
}

View file

@ -1,6 +1,6 @@
{pkgs, ...}: {
imports = [
./kitty.nix
./ghostty.nix
];
home.packages = with pkgs; [

View file

@ -73,7 +73,7 @@
pane name="sidebar" {
command "env"
args "YAZI_CONFIG_HOME=~/.config/helide" "yazi"
size "20%"
size "15%"
}
pane command="hx"
}

View file

@ -0,0 +1,52 @@
{pkgs, ...}: {
programs.helix = {
enable = true;
package = pkgs.unstable.helix;
settings = {
theme = "base16_default";
editor = {
auto-format = false;
end-of-line-diagnostics = "warning";
bufferline = "multiple";
line-number = "relative";
inline-diagnostics = {
cursor-line = "error";
};
statusline = {
left = ["mode" "spinner" "spacer" "version-control" "file-name"];
};
file-picker = {
git-ignore = true;
};
lsp = {
display-inlay-hints = true;
display-messages = true;
};
cursor-shape.insert = "bar";
soft-wrap.enable = true;
};
keys = {
normal = {
C-right = "move_next_word_start";
C-left = "move_prev_word_end";
"=" = ":format";
space = {
F = "file_picker_in_current_buffer_directory";
};
};
insert = {
C-right = "move_next_word_start";
C-left = "move_prev_word_end";
};
};
};
};
}

View file

@ -1,11 +1,4 @@
{
# inputs,
# outputs,
# lib,
config,
# pkgs,
...
}: {
{config, ...}: {
systemd.user.services = {
daily_backup = {
Unit = {