nix-config

commit e91b6175e7036b322d3001a556818bccbce4ff1b
parent 565860d64f4cfdaf06ee46c5ca03793cf23a2538
Author: GuyClicking <bpaul848@gmail.com>
Date:   Sun, 11 Jul 2021 19:35:31 +1000

i forgot to cleanly commit oops ill fix it next week maybe

Diffstat:
M
home/modules/dev/emacs/default.nix
 | 
4
----
M
home/modules/dev/git.nix
 | 
3
+++
M
home/modules/dev/haskell.nix
 | 
2
++
M
home/modules/terminal/alacritty.nix
 | 
2
+-
M
home/modules/terminal/zsh.nix
 | 
13
+++++++++++--
M
home/profiles/arch.nix
 | 
7
+++++--
M
nixos/laptop/configuration.nix
 | 
2
++

7 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/home/modules/dev/emacs/default.nix b/home/modules/dev/emacs/default.nix
@@ -11,10 +11,6 @@ with lib;
     programs.emacs = {
       enable = true;
       package = pkgs.emacsPgtkGcc;
-
-      extraPackages = epkgs: [
-        epkgs.gruvbox-theme
-      ];
     };
 
     services.emacs.enable = true;
diff --git a/home/modules/dev/git.nix b/home/modules/dev/git.nix
@@ -17,6 +17,9 @@ with lib;
         core = {
           askPass = "";
           autocrlf = "input";
+          excludesfile = ''
+              .ccls-cache
+            '';
         };
         github.user = "GuyClicking";
         help.autocorrect = 1;
diff --git a/home/modules/dev/haskell.nix b/home/modules/dev/haskell.nix
@@ -12,6 +12,8 @@ with lib;
     home.packages = with pkgs; [
       ghc
       haskell-language-server
+      hlint
+      ormolu
     ];
   };
 }
diff --git a/home/modules/terminal/alacritty.nix b/home/modules/terminal/alacritty.nix
@@ -58,7 +58,7 @@ in
 
       settings = {
         font = {
-          size = 9;
+          size = 10;
           normal = {
             family = config.alacritty.font;
             style = "Regular";
diff --git a/home/modules/terminal/zsh.nix b/home/modules/terminal/zsh.nix
@@ -14,6 +14,13 @@ in
       example = "nano";
       description = "The default editor, which is what \$EDITOR will be set to";
     };
+
+    aliases = mkOption {
+      type = types.attrsOf types.string;
+      default = {};
+      example = { a = "echo hello" };
+      description = "Attrset of aliases";
+    };
   };
 
   config = mkIf config.zsh.enable {
@@ -64,9 +71,11 @@ in
       };
 
       initExtra = ''
-        #. ~/.nix-profile/etc/profile.d/nix.sh
+        . ~/.nix-profile/etc/profile.d/nix.sh
+
+        #any-nix-shell zsh --info-right | source /dev/stdin
 
-        any-nix-shell zsh --info-right | source /dev/stdin
+        PATH=$PATH:$HOME/.local/scripts:$HOME/.local/bin
 
         # From the fzf wiki
         fd() {
diff --git a/home/profiles/arch.nix b/home/profiles/arch.nix
@@ -12,14 +12,14 @@ in
     ../themes/gruvbox
   ];
 
-  home.file = scripts;
-
   alacritty = {
     enable = true;
     font = "Hack Nerd Font";
   };
+  programs.alacritty.package = pkgs.hello;
   c.enable = true;
   dunst.enable = true;
+  emacs.enable = true;
   haskell.enable = true;
   latex.enable = true;
   polybar.enable = true;
@@ -35,6 +35,9 @@ in
       exec bspwm
     '';
   };
+  zsh.aliases = {
+    nrh = "nix run .#arch"; # nrh is nix run homemanager
+  };
 
   home.packages = [
     # packages
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix
@@ -18,6 +18,8 @@
     '';
   };
 
+  documentation.nixos.enable = false;
+
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;