From 71f7fe8c92eb3e39adc13db5ebdc5f4e5a3bb702 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 23 Sep 2018 20:27:11 -0400 Subject: pincer changes --- config/common.nix | 5 +++++ config/desktop.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/common.nix b/config/common.nix index fbfe28f..0c21940 100644 --- a/config/common.nix +++ b/config/common.nix @@ -4,6 +4,11 @@ programs.zsh.enable = true; programs.tmux.enable = true; + nixpkgs.config.packageOverrides = pkgs: { + libsignal-protocol-c = pkgs.callPackage ../pkgs/libsignal-c/default.nix { }; + keycloak = pkgs.callPackage ../pkgs/keycloak/default.nix { }; + }; + environment.shellAliases = { vim = "nvim"; }; diff --git a/config/desktop.nix b/config/desktop.nix index e0571da..1f509a7 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -30,7 +30,8 @@ }; fonts = { - fonts = [ pkgs.fira-code ]; + enableDefaultFonts = true; + fonts = [ pkgs.fira-code pkgs.dejavu_fonts pkgs.steamPackages.steam-fonts ]; }; environment.systemPackages = with pkgs; [ -- cgit v1.2.3