From 27d3e5ab95a17f33c9ebff2fdccaf3e7be22deef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 19 Apr 2020 12:23:21 +0100
Subject: [PATCH] fix lsd output, refactor

---
 nixos/common.nix             |  2 +-
 nixos/home-common.nix        | 28 ++++++++++++++++++++++++++++
 nixos/home-other-os.nix      | 16 +---------------
 nixos/home.nix               | 17 +----------------
 nixos/programs/alacritty.nix |  2 +-
 5 files changed, 32 insertions(+), 33 deletions(-)
 create mode 100644 nixos/home-common.nix

diff --git a/nixos/common.nix b/nixos/common.nix
index e349567d..1b3d6dfc 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -50,7 +50,7 @@ in
         autoPrune.enable = true;
       };
 
-      fonts.fonts = with pkgs; [ powerline-fonts weather-icons material-icons source-code-pro fira-code noto-fonts-emoji emojione iosevka font-awesome ];
+      fonts.fonts = with pkgs; [ powerline-fonts weather-icons material-icons source-code-pro fira-code noto-fonts-emoji emojione iosevka font-awesome nerdfonts ];
 
       services.haveged.enable = true;
 
diff --git a/nixos/home-common.nix b/nixos/home-common.nix
new file mode 100644
index 00000000..a04e9967
--- /dev/null
+++ b/nixos/home-common.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+{
+  home.sessionVariables = {
+    LC_ALL="en_GB.UTF-8";
+    LANG="en_GB.UTF-8";
+    TERMINAL="alacritty";
+    CM_LAUNCHER="rofi";
+    PASSWORD_STORE_ENABLE_EXTENSIONS="true";
+  };
+
+  news.display = "show";
+
+  fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [ nerdfonts ];
+
+  imports = [
+    ./programs/tmux.nix
+    ./programs/zsh.nix
+    ./programs/vim.nix
+    ./programs/alacritty.nix
+    ./programs.nix
+    ./links.nix
+    ./cli.nix
+    ./i3/home.nix
+  ];
+
+}
diff --git a/nixos/home-other-os.nix b/nixos/home-other-os.nix
index 419326c7..98edfff9 100644
--- a/nixos/home-other-os.nix
+++ b/nixos/home-other-os.nix
@@ -14,25 +14,11 @@ in
       };
     };
 
-    home.sessionVariables = {
-      PASSWORD_STORE_ENABLE_EXTENSIONS="true";
-      LC_ALL="en_GB.UTF-8";
-      LANG="en_GB.UTF-8";
-    };
-
-    news.display = "show";
     targets.genericLinux.enable = true;
     home.file.".gitconfig".source = ~/dev/dotfiles/.gitconfig.linux.form3;
     home.file.".config/i3/status.toml".source = ~/dev/dotfiles/.config/i3/status-single-bat.toml;
 
     imports = [
-      ./programs/tmux.nix
-      ./programs/zsh.nix
-      ./programs/vim.nix
-      ./programs/alacritty.nix
-      ./programs.nix
-      ./links.nix
-      ./cli.nix
-      ./i3/home.nix
+      ./home-common.nix
     ];
   }
diff --git a/nixos/home.nix b/nixos/home.nix
index 11e29b57..fe2e39e4 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -14,27 +14,12 @@ in
       };
     };
 
-    home.sessionVariables = {
-      TERMINAL="alacritty";
-      CM_LAUNCHER="rofi";
-      PASSWORD_STORE_ENABLE_EXTENSIONS="true";
-    };
-
-    news.display = "show";
     home.file.".config/i3/status.toml".source = ~/dev/dotfiles/.config/i3/status-double-bat.toml;
 
     imports = [
-      ./programs/tmux.nix
-      ./programs/zsh.nix
-      ./programs/alacritty.nix
+      ./home-common.nix
       ./programs/git.nix
-      ./programs/vim.nix
-      ./programs.nix
-      ./links.nix
-      ./cli.nix
       ./gui.nix
-      ./i3/home.nix
     ];
 
-
   }
diff --git a/nixos/programs/alacritty.nix b/nixos/programs/alacritty.nix
index 4d61c5be..16a98683 100644
--- a/nixos/programs/alacritty.nix
+++ b/nixos/programs/alacritty.nix
@@ -14,7 +14,7 @@
       tabspaces = 4;
 
       font = {
-        family = "Fira Code";
+        family = "Fira Code Nerd Font";
         size = 8;
       };