Merge branch 'master' of git.mvl.sh:vleeuwenmenno/dotfiles

config/config.yaml

@@ -13,8 +13,11 @@ config:
     # Gitconfig
     gitconfig:
       sources:
+        mennos-server: ~/dotfiles/config/gitconfig.mennos-server
+        mennos-desktop: ~/dotfiles/config/gitconfig.linux
+        mennos-gamingpc: ~/dotfiles/config/gitconfig.linux
+        homeserver-pc: ~/dotfiles/config/gitconfig.linux
         macos: ~/dotfiles/config/gitconfig.macos
-        linux: ~/dotfiles/config/gitconfig.linux
         wsl: ~/dotfiles/config/gitconfig.wsl
       target: ~/.gitconfig
 

config/gitconfig.mennos-server

@@ -0,0 +1,18 @@
+[user]
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
+	email = menno@vleeuwen.me
+	name = Menno van Leeuwen
+
+[color]
+	ui = true
+[push]
+	autoSetupRemote = true
+[pull]
+	rebase = false
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+[init]
+	defaultBranch = main

config/nixos/hosts.nix

@@ -7,5 +7,8 @@
     127.0.0.1 fr.discountoffice.be.local
     127.0.0.1 api.local
     127.0.0.1 mailpit.local
+
+    10.64.148.230 api.dev
+    10.64.148.230 subsites.dev
   '';
-}
+}

config/nixos/packages/workstation/flatpak.nix

@@ -1,10 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.flatpak.enable = true;
   systemd.services.flatpak-repo = {
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.flatpak ];
     script = ''
-    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     '';
   };
-}
+}