From 9a6c19c2b21e3dbf658864aa284556ac393181a4 Mon Sep 17 00:00:00 2001 From: chloe caruso Date: Thu, 24 Jul 2025 20:41:58 -0700 Subject: [PATCH 1/5] chloe: vim --- users/chloe/vim.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/users/chloe/vim.nix b/users/chloe/vim.nix index 0b3cc08..4dfae25 100644 --- a/users/chloe/vim.nix +++ b/users/chloe/vim.nix @@ -16,6 +16,36 @@ _: { }; }; }; + autocomplete.blink-cmp = { + enable = true; + mappings = { + close = null; + complete = null; + confirm = null; + next = null; + previous = null; + scrollDocsDown = null; + scrollDocsUp = null; + }; + + setupOpts = { + keymap = { + preset = "super-tab"; + }; + completion = { + ghost_text.enabled = false; + list.selection.preselect = true; + trigger = { + show_in_snippet = true; + }; + accept.auto_brackets.enabled = true; + }; + signature = { + enabled = true; + }; + }; + }; + keymaps = let mkKeymap = mode: key: action: desc: { From 5dc2d9d1daf45712c60239be1e4387d2b47e9b82 Mon Sep 17 00:00:00 2001 From: clo Date: Thu, 24 Jul 2025 20:43:30 -0700 Subject: [PATCH 2/5] Delete test.ts --- test.ts | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 test.ts diff --git a/test.ts b/test.ts deleted file mode 100644 index 77ad056..0000000 --- a/test.ts +++ /dev/null @@ -1,20 +0,0 @@ -const option = collectionDetails - .fields - .find( - (field): field is { type: "Option", slug: string, validations: WebflowValidations["Option"] } => - field.slug === fieldData.path - )! - .validations; - - if (fieldData.type -"Option" && typeof rawValue -"string") -return ( -( -collectionDetails.fields. find (predicate: (field) ⇒ field.slug -| WebflowValidations["Option"] -| undefined -fieldData.path) ?. validations as -)?. options.find(predicate: (option) ⇒ option.id -rawValue) ?. name ?? fullMatch -); From a040cebe8e4f9dea894aa27b8982225b673fd6d2 Mon Sep 17 00:00:00 2001 From: Natalie Date: Fri, 1 Aug 2025 19:21:02 -0700 Subject: [PATCH 3/5] various changes --- flake.lock | 196 +++++++++---------------- flake.nix | 4 - users/natalie/laptop/configuration.nix | 1 + users/natalie/packages.nix | 9 +- users/natalie/vim/coq.nix | 16 -- users/natalie/vim/default.nix | 1 - users/natalie/vim/languages.nix | 39 ++--- 7 files changed, 96 insertions(+), 170 deletions(-) delete mode 100644 users/natalie/vim/coq.nix diff --git a/flake.lock b/flake.lock index a0f2bdb..7120cfd 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1748299691, - "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=", + "lastModified": 1752383772, + "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00", + "rev": "875c694d7f0ec2020d7511264907a1f0e3262931", "type": "github" }, "original": { @@ -52,17 +52,17 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "ref": "refs/heads/main", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "revCount": 92, + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, "flake-compat_2": { @@ -81,16 +81,35 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -137,25 +156,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1705309234, @@ -171,9 +172,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -189,9 +190,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -251,11 +252,11 @@ ] }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1753943136, + "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "type": "github" }, "original": { @@ -300,11 +301,11 @@ ] }, "locked": { - "lastModified": 1752099881, - "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=", + "lastModified": 1753293216, + "narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010", + "rev": "297a1b57c14ff18890382b2fe89f493ba349a730", "type": "github" }, "original": { @@ -313,26 +314,6 @@ "type": "github" } }, - "nh": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751375534, - "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=", - "owner": "viperML", - "repo": "nh", - "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -340,11 +321,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1753589988, + "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", "type": "github" }, "original": { @@ -389,28 +370,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -453,20 +419,20 @@ }, "nvf": { "inputs": { + "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_3", "mnw": "mnw", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1752075018, - "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=", + "lastModified": 1753878721, + "narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=", "owner": "notashelf", "repo": "nvf", - "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2", + "rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f", "type": "github" }, "original": { @@ -493,7 +459,6 @@ "darwin": "darwin", "home-manager": "home-manager", "moonlight": "moonlight", - "nh": "nh", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixpkgs": "nixpkgs_2", @@ -511,11 +476,11 @@ ] }, "locked": { - "lastModified": 1752028888, - "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0f1c656e053463b47639234b151a05e4441bb19", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -551,7 +516,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=", + "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -599,7 +564,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=", + "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -698,21 +663,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -720,11 +670,11 @@ ] }, "locked": { - "lastModified": 1751688498, - "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=", + "lastModified": 1753676490, + "narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab", + "rev": "77024f4557204bb4d526893d42db2e6f50727fab", "type": "github" }, "original": { @@ -735,16 +685,16 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752063248, - "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=", + "lastModified": 1753963984, + "narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848", + "rev": "45772b76cdb103bd300abac4a85a34518dee65a0", "type": "github" }, "original": { @@ -755,8 +705,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_6", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "zls", "nixpkgs" @@ -778,7 +728,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "langref": "langref", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 7088f99..52cda39 100644 --- a/flake.nix +++ b/flake.nix @@ -28,8 +28,6 @@ url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - nh.url = "github:viperML/nh"; - nh.inputs.nixpkgs.follows = "nixpkgs"; nix-options-search.url = "github:madsbv/nix-options-search"; @@ -49,8 +47,6 @@ overlays = [ inputs.zig.overlays.default inputs.rust-overlay.overlays.default - inputs.nh.overlays.default - inputs.moonlight.overlays.default # https://github.com/LnL7/nix-darwin/issues/1041 (_: prev: { diff --git a/users/natalie/laptop/configuration.nix b/users/natalie/laptop/configuration.nix index 73243ce..7e83946 100644 --- a/users/natalie/laptop/configuration.nix +++ b/users/natalie/laptop/configuration.nix @@ -28,6 +28,7 @@ fi ''; }; + programs.fish.enable = true; # Use homebrew to install casks homebrew = { diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index f96623c..4c7eaca 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -26,7 +26,6 @@ with pkgs; qemu podman docker - devenv #productivity glance @@ -59,10 +58,7 @@ with pkgs; imagemagick #chatting apps - discord - # (discord.override { - # withMoonlight = true; - # }) + (discord.override { withMoonlight = true; }) vesktop #media @@ -90,9 +86,8 @@ with pkgs; #programming languages deno ruby - nodePackages.npm + # nodePackages.npm go - coq elan #browsers diff --git a/users/natalie/vim/coq.nix b/users/natalie/vim/coq.nix deleted file mode 100644 index a0ddbba..0000000 --- a/users/natalie/vim/coq.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - - vim = { - # extraPackages = with pkgs; [ - # coq_8_20 - # coqPackages_8_20.stdlib - # ]; - extraPlugins.Coqtail = { - # enabled = true; - package = pkgs.vimPlugins.Coqtail; - # lazy = true; - # ft = "coq"; - }; - }; -} diff --git a/users/natalie/vim/default.nix b/users/natalie/vim/default.nix index 8c7f50b..4c269f3 100644 --- a/users/natalie/vim/default.nix +++ b/users/natalie/vim/default.nix @@ -5,7 +5,6 @@ ./languages.nix ./latex.nix ./lean.nix - ./coq.nix ./visuals.nix ./mini.nix ]; diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index e434596..06d08c0 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -25,31 +25,32 @@ settings.nixd = { nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }''; - options = - { - home-manager = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options''; - # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]''; - }; - } - // pkgs.lib.optionalAttrs host.darwin { - nix-darwin = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options''; - # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options''; - }; - } - // pkgs.lib.optionalAttrs host.linux { - nixos = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options''; - # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options''; - }; + options = { + home-manager = { + expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options''; + # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]''; }; + } + // pkgs.lib.optionalAttrs host.darwin { + nix-darwin = { + expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options''; + # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options''; + }; + } + // pkgs.lib.optionalAttrs host.linux { + nixos = { + expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options''; + # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options''; + }; + }; }; }; }; }; languages = { - python.format.type = "ruff"; + python = { + format.type = "ruff"; + }; markdown = { enable = true; extensions.render-markdown-nvim = { From a58f16e18b7e9161012dcfd90075e7b72e4f50cf Mon Sep 17 00:00:00 2001 From: Natalie Date: Fri, 1 Aug 2025 20:07:24 -0700 Subject: [PATCH 4/5] migrate to nvf v0.8 --- flake.lock | 62 ++++++++++++++++++--------------- flake.nix | 2 +- modules/neovim/default.nix | 2 +- users/natalie/vim/languages.nix | 44 ++++------------------- 4 files changed, 42 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 7120cfd..6695b0d 100644 --- a/flake.lock +++ b/flake.lock @@ -50,22 +50,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1751685974, - "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", - "ref": "refs/heads/main", - "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", - "revCount": 92, - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -81,7 +65,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -155,6 +139,27 @@ } }, "flake-utils_3": { + "inputs": { + "systems": [ + "nvf", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -172,7 +177,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -190,7 +195,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -419,8 +424,8 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "flake-utils": "flake-utils_3", "mnw": "mnw", "nixpkgs": [ "nixpkgs" @@ -428,15 +433,16 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1753878721, - "narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=", + "lastModified": 1754043154, + "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=", "owner": "notashelf", "repo": "nvf", - "rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f", + "rev": "69659e078b6531698255deda280c9407b34e29ea", "type": "github" }, "original": { "owner": "notashelf", + "ref": "v0.8", "repo": "nvf", "type": "github" } @@ -685,8 +691,8 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -705,8 +711,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -728,7 +734,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", "langref": "langref", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 52cda39..6c4b436 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; - nvf.url = "github:notashelf/nvf"; + nvf.url = "github:notashelf/nvf/v0.8"; nvf.inputs.nixpkgs.follows = "nixpkgs"; darwin.url = "github:lnl7/nix-darwin/master"; diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 4a75d3d..dd3a643 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -69,6 +69,7 @@ signatureHelp = null; toggleFormatOnSave = null; }; + servers.nixd.init_options.autoArchive = true; }; treesitter = { enable = true; @@ -105,7 +106,6 @@ nix = { enable = true; format.type = "nixfmt"; # looks so much nicer - lsp.options.autoArchive = true; }; }; formatter.conform-nvim = { diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index 06d08c0..05346a8 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -9,44 +9,7 @@ vim = { extraPackages = with pkgs; [ python312Packages.pylatexenc - nixd ]; - lsp = { - servers = { - nil = { - settings.nil.nix.flake = { - - autoArchive = true; - autoEvalInputs = true; - - }; - }; - nixd = { - settings.nixd = { - nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }''; - - options = { - home-manager = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options''; - # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]''; - }; - } - // pkgs.lib.optionalAttrs host.darwin { - nix-darwin = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options''; - # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options''; - }; - } - // pkgs.lib.optionalAttrs host.linux { - nixos = { - expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options''; - # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options''; - }; - }; - }; - }; - }; - }; languages = { python = { format.type = "ruff"; @@ -57,7 +20,12 @@ enable = true; }; }; - nix.format.enable = true; + nix = { + lsp.servers = [ + "nil" + "nixd" + ]; + }; }; formatter.conform-nvim = { From 992f77e656d298463aedea1290604b9a72b2a488 Mon Sep 17 00:00:00 2001 From: Natalie Date: Fri, 1 Aug 2025 20:59:12 -0700 Subject: [PATCH 5/5] clean up default home options, add lsd --- modules/home/default.nix | 135 ++++++++++++++++++++------------------- modules/nixos/ld.nix | 10 ++- users/natalie/home.nix | 1 + 3 files changed, 79 insertions(+), 67 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index b9fd238..c7102e2 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -23,82 +23,85 @@ in description = "set the ghostty shader, relative to 'files/ghostty'"; }; }; - config.programs = { - home-manager.enable = true; - nix-index.enable = true; + config = { + home.shell = { + enableShellIntegration = true; + }; + programs = { + home-manager.enable = true; + nix-index.enable = true; - direnv = { - enableZshIntegration = true; - nix-direnv.enable = config.programs.direnv.enable; - }; + direnv = { + nix-direnv.enable = config.programs.direnv.enable; + }; - git = { - enable = true; - userName = lib.mkDefault user.name; - userEmail = lib.mkDefault user.email; - ignores = [ - (lib.mkIf host.darwin ".DS_Store") # When using Finder - (lib.mkIf host.darwin "._*") # When using non-APFS drives - # ViM and Neovim - ".*.swp" - ".nvimlog" - ]; - }; + git = { + enable = true; + userName = lib.mkDefault user.name; + userEmail = lib.mkDefault user.email; + ignores = [ + (lib.mkIf host.darwin ".DS_Store") # When using Finder + (lib.mkIf host.darwin "._*") # When using non-APFS drives + # ViM and Neovim + ".*.swp" + ".nvimlog" + ]; + }; - atuin = { - enableBashIntegration = true; - enableFishIntegration = true; - daemon.enable = cfg.atuin.enable; - }; - bat = { - extraPackages = with pkgs.bat-extras; [ - batdiff - batman - batgrep - batwatch - batpipe - prettybat - ]; - }; - hyfetch = { - settings = { - backend = "fastfetch"; - preset = user.sexuality; - mode = "rgb"; - light_dark = "dark"; - lightness = { - }; - color_align = { - mode = "horizontal"; + atuin = { + daemon.enable = cfg.atuin.enable; + }; + + bat = { + extraPackages = with pkgs.bat-extras; [ + batdiff + batman + batgrep + batwatch + batpipe + prettybat + ]; + }; + hyfetch = { + settings = { + backend = "fastfetch"; + preset = user.sexuality; + mode = "rgb"; + light_dark = "dark"; + lightness = { + }; + color_align = { + mode = "horizontal"; + }; }; }; - }; - fastfetch.enable = cfg.hyfetch.enable; + fastfetch.enable = cfg.hyfetch.enable; - fish = { - plugins = [ - { - name = "tide"; - inherit (pkgs.fishPlugins.tide) src; + fish = { + plugins = [ + { + name = "tide"; + inherit (pkgs.fishPlugins.tide) src; + } + { + name = "!!"; + inherit (pkgs.fishPlugins.bang-bang) src; + } + ]; + shellAliases = { } - { - name = "!!"; - inherit (pkgs.fishPlugins.bang-bang) src; - } - ]; - shellAliases = - { } // lib.optionalAttrs (!host.darwin) { reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; }; - shellInit = '' - batman --export-env | source - test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true - ''; - }; + shellInit = '' + batman --export-env | source + test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true + ''; + }; - ghostty.settings.custom-shader = lib.mkIf ( - cfg.ghostty.shader != null - ) "${../../files/ghostty}/${cfg.ghostty.shader}"; + ghostty.settings.custom-shader = lib.mkIf ( + cfg.ghostty.shader != null + ) "${../../files/ghostty}/${cfg.ghostty.shader}"; + }; }; } diff --git a/modules/nixos/ld.nix b/modules/nixos/ld.nix index 0bb6938..fc09f68 100644 --- a/modules/nixos/ld.nix +++ b/modules/nixos/ld.nix @@ -63,7 +63,7 @@ nss openssl pango - # pipewire + pipewire stdenv.cc.cc systemd vulkan-loader @@ -82,5 +82,13 @@ xorg.libxkbfile xorg.libxshmfence zlib + libxslt + + # Stolen from https://github.com/Mic92/dotfiles/blob/57cf7fdf8705a5362fc19114b8395cdbf7668e94/nixos/modules/nix-ld.nix#L6-L58 + flite + gtk2 + gtk2-x11 + libsecret + xorg.libXinerama ]; } diff --git a/users/natalie/home.nix b/users/natalie/home.nix index 526e94c..9dfdb5c 100644 --- a/users/natalie/home.nix +++ b/users/natalie/home.nix @@ -12,6 +12,7 @@ direnv.enable = true; fish.enable = true; man.generateCaches = false; + lsd.enable = true; # sort-lines:end };