From bf1825677bf32694235c337093b311fa080dded6 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 9 Jul 2019 15:48:29 -0700
Subject: fixups from groq patches

---
 common.nix   |  9 -------
 linux.nix    | 83 ++++++++++++++++++------------------------------------------
 packages.nix | 36 +-------------------------
 3 files changed, 25 insertions(+), 103 deletions(-)

diff --git a/common.nix b/common.nix
index 3310271..332b308 100644
--- a/common.nix
+++ b/common.nix
@@ -26,15 +26,6 @@ in
     keyboard.options = [ "caps:ctrl_modifier" ];
 
     file = {
-      mutt = {
-        text = (builtins.readFile ./muttrc) +
-          (builtins.readFile ./mutt/solarized.muttrc);
-        target = ".muttrc";
-      };
-      mailcap = {
-        source = ./mailcap;
-        target = ".mailcap";
-      };
       editorconfig = {
         source = ./editorconfig;
         target = ".editorconfig";
diff --git a/linux.nix b/linux.nix
index 7e606bc..4af1267 100644
--- a/linux.nix
+++ b/linux.nix
@@ -2,7 +2,7 @@
 
 let
   homedir = builtins.getEnv "HOME";
-  cmdtree = stdenv.mkDerivation {
+  cmdtree = pkgs.stdenv.mkDerivation {
     name = "cmdtree";
     src = fetchGit {
       url = "https://git.sr.ht/~jb55/cmdtree";
@@ -64,61 +64,55 @@ in
         source = ./mailcap;
         target = ".mailcap";
       };
-      tmux = {
-        source = ./tmux;
-        target = ".tmux.conf";
-      };
     };
 
     packages = with pkgs; [
-    gnupg
-    pinentry
-    pavucontrol
-    keybase-gui
-    cmdtree
-    bind
-    exercism
-    tmux
-    gnumake
-    dict
-    gopher
-    w3m
-    yank
+
     beets
+    bind
     blueman
-    busybox
+    cmdtree
+    dict
     dmenu
     dolphin
+    exercism
     feh
     flameshot
+    glibcLocales # rofi locale fix -- https://github.com/rycee/home-manager/issues/354#issuecomment-415914278
+    gnumake
+    gnupg
+    gopher
     hledger
     hledger-ui
     hledger-web
+    keybase-gui
     ledger
     libnotify
     minitube
+    mononoki
     mplayer
+    msmtp
     muchsync
     neomutt
     obs-studio
     pandoc
+    pasystray
+    pavucontrol
+    pdftk
+    pinentry
     qutebrowser
+    sqlite
     tdesktop
+    terminus
     texlive.combined.scheme-full
+    vlc
     xorg.xmodmap
     xournal
     xterm
-    msmtp
-sqlite
-terminus
-mononoki
-pasystray
-pdftk
-youtube-dl
-zoom-us
-    glibcLocales # rofi locale fix -- https://github.com/rycee/home-manager/issues/354#issuecomment-415914278
-    vlc
-    
+    yank
+    youtube-dl
+    zathura
+
     # languages i regularly use
     clojure
     ghc
@@ -369,35 +363,6 @@ zoom-us
       extraPackages = epkgs: import ./emacs-packages.nix { inherit epkgs; };
     };
 
-    git = {
-      enable = true;
-      userName  = "Ben Sima";
-      userEmail = "ben@bsima.me";
-      ignores = [ "*~" "*.swp" ];
-      package = pkgs.gitAndTools.gitFull;
-      signing = {
-        key = gpgid;
-        signByDefault = true;
-      };
-      aliases = {
-        authors = "shortlog -s -n";
-      };
-      extraConfig = ''
-        [push]
-        default = simple
-
-        [commit]
-        template = ${gitCommitTemplate}
-
-        [sendemail]
-        smtpuser = ben@bsima.me
-        smptserverport = 587
-        smptserver = mail.bsima.me
-        chainreplyto = false
-        composeencoding = UTF-8
-      '';
-    };
-
     firefox = {
       enable = true;
     };
diff --git a/packages.nix b/packages.nix
index 28e70a1..233f112 100644
--- a/packages.nix
+++ b/packages.nix
@@ -8,67 +8,33 @@ with pkgs;
 ag
 aspellDicts.en
 apvlv
-beets
-bind
-blueman
 cloc
-cmdtree
-dhall
-dict
-dmenu
-dolphin
 cloc
+dhall
 entr
 expect
 file
-flameshot
 font-awesome_5
-glibcLocales # rofi locale fix -- https://github.com/rycee/home-manager/issues/354#issuecomment-415914278
-gnumake
 gopher
-hledger
-hledger-ui
-hledger-web
 htop
 ispell
 jq
 lshw
 lsof
 material-icons
-minitube
 mononoki
-mplayer
-msmtp
-muchsync
 ncdu
 nix-prefetch-scripts
 pass
-pasystray
-pdftk
 pianobar
-qutebrowser
 ranger
 ripgrep
 shellcheck
-sqlite
-tdesktop
-terminus
-#texlive.combined.scheme-full
 tmux
-ranger
-ripgrep
-shellcheck
 tree
 unrar
 unzip
 urlscan
-vlc
 w3m
-xorg.xmodmap
-xournal
-xterm
-yank
-youtube-dl
-zathura
 zip
 ]
-- 
cgit v1.2.3