dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some file cleaning

Browse source
This commit is contained in:
Dustin Swan 2020-08-09 16:15:03 -04:00
parent d9825062e0
commit 02a52c489f
No known key found for this signature in database
GPG key ID: AB49BD6B2B3A6377
4 changed files with 66 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

73
home-common.nix → home-cli.nix
View file

@ -2,7 +2,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
ripgrep fd wget silver-searcher tree ranger nodejs-13_x yarn mosh w3m urlview nmap tuir gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr ffsend du-dust duplicati python3 ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh w3m urlview nmap tuir gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr ffsend du-dust duplicati python3 bitwarden-cli
]; ];
home.sessionVariables = { home.sessionVariables = {
@ -19,66 +19,6 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
# programs.alacritty = {
# enable = true;
# settings = {
# window = {
# padding = {
# x = 12;
# y = 12;
# };
# dimentions = {
# columns = 0;
# lines = 0;
# };
# };
# font = {
# normal.family = "Iosevka Nerd Font";
# bold.family = "Iosevka Nerd Font";
# italic.family = "Iosevka Nerd Font";
# size = 16.0;
# };
# key_bindings = [
# {
# key = "N";
# mods = "Control|Shift";
# action = "SpawnNewInstance";
# }
# ];
# background_opacity = 0.95;
# colors = { # Nord
# primary = {
# background = "0x2E3440";
# foreground = "0xD8DEE9";
# };
# cursor = {
# text = "0x2E3440";
# cursor = "0xD8DEE9";
# };
# normal = {
# black = "0x3B4252";
# red = "0xBF616A";
# green = "0xA3BE8C";
# yellow = "0xEBCB8B";
# blue = "0x81A1C1";
# magenta = "0xB48EAD";
# cyan = "0x88C0D0";
# white = "0xE5E9F0";
# };
# bright = {
# black = "0x4C566A";
# red = "0xBF616A";
# green = "0xA3BE8C";
# yellow = "0xEBCB8B";
# blue = "0x81A1C1";
# magenta = "0xB48EAD";
# cyan = "0x8FBCBB";
# white = "0xECEFF4";
# };
# };
# };
# };
programs.tmux = { programs.tmux = {
enable = true; enable = true;
shortcut = "a"; shortcut = "a";
@ -110,7 +50,6 @@
}; };
programs.zsh = { programs.zsh = {
# programs.fish = { # fish and home-manager don't work yet
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
oh-my-zsh = { oh-my-zsh = {
@ -139,7 +78,6 @@
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
# enableFishIntegration = true;
}; };
programs.fzf = { programs.fzf = {
@ -149,13 +87,11 @@
defaultOptions = [ "--height 40%" "--border" "--ansi" ]; defaultOptions = [ "--height 40%" "--border" "--ansi" ];
fileWidgetCommand = "fd --type file --color=always"; fileWidgetCommand = "fd --type file --color=always";
fileWidgetOptions = [ "--min-height 30 --preview-window noborder --preview '(bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}) 2> /dev/null'" ]; fileWidgetOptions = [ "--min-height 30 --preview-window noborder --preview '(bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}) 2> /dev/null'" ];
# enableFishIntegration = true;
}; };
programs.broot = { programs.broot = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
# enableFishIntegration = true;
}; };
programs.ssh = { programs.ssh = {
@ -189,6 +125,7 @@
}; };
programs.emacs.enable = true; programs.emacs.enable = true;
programs.neovim = { programs.neovim = {
enable = true; enable = true;
viAlias = true; viAlias = true;
@ -268,10 +205,10 @@
programs.htop.enable = true; programs.htop.enable = true;
programs.mpv.enable = true; programs.mpv.enable = true;
programs.jq.enable = true; programs.jq.enable = true;
programs.keychain = { programs.keychain = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
# enableFishIntegration = true; # uhoh, this doesn't exist yet either
inheritType = "any"; inheritType = "any";
agents = ["gpg" "ssh"]; agents = ["gpg" "ssh"];
keys = ["id_rsa" "2B3A6377"]; keys = ["id_rsa" "2B3A6377"];
@ -286,8 +223,4 @@
# ttrss-passwordeval "gpg -dq ~/.dustinswan@tt-rss.dustinswan.com.gpg" # ttrss-passwordeval "gpg -dq ~/.dustinswan@tt-rss.dustinswan.com.gpg"
# ''; # '';
# }; # };
# programs.qutebrowser = {
# enable = true;
# };
} }

61
home-gui.nix Normal file
View file

@ -0,0 +1,61 @@
{
programs.alacritty = {
enable = true;
settings = {
window = {
padding = {
x = 12;
y = 12;
};
dimentions = {
columns = 0;
lines = 0;
};
};
font = {
normal.family = "Iosevka Nerd Font";
bold.family = "Iosevka Nerd Font";
italic.family = "Iosevka Nerd Font";
size = 16.0;
};
key_bindings = [
{
key = "N";
mods = "Control|Shift";
action = "SpawnNewInstance";
}
];
background_opacity = 0.95;
colors = { # Nord
primary = {
background = "0x2E3440";
foreground = "0xD8DEE9";
};
cursor = {
text = "0x2E3440";
cursor = "0xD8DEE9";
};
normal = {
black = "0x3B4252";
red = "0xBF616A";
green = "0xA3BE8C";
yellow = "0xEBCB8B";
blue = "0x81A1C1";
magenta = "0xB48EAD";
cyan = "0x88C0D0";
white = "0xE5E9F0";
};
bright = {
black = "0x4C566A";
red = "0xBF616A";
green = "0xA3BE8C";
yellow = "0xEBCB8B";
blue = "0x81A1C1";
magenta = "0xB48EAD";
cyan = "0x8FBCBB";
white = "0xECEFF4";
};
};
};
};
}

2
home-linux.nix
View file

@ -207,7 +207,7 @@ xsetroot -solid black -cursor_name left_ptr
}; };
}; };
imports = [ ./home-common.nix ./home-mail.nix ]; imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
programs.alacritty.settings.font.size = 10.0; programs.alacritty.settings.font.size = 10.0;
} }

2
home-mac.nix
View file

@ -15,5 +15,5 @@
programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh"; programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
# programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh"; # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";
imports = [ ./home-common.nix ./home-mail.nix ]; imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
} }