From 302979341160fa095f8ef7d841e17108f0ede3b9 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Mon, 6 Oct 2025 11:29:19 +0200
Subject: [PATCH 1/3] emacs on conifer

---
 home/programs/emacs.nix | 2 +-
 hosts/conifer/home.nix  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/home/programs/emacs.nix b/home/programs/emacs.nix
index 7b40994..fdbd13a 100644
--- a/home/programs/emacs.nix
+++ b/home/programs/emacs.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs29-pgtk;
+    package = pkgs.emacs30-gtk3;
     extraPackages = e: [
       e.vterm
       pkgs.texlive.combined.scheme-medium
diff --git a/hosts/conifer/home.nix b/hosts/conifer/home.nix
index 926777f..193017a 100644
--- a/hosts/conifer/home.nix
+++ b/hosts/conifer/home.nix
@@ -19,6 +19,7 @@
     cli.comma
 
     programs.nvim
+    programs.emacs
 
     desktop.xdg-portals
 

From 7381b0eb1b9d4a3b96b6b74dcba058eec44b0a9e Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Tue, 7 Oct 2025 12:00:22 +0200
Subject: [PATCH 2/3] enable wsl start menu launchers on conifer

---
 hosts/conifer/hardware.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/conifer/hardware.nix b/hosts/conifer/hardware.nix
index c5310f2..68fdd6e 100644
--- a/hosts/conifer/hardware.nix
+++ b/hosts/conifer/hardware.nix
@@ -2,6 +2,7 @@
   imports = [inputs.nixos-wsl.nixosModules.default];
   wsl.enable = true;
   wsl.defaultUser = "xun";
+  wsl.startMenuLaunchers = true;
 
   nixpkgs.hostPlatform.system = "x86_64-linux";
 }

From fd1be044b071dea7718603ff41db014aadfa1852 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Tue, 7 Oct 2025 12:00:22 +0200
Subject: [PATCH 3/3] allow xun_schoolpc to ssh to deploy user

---
 sys/profiles/core/deploy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/profiles/core/deploy.nix b/sys/profiles/core/deploy.nix
index 4aa6bf4..5e0cd0a 100644
--- a/sys/profiles/core/deploy.nix
+++ b/sys/profiles/core/deploy.nix
@@ -20,6 +20,7 @@
 
     openssh.authorizedKeys.keys = with vars.sshKeys; [
       xun_nixdesk
+      xun_schoolpc
       xun_redmi
       alka_alkpc
     ];