From a040cebe8e4f9dea894aa27b8982225b673fd6d2 Mon Sep 17 00:00:00 2001 From: Natalie Date: Fri, 1 Aug 2025 19:21:02 -0700 Subject: [PATCH] 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 = {