From 85cd4c21f2dc8c63c69b38e1f12ae1caefc07520 Mon Sep 17 00:00:00 2001
From: chloe caruso <git@paperclover.net>
Date: Mon, 14 Jul 2025 15:49:59 -0700
Subject: [PATCH 1/3] mewow

---
 users/chloe/paperback/home.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/users/chloe/paperback/home.nix b/users/chloe/paperback/home.nix
index bf0affe34d962d353ac3495f5814fc201d860895..29e72e6786f1ce7531b006b00e6d0f229df9f21c 100644
--- a/users/chloe/paperback/home.nix
+++ b/users/chloe/paperback/home.nix
@@ -2,7 +2,6 @@
 {
   # these programs are not globally installed to reduce distractions.
   # most of these are needed for my work environment.
-  programs.bun.enable = true;
   programs.zed-editor.enable = true;
   home.packages = with pkgs; [
     doppler
-- 
2.54.0


From 20087783d335db34d010b4ae9dc48054a4391f8e Mon Sep 17 00:00:00 2001
From: chloe caruso <git@paperclover.net>
Date: Tue, 22 Jul 2025 15:31:23 -0700
Subject: [PATCH 2/3] chloe: more work things

---
 users/chloe/home.nix           |  3 ++-
 users/chloe/paperback/home.nix | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/users/chloe/home.nix b/users/chloe/home.nix
index ee1c0eab67db164ba749dc70143dda1042bde207..1899685125539742a4a9f18182a1ebe36202c039 100644
--- a/users/chloe/home.nix
+++ b/users/chloe/home.nix
@@ -19,6 +19,7 @@ in
         ];
         # packages to install for desktop environments (non-server)
         desktop = [
+          git-town
         ];
         # packages to install on all servers
         server = [ ];
@@ -46,7 +47,7 @@ in
       shader = "cursor-smear-black.glsl";
       package = null;
       settings = {
-        theme = "catppuccin-latte";
+        theme = "light:catppuccin-latte,dark:catppuccin-macchiato";
         font-family = "AT Name Mono";
         adjust-cursor-thickness = 1;
         minimum-contrast = 1.1;
diff --git a/users/chloe/paperback/home.nix b/users/chloe/paperback/home.nix
index 29e72e6786f1ce7531b006b00e6d0f229df9f21c..e2ce2a753fd26f13d6f5990ad6ad7547f9e5c535 100644
--- a/users/chloe/paperback/home.nix
+++ b/users/chloe/paperback/home.nix
@@ -2,7 +2,16 @@
 {
   # these programs are not globally installed to reduce distractions.
   # most of these are needed for my work environment.
-  programs.zed-editor.enable = true;
+  programs = {
+    bun.enable = true;
+    zed-editor.enable = true;
+    zsh.profileExtra = ''
+      _bun() {
+        local context state line
+        _arguments -C '*:file:_files'
+      }
+    '';
+  };
   home.packages = with pkgs; [
     doppler
     nodejs_22
@@ -13,5 +22,7 @@
     yt-dlp
     spotdl
     zig
+    ssm-session-manager-plugin
+    awscli
   ];
 }
-- 
2.54.0


From 71b0ce756a8d96ba765e7fbb776f70ae03d5690a Mon Sep 17 00:00:00 2001
From: chloe caruso <git@paperclover.net>
Date: Tue, 22 Jul 2025 15:58:35 -0700
Subject: [PATCH 3/3] nix: fix default opts not applying

previously mkDefault/mkOverride on vim.options would go before nvf's
defaults, which would basically make none of them apply. now it doesn't
use an override priority, at the cost that overriding any of these in a
user config will not work without mkForce.

also enable swapfiles, closes #1
---
 modules/neovim/default.nix | 25 ++++++-------------------
 modules/neovim/options.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 modules/neovim/options.nix

diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index ec3abab2ea177f80b3f3f68d01ea23a36e33860b..1b2608c27becf962eb404b61e96450d4c4a98996 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -5,6 +5,7 @@
   ...
 }:
 {
+  imports = [ ./options.nix ];
   # based on default options from upstream:
   # https://github.com/NotAShelf/nvf/blob/main/configuration.nix
   #
@@ -18,23 +19,6 @@
       enable = true;
     };
 
-    options = {
-      tabstop = 2;
-      softtabstop = 2;
-      shiftwidth = 2;
-      undofile = true;
-      swapfile = false;
-      showmode = false;
-      foldlevel = 99;
-      foldcolumn = "1";
-      foldlevelstart = 99;
-      foldenable = true;
-      foldmethod = "expr";
-      #Default to treesitter folding
-      foldexpr = "v:lua.vim.treesitter.foldexpr()";
-    };
-
-
     visuals = {
       # notification system
       # https://github.com/j-hui/fidget.nvim
@@ -110,7 +94,6 @@
       css.enable = true;
       html.enable = true;
       markdown.enable = true;
-      nix.enable = true;
       python.enable = true;
       rust.crates.enable = true;
       rust.enable = true;
@@ -120,7 +103,11 @@
       # sort-lines: off
 
       ts.format.enable = false; # deno fmt is enabled elsewhere
-      nix.format.type = "nixfmt"; # looks so much nicer
+      nix = {
+        enable = true;
+        format.type = "nixfmt"; # looks so much nicer
+        lsp.options.autoArchive = true;
+      };
     };
     formatter.conform-nvim = {
       enable = true;
diff --git a/modules/neovim/options.nix b/modules/neovim/options.nix
new file mode 100644
index 0000000000000000000000000000000000000000..032068cf15bea7027b2033e8ee0493d7b318a824
--- /dev/null
+++ b/modules/neovim/options.nix
@@ -0,0 +1,26 @@
+{ ... }:
+{
+  config.vim.options = {
+    # Indentation
+    tabstop = 2;
+    softtabstop = 2;
+    shiftwidth = 2;
+    showmode = false;
+
+    # Default to treesitter folding
+    foldenable = true;
+    foldmethod = "expr";
+    foldexpr = "v:lua.vim.treesitter.foldexpr()";
+    foldlevel = 99;
+    foldcolumn = "1";
+    foldlevelstart = 99;
+
+    # Case-insensitive find-in-file
+    ignorecase = true;
+    smartcase = true;
+
+    # Enable swapfile, but not in the same location as the source files.
+    undofile = true;
+    swapfile = true;
+  };
+}
-- 
2.54.0