3 files changed, 30 insertions, 4 deletions
diff --git a/machines/sternenseemann/base-laptop.nix b/machines/sternenseemann/base-laptop.nix
index 50cb43a8..9a4388a1 100644
--- a/machines/sternenseemann/base-laptop.nix
+++ b/machines/sternenseemann/base-laptop.nix
@@ -46,8 +46,7 @@
         lowdown
         lynx
         zip unzip
-        stow
-        silver-searcher
+        ripgrep
         nmap
         ffmpeg graphicsmagick
         pavucontrol
@@ -58,6 +57,13 @@
       variables = {
         EDITOR = "${emacs}/bin/emacsclient";
         VISUAL = "${emacs}/bin/emacsclient";
+        RIPGREP_CONFIG_PATH = pkgs.writeText "ripgreprc" ''
+          --max-columns=150
+          --max-columns-preview
+          --smart-case
+          --hidden
+          --glob=!.git/*
+        '';
       };
     };
 
diff --git a/machines/sternenseemann/base.nix b/machines/sternenseemann/base.nix
index ac555e24..7eb977fc 100644
--- a/machines/sternenseemann/base.nix
+++ b/machines/sternenseemann/base.nix
@@ -131,5 +131,24 @@ in {
       GIT_PAGER = bins.less;
       LESS = "-R";
     };
+
+    environment.etc."gitconfig".text = ''
+      [user]
+          email = sternenseemann@systemli.org
+          name = sternenseemann
+      [push]
+          default = matching
+      [pull]
+          rebase = true
+      [init]
+          defaultBranch = canon
+      [sendemail]
+          smtpEncryption = tls
+          smtpServer = mail.systemli.org
+          smtpUser = sternenseemann@systemli.org
+          smtpServerPort = 587
+      [merge]
+          conflictstyle = diff3
+    '';
   };
 }
diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix
index 66779e4c..9e47e4a7 100644
--- a/machines/sternenseemann/wolfgang.nix
+++ b/machines/sternenseemann/wolfgang.nix
@@ -8,6 +8,7 @@ let
 
 in {
   imports = [
+    ((import ../../nixos-hardware-path.nix) + "/lenovo/thinkpad/x270")
     ./base-laptop.nix
     ./wireguard.nix
     ./user-lukas.nix
@@ -51,6 +52,7 @@ in {
   };
 
   boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.memtest86.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "wolfgang";
@@ -84,8 +86,7 @@ in {
     gpxsee
     msr-tools
     quasselClient
-    # hunspell
-    # (with hunspellDicts; [ de-de en-gb-large en-us ])
+    anki
   ];
 
   environment.variables = {