shenanigans
This commit is contained in:
parent
be6f324934
commit
05e289ff29
6 changed files with 27 additions and 8 deletions
|
@ -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
|
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
|
||||||
index 427e3ab9f6..2c231e6591 100644
|
index 427e3ab9f6..2c231e6591 100644
|
||||||
--- a/crates/zed/src/zed.rs
|
--- a/crates/zed/src/zed.rs
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
initrd.enable = true;
|
initrd.enable = true;
|
||||||
};
|
};
|
||||||
boot = {
|
boot = {
|
||||||
|
tmpOnTmpfs = true;
|
||||||
loader = {
|
loader = {
|
||||||
timeout = 2;
|
timeout = 2;
|
||||||
grub = {
|
grub = {
|
||||||
|
|
|
@ -139,7 +139,7 @@ in {
|
||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
names = [ "monospace" ];
|
names = [ "monospace" ];
|
||||||
size = 10.0;
|
size = 11.0;
|
||||||
};
|
};
|
||||||
|
|
||||||
defaultWorkspace = "workspace number 1";
|
defaultWorkspace = "workspace number 1";
|
||||||
|
|
|
@ -38,15 +38,16 @@ in {
|
||||||
"glsl"
|
"glsl"
|
||||||
"html"
|
"html"
|
||||||
];
|
];
|
||||||
|
|
||||||
userSettings = let
|
userSettings = let
|
||||||
font = "Monaspace Xenon";
|
font = builtins.head config.fonts.fontconfig.defaultFonts.monospace;
|
||||||
in {
|
in {
|
||||||
# appearance and shit
|
# appearance and shit
|
||||||
theme = "MOJE";
|
theme = "MOJE";
|
||||||
buffer_font_family = font;
|
buffer_font_family = font;
|
||||||
ui_font_family = font;
|
ui_font_family = font;
|
||||||
buffer_font_size = 13.5;
|
buffer_font_size = 14.5;
|
||||||
buffer_line_height.custom = 1.7;
|
buffer_line_height.custom = 1.5;
|
||||||
ui_font_size = 16;
|
ui_font_size = 16;
|
||||||
buffer_font_features.calt = false; # disable ligatures
|
buffer_font_features.calt = false; # disable ligatures
|
||||||
git.inline_blame.enabled = false;
|
git.inline_blame.enabled = false;
|
||||||
|
|
|
@ -12,10 +12,10 @@ in {
|
||||||
enableDefaultPackages = true;
|
enableDefaultPackages = true;
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
jetbrains-mono
|
jetbrains-mono
|
||||||
monaspace
|
vistafonts
|
||||||
];
|
];
|
||||||
fontconfig.defaultFonts = let
|
fontconfig.defaultFonts = let
|
||||||
font = "Monaspace Xenon";
|
font = "Consolas";
|
||||||
in {
|
in {
|
||||||
serif = [ font ];
|
serif = [ font ];
|
||||||
sansSerif = [ font ];
|
sansSerif = [ font ];
|
||||||
|
|
|
@ -86,7 +86,7 @@ in {
|
||||||
(writeShellScriptBin "rebuild" ''
|
(writeShellScriptBin "rebuild" ''
|
||||||
set -e
|
set -e
|
||||||
ulimit -n 4096 # this fixes the "too many open files" error
|
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 $@
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue