1 files changed, 14 insertions, 21 deletions

diff --git a/lib/common.nix b/lib/common.nix
index cdbbf6e..247a81e 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -1,11 +1,9 @@
 { pkgs, lib, ... }:
 
 let
+  inherit (import ./const.nix) fontSize homedir gpgid;
   locale = "en_US.UTF-8";
-  gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
-  homedir = builtins.getEnv "HOME";
-in
-{
+in {
   nixpkgs.overlays = [ (import ../overlay.nix) ];
   home = {
     stateVersion = "18.09";
@@ -17,7 +15,6 @@ in
       LANGUAGE = locale;
       PATH = "${homedir}/bin:${homedir}/.local/bin:$PATH";
       PAGER = "less"; # "bat --theme=ansi";
-      LEDGER_FILE = "${homedir}/.hledger.journal";
       XTERM_LOCALE = locale;
       PYTHONSTARTUP = "${homedir}/.pythonrc";
 
@@ -48,14 +45,6 @@ in
         source = ./editorconfig;
         target = ".editorconfig";
       };
-      hledger = {
-        source = builtins.toFile "hledger.journal" ''
-          !include ${homedir}/org/fund/accounts.journal
-          !include ${homedir}/org/fund/ledger.journal
-          !include ${homedir}/org/fund/prices.journal
-        '';
-        target = ".hledger.journal";
-      };
       pythonrc = {
         source = ./pythonrc;
         target = ".pythonrc";
@@ -119,13 +108,16 @@ 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}";
         commit.verbose = "true";
-        mergetool.fugitive.cmd = ''vim -f -c "Gvdiffsplit!" "$MERGED"'';
+        fetch.showForcedUpdate = "false";
+        init.defaultBranch = "main";
+        log.date = "local";
         merge.tool = "fugitive";
+        mergetool.fugitive.cmd = ''vim -f -c "Gvdiffsplit!" "$MERGED"'';
+        pull.rebase = "true";
+        push.default = "current";
+        remote.pushDefault = "origin";
         sendemail = {
           #smtpuser = "ben@bsima.me";
           #smtpserverport = 587;
@@ -135,9 +127,7 @@ in
           annotate = "yes";
           cccmd = "git-contacts";
         };
-        log = {
-          date = "local";
-        };
+
       };
     };
 
@@ -208,6 +198,7 @@ in
         set -g status-left-length 30
         set -g status-left '#S | #(whoami)@#(hostname) | '
         set -g status-right '~%Y.%m.%d..%H.%M'
+        set -g renumber-windows on
         # white-ish background with dark-grey text
         set -g status-style bg=colour0,fg=colour13
         # highlight current window
@@ -227,7 +218,9 @@ in
     urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in {
       enable = true;
       fonts = [
-        (font 6)
+        # for some reason, urxvt font size is much larger than every other
+        # program's, so i gotta cut it in half
+        (font (fontSize / 2))
         "xft:Noto Emoji"
       ];
       keybindings = {