dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaning

Browse Source
This commit is contained in:
Dustin Swan
2022-01-17 20:44:22 -05:00
parent 6a9e573731
commit 1ce213f818
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
home-cli.nix
View File

@@ -4,8 +4,15 @@ let
secrets = import ./secrets.nix; secrets = import ./secrets.nix;
in in
{ {
home.packages = with pkgs; [ # pastel magic-wormhole home.packages = with pkgs; [
ripgrep fd wget nodejs yarn cargo mosh w3m nnn urlview gnupg hexyl httpie cacert catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora ghc ocaml weechat deno duf procs ripgrep fd wget mosh w3m nnn urlview gnupg hexyl httpie catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora weechat duf procs pandoc magic-wormhole pastel fx
nodejs deno yarn nodePackages.stylelint nodePackages.js-beautify
ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
# racket-minimal
rustc
ghc cargo haskell-language-server hlint haskellPackages.hoogle # haskellPackages.cabal
nixfmt shellcheck fontconfig cmigemo cacert
emacsPackages.fontawesome emacs-all-the-icons-fonts
ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
]; ];
@@ -54,16 +61,11 @@ in
enableAliases = true; enableAliases = true;
}; };
programs.zoxide = { programs.zoxide = { # z doc -> cd ~/Documents; zi -> interactive
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
# programs.atuin = {
# enable = true;
# enableZshIntegration = true;
# };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
@@ -74,6 +76,7 @@ in
shellAliases = { shellAliases = {
l = "exa -lah --icons --git"; l = "exa -lah --icons --git";
n = "nnn"; n = "nnn";
h = "himalaya";
er = "rm -rf logs; unzip -o"; er = "rm -rf logs; unzip -o";
srsync = "rsync --rsync-path='sudo rsync'"; srsync = "rsync --rsync-path='sudo rsync'";
}; };
@@ -89,7 +92,7 @@ in
enableZshIntegration = true; enableZshIntegration = true;
}; };
programs.fzf = { programs.fzf = { # ctrl-t, ctrl-r, ssh **<tab>
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
defaultCommand = "fd --type file --color=always"; defaultCommand = "fd --type file --color=always";
@@ -98,6 +101,11 @@ in
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'" ];
}; };
programs.navi = { # ctrl-G
enable = true;
enableZshIntegration = true;
};
programs.ssh = { programs.ssh = {
enable = true; enable = true;
matchBlocks = { matchBlocks = {
@@ -226,11 +234,6 @@ in
} }
]; ];
extraConfig = '' extraConfig = ''
" set expandtab " insert spaces when tab is pressed
" set tabstop=2
" set softtabstop=2
" set shiftwidth=2
set hidden set hidden
set number set number
set ignorecase set ignorecase

25
home-mac.nix
View File

@@ -3,21 +3,18 @@
{ {
home.packages = with pkgs; [ pinentry_mac terminal-notifier syncthing ]; home.packages = with pkgs; [ pinentry_mac terminal-notifier syncthing ];
home.file.gpg-agent = { # home.file.gpg-agent = {
target = ".gnupg/gpg-agent.conf"; # target = ".gnupg/gpg-agent.conf";
text = '' # text = ''
default-cache-ttl 86400 # default-cache-ttl 86400
max-cache-ttl 86400 # max-cache-ttl 86400
''; # '';
}; # };
home.file.gitignore = { # home.file.gitignore = {
target = ".gitignore"; # target = ".gitignore";
text = ''Library''; # text = ''Library'';
}; # };
programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
# programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";
imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ]; imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
} }