Add packages from home-manager

3 files changed, 67 insertions, 21 deletions

diff --git a/modules/builder.nix b/modules/builder.nix
index f4615ab..fb0740a 100644
--- a/modules/builder.nix
+++ b/modules/builder.nix
@@ -21,8 +21,8 @@ in
     }] ;
     nix.distributedBuilds = true;
     # optional, useful when the builder has a faster internet connection than yours
-    nix.extraOptions = ''
-    builders-use-substitutes = true
-    '';
+    # nix.extraOptions = ''
+    # builders-use-substitutes = true
+    # '';
   };
 }
diff --git a/modules/common.nix b/modules/common.nix
index ae50055..49e376c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -8,25 +8,61 @@
     keycloak = pkgs.callPackage ../pkgs/keycloak/default.nix { };
   };
 
-  environment.shellAliases = {
-    vim = "nvim";
-  };
+  # TODO: replace with programs.neovim.enable
+  nixpkgs.overlays = [
+    (final: prev: {
+      neovim = prev.neovim.override {
+        viAlias = true;
+        vimAlias = true;
+      };
+    })
+  ];
+  environment.variables.EDITOR = "${pkgs.neovim}/bin/nvim";
+
   environment.systemPackages = with pkgs; [
+    bat
+    bwm_ng
+    clang
+    coreutils
+    direnv
     dnsutils
+    emacs
+    exa
+    fd
+    fzf
     git
+    gitFull
     gnupg
     haskellPackages.hledger
+    hledger
     htop
+    iotop
+    ledger
+    moreutils
     mosh
+    most
     neovim
+    nix-index
+    p7zip
     pass
+    ripgrep
+    rustup
     silver-searcher
-    whois
-    unzip
-    p7zip
+    sqlite
+    stow
     unrar
-    iotop
-    moreutils
+    unzip
+    whois
+    zoxide
+    (rWrapper.override {
+      packages = with rPackages; [
+        data_table
+        ggplot2
+        hms
+        viridis
+        lubridate
+      ];
+    })
   ];
   time.timeZone = "America/New_York";
 
diff --git a/modules/desktop.nix b/modules/desktop.nix
index d15d906..5219e44 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -52,27 +52,39 @@ in
     };
 
     environment.systemPackages = with pkgs; [
+      (conky.override { pulseSupport = true; })
+      anki
+      autorandr
       chromium
+      discord
       dmenu
+      dzen2 
       emacs
-      firefox
+      ffmpeg
+      firefox-bin
       haskellPackages.xmobar
+      hledger
+      hledger-ui
+      imagemagick
+      iw
+      ledger
+      networkmanagerapplet
+      nix-index
       pavucontrol
+      rofi
       rxvt_unicode-with-plugins
+      signal-desktop
       sshfsFuse
+      synergy
       trayer
-      (conky.override { pulseSupport = true; })
+      vlc
+      wirelesstools
       xbindkeys
       xorg.xbacklight
       xorg.xev
       xscreensaver
       xsel  # used by urxvt clipboard
       xss-lock
-      networkmanagerapplet
-      imagemagick
-      dzen2 
-      rofi
-      autorandr
     ];
 
     i18n.inputMethod = {
@@ -89,9 +101,7 @@ in
         # xkbVariant = "dvorak";
         xkbOptions = "caps:ctrl_modifier";
 
-        # desktopManager.plasma5 = {
-        #   enable = true;
-        # };
+        desktopManager.plasma5 = { enable = true; };
 
         windowManager.xmonad = {
           enable = true;