From fa17ce8f5b8e41f35c8367a1705a9c8369d2fff8 Mon Sep 17 00:00:00 2001 From: Natalie Date: Wed, 21 May 2025 11:55:34 -0700 Subject: [PATCH] update flake --- flake.lock | 150 ++++++++++++++------------------ modules/macos/system.nix | 8 +- users/natalie/vim.nix | 12 +-- users/natalie/vim/languages.nix | 6 ++ 4 files changed, 79 insertions(+), 97 deletions(-) diff --git a/flake.lock b/flake.lock index 9b9f195..1bdbf8d 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1746254942, - "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", + "lastModified": 1747820204, + "narHash": "sha256-oY/mH8K1LOd+YbO58sw9ORtOdTxy3rR9lvTzOJKVUtA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", + "rev": "e2676937faf868111dcea6a4a9cf4b6549907c9d", "type": "github" }, "original": { @@ -217,7 +217,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -290,27 +289,6 @@ } }, "flake-utils_4": { - "inputs": { - "systems": [ - "stylix", - "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_5": { "inputs": { "systems": "systems_6" }, @@ -328,7 +306,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_7" }, @@ -346,7 +324,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_8" }, @@ -468,16 +446,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -489,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746632058, - "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", + "lastModified": 1747834438, + "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=", "owner": "nix-community", "repo": "home-manager", - "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", + "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0", "type": "github" }, "original": { @@ -511,11 +489,11 @@ ] }, "locked": { - "lastModified": 1746369725, - "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -538,11 +516,11 @@ }, "mnw": { "locked": { - "lastModified": 1746338991, - "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", + "lastModified": 1747499976, + "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", + "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", "type": "github" }, "original": { @@ -559,11 +537,11 @@ ] }, "locked": { - "lastModified": 1745980935, - "narHash": "sha256-aLx/HDrnGTgcRZFs5kiiz173yi/RnARERDKIq+p4OJw=", + "lastModified": 1747413594, + "narHash": "sha256-cFsVYlIkSNEpGw4qT9Eea6sa1+dZyaCRZNrgQTc8wu4=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "f2395a937ca7e4e933a44e71eb38a4c621125595", + "rev": "fc7c0119e923d50ce8873ea654fa7542f60be27f", "type": "github" }, "original": { @@ -579,11 +557,11 @@ ] }, "locked": { - "lastModified": 1746442382, - "narHash": "sha256-lFUHQdnDqnXXzigQn6Kd4aVrDDjg80HAb7DfThQNC/I=", + "lastModified": 1747847914, + "narHash": "sha256-Ut9RZVAaKUD4A3RrXP5RhNVZ+LVy5mL4mMmiTDWaQE8=", "owner": "viperML", "repo": "nh", - "rev": "4eb1941c2e30f3dabbf24619c7ca7303c448983d", + "rev": "45048d3e9f183f3f09fddf667841b7327c04ad8f", "type": "github" }, "original": { @@ -625,11 +603,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -668,11 +646,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746628701, - "narHash": "sha256-kyVvluIygGCuLDd/RTm4QVcVdhYuBuW5/RlUpiCYJMQ=", + "lastModified": 1747826251, + "narHash": "sha256-Fe4AXmnnAKnh/wIe1ao4Pv/8m6WGA1ujwp6VApgos30=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b8e92345fb75ed4c8b4a172a344c92f962593af7", + "rev": "9a67b4a289cd8994080398d40b57cfde8e8cfb0a", "type": "github" }, "original": { @@ -714,11 +692,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1747676747, + "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", "type": "github" }, "original": { @@ -745,11 +723,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -792,7 +770,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -825,11 +806,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1746940940, - "narHash": "sha256-ASB3QVEoFK5//280uedYdt8jyDLhFa9zgj8qfc0S7Sk=", + "lastModified": 1747525582, + "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", "owner": "notashelf", "repo": "nvf", - "rev": "815ed49d3693346122ef61da6d7443cd3cc21752", + "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", "type": "github" }, "original": { @@ -877,11 +858,11 @@ ] }, "locked": { - "lastModified": 1746585402, - "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=", + "lastModified": 1747795013, + "narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72dd969389583664f87aa348b3458f2813693617", + "rev": "6b1cf12374361859242a562e1933a7930649131a", "type": "github" }, "original": { @@ -919,11 +900,11 @@ ] }, "locked": { - "lastModified": 1746585402, - "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=", + "lastModified": 1747795013, + "narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72dd969389583664f87aa348b3458f2813693617", + "rev": "6b1cf12374361859242a562e1933a7930649131a", "type": "github" }, "original": { @@ -1024,7 +1005,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", @@ -1040,11 +1021,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746575057, - "narHash": "sha256-kBlPMNZXPzDG4HUmdqYpvjvVYkoDdDrVvO14cKgHaiU=", + "lastModified": 1747847674, + "narHash": "sha256-XYVaUKQrda7WOSonewDtpvm8tENIcwWrErobUYMTMoc=", "owner": "danth", "repo": "stylix", - "rev": "685deb9bae2e4c463e953ff39bd54fd448feaf05", + "rev": "4ce349da56e075f7e3456b48731cbbf5ae8b1eb8", "type": "github" }, "original": { @@ -1193,17 +1174,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -1280,15 +1260,15 @@ "zig": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1746533648, - "narHash": "sha256-tdYkRMWaPfF8EUTyZVFjhBA4m8vay2T0zRICsM/y1A4=", + "lastModified": 1747829603, + "narHash": "sha256-H8Vj7GSOyHgAUTDM/EkkdiTyEZg2C1UUlsp/fDSbxNQ=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "3cf5310e0b70cd7c4d0fffc6d3e16bb8429d8da5", + "rev": "53899a028ece2f77939c08c59d547416a59086c0", "type": "github" }, "original": { @@ -1300,7 +1280,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -1322,7 +1302,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_3", "langref": "langref", "nixpkgs": "nixpkgs_4", diff --git a/modules/macos/system.nix b/modules/macos/system.nix index aced96e..4dca169 100644 --- a/modules/macos/system.nix +++ b/modules/macos/system.nix @@ -1,13 +1,12 @@ { + user, config, pkgs, lib, ... -}: -let +}: let tiling = config.shared.darwin.tiling.enable; -in -{ +in { # Use touchid or watch to activate sudo security.pam.services.sudo_local = { enable = true; @@ -17,6 +16,7 @@ in # Set some OSX preferences that I always end up hunting down and changing. system = { + primaryUser = user.username; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog stateVersion = 6; diff --git a/users/natalie/vim.nix b/users/natalie/vim.nix index b3b342d..a1bad7b 100644 --- a/users/natalie/vim.nix +++ b/users/natalie/vim.nix @@ -10,17 +10,13 @@ undofile = true; swapfile = false; showmode = false; - foldmethod = "expr"; - foldexpr = "v:lua.vim.treesitter.foldexpr()"; + foldlevel = 99; + foldcolumn = "1"; + foldlevelstart = 99; + foldenable = true; }; autocmds = [ - { - event = ["LspAttach"]; - pattern = ["*"]; - desc = "User: Set LSP folding if client supports it"; - callback = pkgs.lib.generators.mkLuaInline ''function(ctx) local client = assert(vim.lsp.get_client_by_id(ctx.data.client_id)) if client:supports_method("textDocument/foldingRange") then local win = vim.api.nvim_get_current_win() vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()" end end''; - } ]; theme = { name = "catppuccin"; diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index 6f51b4d..b15b78d 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -132,6 +132,12 @@ in { }; }; }; + + ui = { + nvim-ufo = { + enable = true; + }; + }; autocomplete.blink-cmp = { enable = true; mappings = {