From 05e289ff29d9b2c9cc8afe728219ee6993de4036 Mon Sep 17 00:00:00 2001
From: krizej <krizej@protonmail.com>
Date: Sun, 10 Nov 2024 13:00:29 +0100
Subject: [PATCH] shenanigans

---
 files/zed-replace-window.patch       | 17 +++++++++++++++++
 hosts/desktop/default.nix            |  1 +
 modules/stuff/i3.nix                 |  2 +-
 modules/stuff/other-dev-programs.nix |  7 ++++---
 modules/stuff/theme.nix              |  6 +++---
 modules/system.nix                   |  2 +-
 6 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/files/zed-replace-window.patch b/files/zed-replace-window.patch
index 234f066..cbd3251 100644
--- a/files/zed-replace-window.patch
+++ b/files/zed-replace-window.patch
@@ -1,3 +1,20 @@
+diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
+index 22068900c9..c0945f4316 100644
+--- a/crates/recent_projects/src/recent_projects.rs
++++ b/crates/recent_projects/src/recent_projects.rs
+@@ -278,11 +278,7 @@ impl PickerDelegate for RecentProjectsDelegate {
+         {
+             let (candidate_workspace_id, candidate_workspace_location) =
+                 &self.workspaces[selected_match.candidate_id];
+-            let replace_current_window = if self.create_new_window {
+-                secondary
+-            } else {
+-                !secondary
+-            };
++            let replace_current_window = true;
+             workspace
+                 .update(cx, |workspace, cx| {
+                     if workspace.database_id() == Some(*candidate_workspace_id) {
 diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
 index 427e3ab9f6..2c231e6591 100644
 --- a/crates/zed/src/zed.rs
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 623b2a1..d9459ab 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -18,6 +18,7 @@
       initrd.enable = true;
     };
     boot = {
+      tmpOnTmpfs = true;
       loader = {
         timeout = 2;
         grub = {
diff --git a/modules/stuff/i3.nix b/modules/stuff/i3.nix
index b3bd039..9c04ff7 100644
--- a/modules/stuff/i3.nix
+++ b/modules/stuff/i3.nix
@@ -139,7 +139,7 @@ in {
 
           fonts = {
             names = [ "monospace" ];
-            size = 10.0;
+            size = 11.0;
           };
 
           defaultWorkspace = "workspace number 1";
diff --git a/modules/stuff/other-dev-programs.nix b/modules/stuff/other-dev-programs.nix
index dc2fedb..2fa9232 100644
--- a/modules/stuff/other-dev-programs.nix
+++ b/modules/stuff/other-dev-programs.nix
@@ -38,15 +38,16 @@ in {
         "glsl"
         "html"
       ];
+
       userSettings = let
-        font = "Monaspace Xenon";
+        font = builtins.head config.fonts.fontconfig.defaultFonts.monospace;
       in {
         # appearance and shit
         theme = "MOJE";
         buffer_font_family = font;
         ui_font_family = font;
-        buffer_font_size = 13.5;
-        buffer_line_height.custom = 1.7;
+        buffer_font_size = 14.5;
+        buffer_line_height.custom = 1.5;
         ui_font_size = 16;
         buffer_font_features.calt = false; # disable ligatures
         git.inline_blame.enabled = false;
diff --git a/modules/stuff/theme.nix b/modules/stuff/theme.nix
index 8876c80..dd6bd71 100644
--- a/modules/stuff/theme.nix
+++ b/modules/stuff/theme.nix
@@ -12,10 +12,10 @@ in {
       enableDefaultPackages = true;
       packages = with pkgs; [
         jetbrains-mono
-        monaspace
+        vistafonts
       ];
-      fontconfig.defaultFonts = let 
-        font = "Monaspace Xenon";
+      fontconfig.defaultFonts = let
+        font = "Consolas";
       in {
         serif     = [ font ];
         sansSerif = [ font ];
diff --git a/modules/system.nix b/modules/system.nix
index b23d0c7..22f7c67 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -86,7 +86,7 @@ in {
       (writeShellScriptBin "rebuild" ''
         set -e
         ulimit -n 4096 # this fixes the "too many open files" error
-        ${sudo} ${nixos-rebuild} switch --flake ~/nix#${hostname} -v
+        ${sudo} ${nixos-rebuild} switch --flake ~/nix#${hostname} -v $@
       '')
     ];
   };