diff options
| -rw-r--r-- | lib/common.nix | 1 | ||||
| -rw-r--r-- | lib/email.nix | 15 | ||||
| -rw-r--r-- | lib/linux.nix | 2 | ||||
| -rw-r--r-- | lib/packages.nix | 4 | ||||
| -rw-r--r-- | nixpkgs.nix | 4 |
5 files changed, 14 insertions, 12 deletions
diff --git a/lib/common.nix b/lib/common.nix index aafb1dc..56d422a 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -111,6 +111,7 @@ in glog = ''log --decorate --all --graph --pretty=format:"%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset" --abbrev-commit --date=relative''; }; extraConfig = { + fetch.showForcedUpdate = "false"; push.default = "simple"; pull.rebase = "true"; commit.template = "${./git-commit-template}"; diff --git a/lib/email.nix b/lib/email.nix index 831d52b..061cf46 100644 --- a/lib/email.nix +++ b/lib/email.nix @@ -19,7 +19,8 @@ in realName = "Ben Sima"; address = "ben@bsima.me"; userName = "ben@simatime.com"; - alot.sendMailCommand = "${homedir}/bin/sendmail"; + # alot is broken in nixpkgs 21.11 + #alot.sendMailCommand = "${homedir}/bin/sendmail"; imap = { host = "simatime.com"; port = 993; @@ -84,12 +85,12 @@ in extraConfig = builtins.readFile ./afew.ini; }; - alot = { - enable = true; - extraConfig = '' - theme = solarized_light - ''; - }; + #alot = { + # enable = true; + # extraConfig = '' + # theme = solarized_light + # ''; + #}; mbsync = { enable = true; diff --git a/lib/linux.nix b/lib/linux.nix index da783d4..62a5192 100644 --- a/lib/linux.nix +++ b/lib/linux.nix @@ -124,7 +124,7 @@ in sqlite tdesktop # texlive.combined.scheme-full - torbrowser + tor-browser-bundle-bin usbutils utillinux vlc diff --git a/lib/packages.nix b/lib/packages.nix index d3d134f..95d9d8e 100644 --- a/lib/packages.nix +++ b/lib/packages.nix @@ -56,7 +56,6 @@ let }; in { home.packages = [ - ag amfora asciinema aspellDicts.en @@ -91,8 +90,8 @@ in { material-icons mononoki mpc_cli - ncat ncdu + nmap ncmpc nix-prefetch-scripts nixos-generators @@ -113,6 +112,7 @@ in { ranger ripgrep shellcheck + silver-searcher tmux tree tut diff --git a/nixpkgs.nix b/nixpkgs.nix index dccb151..c40e80f 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,5 +1,5 @@ # generated with ~/bin/nixpkgs-pin { - url = "https://github.com/NixOS/nixpkgs/archive/fefb0df7d2ab2e1cabde7312238026dcdc972441.tar.gz"; - sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36"; + url = "https://github.com/NixOS/nixpkgs/archive/21.11.tar.gz"; + sha256 = "162dywda2dvfj1248afxc45kcrg83appjd0nmdb541hl7rnncf02"; } |