From ad486191bc0c8aa919c357d437951c0a42d5718d Mon Sep 17 00:00:00 2001
From: Grigory Shipunov
Date: Sun, 10 Jul 2022 03:00:29 +0200
Subject: flake update, nixpkgs-fmt, add extra redirect to dd-ix.net

---
 modules/basic-tools.nix   |  8 ++++++--
 modules/binary-caches.nix | 16 ++++------------
 modules/graphical.nix     |  3 ++-
 3 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'modules')

diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index 4e8cf58..9783c8e 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [
     bat
-    exa
+    lsd
     fd
     file
     fzf
@@ -27,7 +27,6 @@
   ];
 
   nix = {
-    package = pkgs.nixUnstable;
     autoOptimiseStore = true;
     extraOptions = ''
       experimental-features = nix-command flakes
@@ -51,6 +50,11 @@
   };
 
   environment.shellAliases = {
+    ls = "lsd";
+    l = "lsd -l";
+    la = "lsd -la";
+    ll = "lsd -lah";
+    lt = "lsd --tree";
     vim = "nvim";
     vi = "nvim";
     vf = "$EDITOR $(fzf)";
diff --git a/modules/binary-caches.nix b/modules/binary-caches.nix
index 373e653..5fd15d9 100644
--- a/modules/binary-caches.nix
+++ b/modules/binary-caches.nix
@@ -4,17 +4,6 @@
       builders-use-substitutes = true
     '';
 
-    registry.microvm = {
-      from = {
-        type = "indirect";
-        id = "microvm";
-      };
-      to = {
-        type = "github";
-        owner = "astro";
-        repo = "microvm.nix";
-      };
-    };
     settings = {
       trusted-users = [
         "grue"
@@ -24,16 +13,19 @@
         "https://microvm.cachix.org"
         "https://nix-serve.hq.c3d2.de"
         "https://dump-dvb.cachix.org"
+        "https://nix-community.cachix.org"
       ];
       trusted-substituters = [
         "https://microvm.cachix.org"
-        "https://nix-serve.hq.c3d2.de"
+        "https://hydra.hq.c3d2.de"
         "https://dump-dvb.cachix.org"
+        "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
         "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys="
         "nix-serve.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps="
         "dump-dvb.cachix.org-1:+Dq7gqpQG4YlLA2X3xJsG1v3BrlUGGpVtUKWk0dTyUU="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };
   };
diff --git a/modules/graphical.nix b/modules/graphical.nix
index f159797..c1eaf80 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -25,6 +25,8 @@
 
   #on the desktop, we need nice fonts ^^
   fonts.fonts = with pkgs; [
+    monoid
+    (nerdfonts.override { fonts = [ "Monoid" ]; })
     dejavu_fonts
     julia-mono
     uw-ttyp0
@@ -134,7 +136,6 @@
     plugins = [ pkgs.evolution-ews ];
   };
 
-
   # required to autounlock gnome-keyring
   services.xserver = {
     enable = true;
-- 
cgit v1.3.1