diff --git a/flake.lock b/flake.lock index 5270b9e..4259a1d 100644 --- a/flake.lock +++ b/flake.lock @@ -217,29 +217,6 @@ "type": "github" } }, - "beautysh": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils" - }, - "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat_2", @@ -357,11 +334,11 @@ ] }, "locked": { - "lastModified": 1701775991, - "narHash": "sha256-/51DaSTzoW+wQfj5P9EnTbSxixDFjjhfnGdMKcSp+is=", + "lastModified": 1702569759, + "narHash": "sha256-Ze3AdEEsVZBRJ4wn13EZpV1Uubkzi59TkC4j2G9xoFI=", "owner": "nix-community", "repo": "disko", - "rev": "f84c3684900d11cf19f530070d32d55f0ed51374", + "rev": "98ab91109716871f50ea8cb0e0ac7cc1e1e14714", "type": "github" }, "original": { @@ -498,11 +475,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -687,11 +664,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702814335, + "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "e4dba0bd01956170667458be7b45f68170a63651", "type": "github" }, "original": { @@ -721,11 +698,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1701691817, - "narHash": "sha256-NX3tSg2KcYKz9KNQgWbqzEH8LUzHXXFbv8iR7A9vOMM=", + "lastModified": 1702814943, + "narHash": "sha256-tNKSDbtoEDfCTs30dyW0Fcj4KJpjzTRASL6f2BbuSKE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "087a3db40268af929b2f19c02c1a994c71653830", + "rev": "ac8b1c4cfb2f9111e709aaf503511df354e86733", "type": "github" }, "original": { @@ -757,11 +734,11 @@ ] }, "locked": { - "lastModified": 1701202812, - "narHash": "sha256-ym/Rd4tR4i2d1WdPNKaeeIz/UoyfnCe5UBZbUl1M0PM=", + "lastModified": 1702607241, + "narHash": "sha256-+farSP+jVeLssxkSTS+bH60F+6CZATEA64sbmyZtq2E=", "owner": "astro", "repo": "microvm.nix", - "rev": "89bb7a5230a4820736a43e058c8d2a2c560d672b", + "rev": "67d28f368ee387bc9e4cfbf89780ccc31643bbed", "type": "github" }, "original": { @@ -778,11 +755,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1701195091, - "narHash": "sha256-8v4Pr7DOfyOv9xBxaAHj+1qbej4+nUlThUGosNxKXGU=", + "lastModified": 1702815315, + "narHash": "sha256-LEpv7kvB7KPj/6BoNYWMcVjRezTJe6FNmg5kCKZQxMk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "608089054e7cf4e86b218375aaecbb2ca80c9e67", + "rev": "3c6e1234af3aa26fc60d0969619cf6806ec51639", "type": "github" }, "original": { @@ -800,11 +777,11 @@ ] }, "locked": { - "lastModified": 1698974481, - "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "lastModified": 1701208414, + "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", "type": "github" }, "original": { @@ -820,11 +797,11 @@ ] }, "locked": { - "lastModified": 1701572887, - "narHash": "sha256-oCPwQZT0Inis4zcYhtFHUp7Rym1zglKPLDcRird35q8=", + "lastModified": 1702782546, + "narHash": "sha256-Y/y9Xpd8W2CSFIAXJExAvg72J8STmGk7CP2Vv91t930=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "41afa8d1c061beda68502bcc67f2788f3a77042b", + "rev": "27edc98a32959b003e4bcef9719ad6f24e312343", "type": "github" }, "original": { @@ -871,11 +848,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701656485, - "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -892,11 +869,11 @@ ] }, "locked": { - "lastModified": 1694993757, - "narHash": "sha256-aXjkz/3rSuJ78Ry0ekzcTrdwvdgJwFyblOSL/PdgbUo=", + "lastModified": 1702426831, + "narHash": "sha256-p6tRcvYFNrPSwjIdH+hLxRPJZwxILRpEZw3skK+CDsU=", "owner": "thelegy", "repo": "nixos-nftables-firewall", - "rev": "0680e272f389a8101f87dd82be0a8132c8eabddf", + "rev": "89174e90eb29ab99273f22cd21509b21da6a4c2e", "type": "github" }, "original": { @@ -908,11 +885,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -924,11 +901,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1701564385, - "narHash": "sha256-um5ce7hnsQ8Do+oKf90zGKVmEqufr4Q6T8zfY9Hon38=", + "lastModified": 1702774034, + "narHash": "sha256-M0IsUA89EKHL8IDx9bf+e2W2l1kMRpaZ4h08navMXig=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "152c00fc19bc45af5dd65bd41d1d020c2ba0b4ca", + "rev": "9b4f1493009b8d2f55a525a01de10addc9a0a752", "type": "github" }, "original": { @@ -995,11 +972,11 @@ ] }, "locked": { - "lastModified": 1701730884, - "narHash": "sha256-eSZF7+R0XTcrrzi3vf4nCTLiuKPJHxuMTRg5bz4TMmE=", + "lastModified": 1702818997, + "narHash": "sha256-TYGX/VZ+0aTVeA0jwghmfb1LLtyWHuYCncxYV3T0mWc=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ca8a7cdd6efb13a30d8aa7f5a27fad4954d8aa9a", + "rev": "d3ed49c8ee55dc56f90038ab0cb01ca7b77c0dd5", "type": "github" }, "original": { @@ -1010,16 +987,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701045352, - "narHash": "sha256-iWsDbWzBP4gotkRfg/lH2A3O9wFoJc+yVO8CDuHLRe8=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5171694860f185961daff3b1b413dabcab421300", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1049,7 +1026,6 @@ }, "nixvim": { "inputs": { - "beautysh": "beautysh", "flake-utils": [ "flake-utils" ], @@ -1061,11 +1037,11 @@ ] }, "locked": { - "lastModified": 1701772025, - "narHash": "sha256-Q8U9c39+aX9dsyMWFjRLLCav5m+M6IrE1V7X9AWfreM=", + "lastModified": 1702653568, + "narHash": "sha256-SwrNBw/1/oMURAa9/8MdvC4b3UYohoMAvSazeIt3hkg=", "owner": "nix-community", "repo": "nixvim", - "rev": "903e2a1ccb92f17ac5810bc1229f5dd0addd7ba6", + "rev": "b3fb1c4c8189bc873911da3f31d18082a0721fa9", "type": "github" }, "original": { @@ -1074,33 +1050,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixvim", - "beautysh", - "utils" - ], - "nixpkgs": [ - "nixvim", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658665240, - "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -1170,11 +1119,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", + "lastModified": 1702456155, + "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", + "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", "type": "github" }, "original": { @@ -1255,11 +1204,11 @@ ] }, "locked": { - "lastModified": 1701532764, - "narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=", + "lastModified": 1702559747, + "narHash": "sha256-d6AmQp3M00WMPJquNfGVzIol5iojD1pi9slek+4N9VY=", "owner": "danth", "repo": "stylix", - "rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4", + "rev": "41d218597590a89324a4b7c50cf0bf088a7214ba", "type": "github" }, "original": { @@ -1382,11 +1331,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1702461037, + "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "d06b70e5163a903f19009c3f97770014787a080f", "type": "github" }, "original": { @@ -1396,21 +1345,6 @@ } }, "utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1652776076, "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", @@ -1431,7 +1365,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1699064982, diff --git a/hosts/kroma/default.nix b/hosts/kroma/default.nix index ea502bd..9754cfe 100644 --- a/hosts/kroma/default.nix +++ b/hosts/kroma/default.nix @@ -2,6 +2,7 @@ inputs, lib, minimal, + pkgs, ... }: { @@ -56,4 +57,8 @@ nix.settings.trusted-substituters = ["https://ai.cachix.org"]; nix.settings.trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="]; + + nixpkgs.config.permittedInsecurePackages = lib.warnIf (pkgs.obsidian.version != "1.4.16") "REMOVE THIS obsidian electron override! in kroma.nix" [ + "electron-25.9.0" + ]; } diff --git a/modules/distributed-config.nix b/modules/distributed-config.nix index 37864f8..b69ca76 100644 --- a/modules/distributed-config.nix +++ b/modules/distributed-config.nix @@ -1,7 +1,6 @@ { config, lib, - options, nodes, ... }: let diff --git a/users/myuser/neovim/appearance.nix b/users/myuser/neovim/appearance.nix index 95f46a8..445b724 100644 --- a/users/myuser/neovim/appearance.nix +++ b/users/myuser/neovim/appearance.nix @@ -4,7 +4,8 @@ lualine = { enable = true; extensions = ["fzf" "nvim-dap-ui" "symbols-outline" "trouble" "neo-tree" "quickfix" "fugitive"]; - componentSeparators = null; + componentSeparators.left = null; + componentSeparators.right = null; # componentSeparators.left = "|"; # componentSeparators.right = "|"; # sectionSeparators.left = "";