Rearranging. Switching from FZF to Television. Git settings. Fixing bitwarden-cli while upstream is broken. Changing the stateVersion bc I upgraded my computer... am I supposed to do this?
This commit is contained in:
parent
6c19bdc0be
commit
15718e689e
1 changed files with 30 additions and 16 deletions
46
home-cli.nix
46
home-cli.nix
|
|
@ -5,7 +5,7 @@ let
|
||||||
nixvim = import (builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; });
|
nixvim = import (builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; });
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home.stateVersion = "18.09";
|
home.stateVersion = "24.11";
|
||||||
|
|
||||||
home.username = "dustinswan";
|
home.username = "dustinswan";
|
||||||
home.homeDirectory = "/Users/dustinswan";
|
home.homeDirectory = "/Users/dustinswan";
|
||||||
|
|
@ -22,9 +22,19 @@ in
|
||||||
./home-nvim.nix
|
./home-nvim.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Remove when bitwarden-cli is fixed upstream
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/339576#issuecomment-2574076670
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: { bitwarden-cli = prev.bitwarden-cli.overrideAttrs (oldAttrs: { nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ prev.llvmPackages_18.stdenv.cc ]; stdenv = prev.llvmPackages_18.stdenv; }); })
|
||||||
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
supabase-cli
|
supabase-cli
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
awscli2
|
||||||
|
claude-code
|
||||||
|
aider-chat
|
||||||
|
pandoc
|
||||||
fd
|
fd
|
||||||
ngrok
|
ngrok
|
||||||
ddev
|
ddev
|
||||||
|
|
@ -69,6 +79,7 @@ in
|
||||||
catppuccin = {
|
catppuccin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
flavor = "mocha";
|
flavor = "mocha";
|
||||||
|
zed.flavor = "latte"; # TODO waiting for auto
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
@ -102,17 +113,6 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.eza = {
|
|
||||||
enable = true;
|
|
||||||
enableFishIntegration = true;
|
|
||||||
git = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.zoxide = {
|
|
||||||
enable = true;
|
|
||||||
enableFishIntegration = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [
|
plugins = [
|
||||||
|
|
@ -143,7 +143,20 @@ in
|
||||||
|
|
||||||
programs.direnv.enable = true;
|
programs.direnv.enable = true;
|
||||||
programs.starship.enable = true;
|
programs.starship.enable = true;
|
||||||
programs.fzf.enable = true;
|
programs.television.enable = true;
|
||||||
|
programs.zoxide.enable = true;
|
||||||
|
programs.bat.enable = true;
|
||||||
|
programs.ripgrep.enable = true;
|
||||||
|
|
||||||
|
programs.eza = {
|
||||||
|
enable = true;
|
||||||
|
git = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.tealdeer = {
|
||||||
|
enable = true;
|
||||||
|
settings.updates.auto_update = true;
|
||||||
|
};
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -199,16 +212,17 @@ in
|
||||||
key = "AD11750151C10881970BD943AB49BD6B2B3A6377";
|
key = "AD11750151C10881970BD943AB49BD6B2B3A6377";
|
||||||
};
|
};
|
||||||
delta.enable = true;
|
delta.enable = true;
|
||||||
|
extraConfig = {
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.gitui.enable = true;
|
programs.gitui.enable = true;
|
||||||
programs.bat.enable = true;
|
|
||||||
programs.gpg.enable = true;
|
programs.gpg.enable = true;
|
||||||
programs.ripgrep.enable = true;
|
|
||||||
|
|
||||||
programs.keychain = {
|
programs.keychain = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
|
||||||
inheritType = "any";
|
inheritType = "any";
|
||||||
agents = [ "gpg" "ssh" ];
|
agents = [ "gpg" "ssh" ];
|
||||||
keys = [ "id_rsa" "id_rsa_mr" "2B3A6377" ];
|
keys = [ "id_rsa" "id_rsa_mr" "2B3A6377" ];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue