diff --git a/base.nix b/base.nix
index a373332..fba6df9 100644
--- a/base.nix
+++ b/base.nix
@@ -54,6 +54,17 @@
 
   services.thermald.enable = lib.mkIf (config.nixpkgs.system == "x86_64-linux") true;
 
+  # System fonts
+  # Nice to have when X-forwading on headless machines
+  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
+  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
+  fonts.fonts = with pkgs; [
+    noto-fonts # includes Cousine
+    noto-fonts-cjk
+    noto-fonts-emoji
+    noto-fonts-extra
+  ];
+
   # firewall
   services.fail2ban.enable = config.services.openssh.enable;
   networking.firewall.enable = true; # default
diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix
index 78e3b49..57b6789 100644
--- a/hosts/bolle/default.nix
+++ b/hosts/bolle/default.nix
@@ -25,7 +25,7 @@
     #../../profiles/remote-builders
     #../../profiles/autossh-reverse-tunnels
   ];
-  services.domeneshop-updater.targets = [ "bolle.pbsds.net" ];
+  services.domeneshop-updater.targets = [ config.networking.fqdn ];
 
   # Networking
   networking.networkmanager.enable = true;
@@ -57,17 +57,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # System fonts
-  # Nice to have when X-forwading on headless machines
-  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
-  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
-  fonts.fonts = with pkgs; [
-    noto-fonts # includes Cousine
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave
diff --git a/hosts/garp/default.nix b/hosts/garp/default.nix
index db297b0..51922e4 100644
--- a/hosts/garp/default.nix
+++ b/hosts/garp/default.nix
@@ -45,7 +45,7 @@
 
     ../../profiles/domeneshop-dyndns # TODO: secrets
   ];
-  services.domeneshop-updater.targets = [ "garp.pbsds.net" ];
+  services.domeneshop-updater.targets = [ config.networking.fqdn ];
 
   #networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery
 
@@ -61,16 +61,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # System fonts
-  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
-  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
-  fonts.fonts = with pkgs; [
-    noto-fonts # includes Cousine
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
   # nvidia bad
   #nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: {
   nixpkgs.config.packageOverrides = (pkgs: {
diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix
index db35a4a..09accb6 100644
--- a/hosts/nord/default.nix
+++ b/hosts/nord/default.nix
@@ -72,17 +72,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # System fonts
-  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
-  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
-  fonts.fonts = with pkgs; [
-    noto-fonts # includes Cousine
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix
index f17b75f..10c8b3d 100644
--- a/hosts/noximilien/default.nix
+++ b/hosts/noximilien/default.nix
@@ -130,25 +130,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  #programs.mtr.enable = true;
-  #programs.gnupg.agent = {
-  #  enable = true;
-  #  enableSSHSupport = true;
-  #};
-
-  # System fonts
-  # Nice to have when X-forwading on headless machines
-  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
-  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
-  fonts.fonts = with pkgs; [
-    noto-fonts # includes Cousine
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix
index b9bbc1c..746b3be 100644
--- a/hosts/sopp/default.nix
+++ b/hosts/sopp/default.nix
@@ -103,16 +103,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # System fonts
-  fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
-  fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
-  fonts.fonts = with pkgs; [
-    noto-fonts # includes Cousine
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-  ];
-
   # nvidia bad
   #nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: {
   nixpkgs.config.packageOverrides = (pkgs: {
diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix
index 7a9d302..b9057fd 100644
--- a/users/pbsds/home/default.nix
+++ b/users/pbsds/home/default.nix
@@ -9,7 +9,7 @@
     ./profiles/git.nix
     ./profiles/gtk.nix
     ./profiles/micro.nix
-    ./profiles/ast-rep.nix
+    ./profiles/ast-grep.nix
     ./profiles/shell.nix
     ./profiles/gh-dash.nix
     ./profiles/ssh.nix