nix-config

commit 9e227f80e33b8f7bee7f582c5846befb87e82142
parent 78481e89d61349bc57bc5b51b4daa31e480b2701
Author: benjamin paul <bpaul@bpaul.xyz>
Date:   Thu,  1 Jul 2021 17:29:59 +1000

Git configuration

Diffstat:
M
home/modules/dev/git.nix
 | 
3
+++
M
home/profiles/arch.nix
 | 
3
++-
M
home/profiles/laptop.nix
 | 
4
+++-
A
home/themes/tokyo-dark/default.nix
 | 
81
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

4 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/home/modules/dev/git.nix b/home/modules/dev/git.nix
@@ -22,7 +22,10 @@ with lib;
 
       extraConfig = {
         askPass = "";
+        core.autocrlf = "input";
         github.user = "GuyClicking";
+        help.autocorrect = 1;
+        init.defaultBranch = "main";
       };
     };
   };
diff --git a/home/profiles/arch.nix b/home/profiles/arch.nix
@@ -21,6 +21,8 @@ in {
     font = "Hack Nerd Font";
   };
   dunst.enable = true;
+  git.enable = true;
+  haskell.enable = true;
   neovim.enable = true;
   polybar.enable = true;
   starship.enable = true;
@@ -47,7 +49,6 @@ in {
     pkgs.ccls
     pkgs.fzf
     pkgs.gcc
-    pkgs.haskell-language-server
     pkgs.i3lock-color
     pkgs.manpages
     pkgs.texlab
diff --git a/home/profiles/laptop.nix b/home/profiles/laptop.nix
@@ -18,6 +18,7 @@ in {
 
   alacritty.enable = true;
   dunst.enable = true;
+  git.enable = true;
   idris2.enable = true;
   neovim.enable = true;
   polybar.enable = true;
@@ -28,7 +29,9 @@ in {
     enable = true;
     config = ''
       [[ -f ~/.Xresources ]] && xrdb -merge -I$HOME .Xresources
+
       . ~/.xprofile
+
       exec bspwm
     '';
   };
@@ -45,7 +48,6 @@ in {
     pkgs.gcc
     pkgs.i3lock-color
     pkgs.manpages
-    pkgs.rlwrap
     pkgs.texlab
     pkgs.tree-sitter
   ];
diff --git a/home/themes/tokyo-dark/default.nix b/home/themes/tokyo-dark/default.nix
@@ -0,0 +1,81 @@
+{ pkgs, ... }:
+
+let
+  red1 = "#cc241d";
+  red2 = "#fb4934";
+
+  green1 = "#98971a";
+  green2 = "#b8bb26";
+
+  yellow1 = "#d79921";
+  yellow2 = "#fabd24";
+
+  blue1 = "#458588";
+  blue2 = "#83a598";
+
+  magenta1 = "#b16286";
+  magenta2 = "#d3869b";
+
+  cyan1 = "#689d6a";
+  cyan2 = "#8ec07c";
+
+  grey1 = "#a89984";
+  grey2 = "#928374";
+
+  orange1 = "#d65d0e";
+  orange2 = "#fe8019";
+
+  bg0 = "#11121d";
+  bg1 = "#1a1b2a";
+  bg2 = "#212234";
+  bg3 = "#392b41";
+  bg4 = "#4a5057";
+  bg5 = "#282c34";
+
+  fg = "#a0a8cd";
+in
+{
+  home.stateVersion = "20.09";
+
+  imports = [ ../../modules ];
+
+  alacritty.colours = {
+    bg = bg0_h;
+    fg = fg0;
+
+    black = bg0_h;
+    black-bright = grey2;
+
+    red = red1;
+    red-bright = red2;
+
+    green = green1;
+    green-bright = green2;
+
+    yellow = yellow1;
+    yellow-bright = yellow2;
+
+    blue = blue1;
+    blue-bright = blue2;
+
+    magenta = magenta1;
+    magenta-bright = magenta2;
+
+    cyan = cyan1;
+    cyan-bright = cyan2;
+
+    white = grey1;
+    white-bright = fg1;
+  };
+
+  polybar.colours = {
+    background = bg0_h;
+    background-alt = bg2;
+    foreground = fg0;
+    foreground-alt = fg4; # bg4?
+    alert = red2;
+    wm-underline = yellow1;
+    date-underline = yellow1;
+    battery-underline = yellow1;
+  };
+}