From b1f11c8684d396b3b5fbc315a957a2641022ebeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Fri, 4 Mar 2022 10:12:08 +0100
Subject: [PATCH] move duplicated setting to common.nix

---
 nixos/boxes/bootstrap/default.nix  |  2 --
 nixos/boxes/foureighty/default.nix |  2 --
 nixos/boxes/skinnyv/default.nix    |  1 -
 nixos/boxes/thinky/default.nix     |  2 +-
 nixos/common.nix                   |  1 +
 shell.nix                          | 26 +++++++++++++-------------
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/nixos/boxes/bootstrap/default.nix b/nixos/boxes/bootstrap/default.nix
index e334b791..54ed3a60 100644
--- a/nixos/boxes/bootstrap/default.nix
+++ b/nixos/boxes/bootstrap/default.nix
@@ -11,6 +11,4 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
   time.timeZone = "Europe/London";
-
-  fonts.fontconfig.enable = true;
 }
diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index 277c2196..7f588f8b 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -46,8 +46,6 @@
     enable = true;
   };
 
-  fonts.fontconfig.enable = true;
-
   home-manager.users.cyryl = { ... }: {
     imports = [
       ../../home-manager/programs/kitty.nix
diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix
index 41a94ae9..15405253 100644
--- a/nixos/boxes/skinnyv/default.nix
+++ b/nixos/boxes/skinnyv/default.nix
@@ -22,7 +22,6 @@
   time.timeZone = "Europe/London";
 
   services.thermald.enable = true;
-  fonts.fontconfig.enable = true;
   home-manager.users.cyryl = { ... }: {
     imports = [
       ../../home-manager/programs/kitty.nix
diff --git a/nixos/boxes/thinky/default.nix b/nixos/boxes/thinky/default.nix
index 20fc75b5..6dc11491 100644
--- a/nixos/boxes/thinky/default.nix
+++ b/nixos/boxes/thinky/default.nix
@@ -19,13 +19,13 @@
   time.timeZone = "Europe/Warsaw";
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
+  hardware.trackpoint.enable = true;
   services.thermald.enable = true;
   zramSwap = {
     enable = true;
     algorithm = "zstd";
     memoryPercent = 50;
   };
-  fonts.fontconfig.enable = true;
   home-manager.users.cyryl = { ... }: {
     imports = [
       ../../home-manager/programs/termite.nix
diff --git a/nixos/common.nix b/nixos/common.nix
index ed6978d0..ee28a0d3 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -50,6 +50,7 @@
     autoPrune.enable = true;
   };
 
+  fonts.fontconfig.enable = true;
   fonts.fonts = with pkgs; [ powerline-fonts weather-icons material-icons source-code-pro fira-code noto-fonts-emoji emojione iosevka font-awesome nerdfonts ];
 
   nix = {
diff --git a/shell.nix b/shell.nix
index 2e17b8f1..83f62865 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,16 @@
 let
-  nixpkgs = import <nixpkgs> {};
+  nixpkgs = import <nixpkgs> { };
 in
-  with nixpkgs;
-  stdenv.mkDerivation {
-    name = "legacy_shell";
-    buildInputs = [
-      (pkgs.writeShellScriptBin "nix-experimental" ''
-        exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
-      '')
-      cacert
-      git
-    ];
-    shellHook = ''
+with nixpkgs;
+stdenv.mkDerivation {
+  name = "legacy_shell";
+  buildInputs = [
+    (pkgs.writeShellScriptBin "nix-experimental" ''
+      exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
+    '')
+    cacert
+    git
+  ];
+  shellHook = ''
     '';
-  }
+}