From 74057adf63bdb62de556883700705e343c534904 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Sun, 14 Apr 2019 16:43:10 -0400 Subject: [PATCH] Sharing more linux and mac pkgs --- home-common.nix | 10 ++++++++-- home-linux.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/home-common.nix b/home-common.nix index de715ee..1f06881 100644 --- a/home-common.nix +++ b/home-common.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ - bat + bat wget silver-searcher tree ranger nodejs yarn mu mosh newsboat msmtp w3m urlview nmap rtv gnupg youtube-dl mpv alacritty ]; home.sessionVariables = { @@ -83,6 +83,10 @@ weather = "curl http://wttr.in"; er = "rm -rf logs; unzip -o"; }; + # for MacOS + initExtra = '' + source ~/.nix-profile/etc/profile.d/nix.sh + ''; }; programs.fzf = { @@ -116,9 +120,11 @@ userEmail = "dustin@dustinswan.com"; signing = { signByDefault = true; - key = "2B3A6377"; + key = "AD11750151C10881970BD943AB49BD6B2B3A6377"; }; aliases = { + s = "status"; + a = "add"; lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"; }; }; diff --git a/home-linux.nix b/home-linux.nix index 8c954ee..3cb5d53 100644 --- a/home-linux.nix +++ b/home-linux.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - home.packages = with pkgs; [ wget clipit ncmpcpp pandoc silver-searcher tree unzip wirelesstools xcape xsel anki pavucontrol ranger blueman gifsicle networkmanager paprefs steam mpv nnn nodejs pinentry vlc gnupg nitrogen alacritty wine tldr yarn spotify signal-desktop mu mosh ispell google-chrome emacs-all-the-icons-fonts gnupg python3 python37Packages.pip veracrypt bashmount exfat exfat-utils neofetch toot rtv newsboat neomutt i3lock-pixeled nmap p4v killall calc cargo cava diceware magic-wormhole msmtp xorg.xmodmap zip youtube-dl cacert dropbox-cli keepassx2 w3m wireshark-qt khard khal vdirsyncer slack riot-web retroarch ipfs gimp blender urlview + home.packages = with pkgs; [ clipit ncmpcpp pandoc unzip wirelesstools xcape xsel anki pavucontrol blueman gifsicle networkmanager paprefs steam pinentry vlc nitrogen wine yarn spotify signal-desktop ispell google-chrome emacs-all-the-icons-fonts python3 python37Packages.pip veracrypt bashmount exfat exfat-utils neomutt i3lock-pixeled p4v killall calc cargo cava diceware magic-wormhole xorg.xmodmap zip cacert dropbox-cli keepassx2 wireshark-qt vdirsyncer slack riot-web retroarch gimp blender khal khard ]; services.mpd = {