From e7d42763e39e0261b3b37a701e681fc313094f50 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Thu, 15 Feb 2024 22:31:32 +0100
Subject: [PATCH 1/4] remove useless package

---
 common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common.nix b/common.nix
index 921f0a7..d109206 100644
--- a/common.nix
+++ b/common.nix
@@ -153,9 +153,6 @@ with builtins; {
   users.users.jade = {
     isNormalUser = true;
     extraGroups = ["wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark"];
-    packages = [
-      pkgs.marksman
-    ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"
     ];

From dc52ae747d747ef03a636c1bde100cb8b6fdd366 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Fri, 16 Feb 2024 08:20:43 +0100
Subject: [PATCH 2/4] optimize system build command

---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 0e2ed0b..0c3044a 100644
--- a/justfile
+++ b/justfile
@@ -4,7 +4,7 @@ test:
 	sudo nixos-rebuild test --flake . --impure
 
 build: 
-	sudo nixos-rebuild switch --flake . --impure
+	sudo nixos-rebuild switch --flake . --impure --fast
 
 update:
 	nix flake update --commit-lock-file

From f33c9ae16134d454b984669758cb293cb04cc1cf Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Fri, 16 Feb 2024 08:21:20 +0100
Subject: [PATCH 3/4] fix custom commands and add `ed` command

---
 other/config.nu | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/other/config.nu b/other/config.nu
index cda795c..c590b75 100644
--- a/other/config.nu
+++ b/other/config.nu
@@ -782,9 +782,9 @@ def start_zellij [] {
 start_zellij
 
 def nsp [ 
-    program: string
+    ...programs: string
 ] {
-    nix shell $"nixpkgs#$program"
+    nix shell ...($programs | each {|it| $"nixpkgs#($it)" })
 }
 
 def lcr [
@@ -806,6 +806,17 @@ def glog [
     | split column "»¦«" commit subject name email date
 }
 
+def ed [ 
+    file: path 
+    ...cmdargs: string
+] {
+    let ext = $file | path parse | get extension;
+    match $ext {
+        "typ" => {|| zellij run --direction down -- typst watch $file --open ($cmdargs | str join ' ') }
+    };
+    hx $file
+}
+
 alias gnix = cd ~/nix-configs;
 alias grepo = cd ~/Documents/repos;
 alias wh = wormhole-rs;

From 7780fd442bcc5f5d6024af8a673d8d84c1542fd2 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Fri, 16 Feb 2024 08:21:33 +0100
Subject: [PATCH 4/4] set up kmscon

---
 modules/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/default.nix b/modules/default.nix
index 4a225f4..ebb1252 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     ./shell
     ./desktop
@@ -7,4 +7,17 @@
     ./firewall.nix
     ./git.nix
   ];
+
+  services.kmscon = {
+    enable = true;
+    fonts = [
+      {
+        name = "FiraCode Nerd Font";
+        package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
+      }
+    ];
+    extraConfig = "font-size=14";
+    extraOptions = "--term xterm-256color";
+    hwRender = true;
+  };
 }