From 2ab74d5f7af0118a28cfdfbb367ac28a2033cc98 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Wed, 12 Jun 2024 23:41:28 +0200
Subject: [PATCH] aspi: fix keyring, make wg-quick start on boot

---
 homes/x86_64-linux/julian@aspi/default.nix  | 62 +++++++++++----------
 homes/x86_64-linux/julian@aspi/packages.nix |  4 +-
 systems/x86_64-linux/aspi/default.nix       | 13 +++++
 3 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix
index 7a296e8..85c70ce 100644
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@@ -39,43 +39,45 @@
     nix-helper.enable = true;
   };
 
-  home.packages = with pkgs; [
-    # Code formatters for use with doom emacs
-    nixfmt-rfc-style # nix
-    dockfmt # docker
-    google-java-format # java
+  home.packages =
+    with pkgs;
+    [
+      # Code formatters for use with doom emacs
+      nixfmt-rfc-style # nix
+      dockfmt # docker
+      google-java-format # java
 
-    # Lsps for use with doom emacs
-    # neocmakelsp # cmake
+      # Lsps for use with doom emacs
+      # neocmakelsp # cmake
 
-    # Rust setup
-    unstable.rustc
-    unstable.rustfmt
-    unstable.cargo
-    unstable.clippy
-    unstable.rust-analyzer
+      # Rust setup
+      unstable.rustc
+      unstable.rustfmt
+      unstable.cargo
+      unstable.clippy
+      unstable.rust-analyzer
 
-    # Further tools
-    cntr # nix debugger
+      # Further tools
+      cntr # nix debugger
 
-    (lib.frajul.my-helper-function lazygit)
-    languagetool
-    wireguard-tools
+      (lib.frajul.my-helper-function lazygit)
+      languagetool
+      # wireguard-tools
 
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+      # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
 
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
+      # (pkgs.writeShellScriptBin "my-hello" ''
+      #   echo "Hello, ${config.home.username}!"
+      # '')
 
-    ## My scripts
-    pkgs.frajul.deploy-to-pianopi
-    pkgs.frajul.edit-config
-  ] ++ lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; })
-      [
-        ./fonts.nix
-        ./packages.nix
-      ];
+      ## My scripts
+      pkgs.frajul.deploy-to-pianopi
+      pkgs.frajul.edit-config
+    ]
+    ++ lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; }) [
+      ./fonts.nix
+      ./packages.nix
+    ];
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix
index 27a3ae4..7ffa4cc 100644
--- a/homes/x86_64-linux/julian@aspi/packages.nix
+++ b/homes/x86_64-linux/julian@aspi/packages.nix
@@ -77,7 +77,7 @@ with pkgs;
   topgrade
 
   arandr
-  wireguard-tools
+  # wireguard-tools
   htop
   texlive.combined.scheme-full
   texlab
@@ -167,4 +167,6 @@ with pkgs;
 
   ## My scripts
   frajul.edit-config
+
+  nheko
 ]
diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index 0957b96..51acaee 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -160,6 +160,19 @@
     gid = 1000;
   };
 
+  programs.seahorse.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+
+  # systemd.services."wg-quick@julian".enable = true;
+  # networking.wireguard.enable = true;
+
+  # This interface is started on boot / switch
+  networking.wg-quick.interfaces = {
+    julian = {
+      configFile = "/etc/wireguard/julian.conf";
+    };
+  };
+
   # List services that you want to enable:
   # Enable the OpenSSH daemon.
   services.openssh.enable = false;