Compare commits

..

No commits in common. "c7e7b39d8353ba83d5d5dcffbd89a67a4fe464dc" and "e715dff0a41917fa3a7f8f396cb525efa4d922b9" have entirely different histories.

7 changed files with 239 additions and 179 deletions

View File

@ -41,11 +41,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697641173, "lastModified": 1696674829,
"narHash": "sha256-YuGEgJ4bSwvlfSgsUR2s6r1L3ZCdD8pvyU+pY4q+DMk=", "narHash": "sha256-t+BQGAghYqDaTE2UdU2t8/oYmebBJ2DRi2GAva5agFw=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "35e8def0b1e5ecf1198e7efe41cfe6aa0415b320", "rev": "f54d632da585a08185c6164017d79315c331181f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696985954, "lastModified": 1696904458,
"narHash": "sha256-dU1lYBWHqxkvbJV3B9oPeqLL0H8FkSKEqjPie+9xPgQ=", "narHash": "sha256-3L4I98OkSY0ayGu+p/sO1g1mC6jp2olv1kQVDVNARvE=",
"owner": "jcdickinson", "owner": "jcdickinson",
"repo": "codeium.nvim", "repo": "codeium.nvim",
"rev": "822e762567a0bf50b1a4e733c8c93691934d7606", "rev": "d9b026071378c18b7536be298365a2e3885cd64f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1698155728, "lastModified": 1696814493,
"narHash": "sha256-PUJ40o/0LyMEgSBEfLVyPA0K3gQnPYQDq9dW9nCOU9M=", "narHash": "sha256-1qArVsJGG2RHbV2iKFpAmM5os3myvwpXMOdFy5nh54M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8c5d52db5690c72406b0cb13a5ac8554a287c93a", "rev": "32ce057c183506cecb0b84950e4eaf39f37e8c75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,18 +242,14 @@
}, },
"flake-parts_3": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib_2"
"neovim-nightly-overlay",
"hercules-ci-effects",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1688466019,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,6 +257,29 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"neovim-nightly-overlay",
"hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs"
]
},
"locked": {
"lastModified": 1688466019,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -336,20 +355,56 @@
"type": "github" "type": "github"
} }
}, },
"haskell-flake": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.3.0",
"repo": "haskell-flake",
"type": "github"
}
},
"hercules-ci-agent": {
"inputs": {
"flake-parts": "flake-parts_4",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1688568579,
"narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
"type": "github"
},
"original": {
"id": "hercules-ci-agent",
"type": "indirect"
}
},
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1698165573, "lastModified": 1695684520,
"narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "300e0af24a1bbe32d115beb182efb01785582c45", "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1698250431, "lastModified": 1696776279,
"narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "narHash": "sha256-PRJiq+DSq5o/Dzd7ZYWTA8larDg4btkTICPzfjjalig=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "rev": "6dfbdc977e059f30376e23f70f67d9726d5c91b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +475,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1698136694, "lastModified": 1696339530,
"narHash": "sha256-YKtA8un/BMJY17r9ydLa08y2St7Dtai2y/67t1+UGeM=", "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "5fd96ad55f4695837e938a8da0a83babcb64371f", "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +497,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1698190104, "lastModified": 1696891919,
"narHash": "sha256-40TEEIjlIb0hJE/yRsjLBwjkRYkj/4QRTkN1Op86umw=", "narHash": "sha256-h7/lmKV5zfJz/4m/oLib7iTqQ7fpfB599AzW2QRoGtg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a1b138a6258b00787cea43bddc48b7caa8cca3a0", "rev": "8abb6e1cee3e967ff414af0d6a1a31ebced95f5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +540,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1698097178, "lastModified": 1696724955,
"narHash": "sha256-W4W3pAYNpXp0jLZwK0Bxw6R7n2/UYxp+lnT5mD2/xEM=", "narHash": "sha256-7CczVKotC1RJuSyJMxgzUP11Y1txku9JAga5eFxpA+4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "d6856adaffb77a9cc1aac3d04d98276eaa5602a4", "rev": "72735ae6352085ef842f6ed496889115afd76ce4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -500,11 +555,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1697303681, "lastModified": 1694622745,
"narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +586,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1698254131, "lastModified": 1696931607,
"narHash": "sha256-wPqfjnqgZIhbLFK9ZDU+mkGJN4o7zWYcgkNdBxfeqZs=", "narHash": "sha256-gVV772uE7Th5iyRTh+KNA4YOBzaL9DjmNz+qep2f/Ww=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4df6cc87b5b7b39e4e0160132ca901fd28a10295", "rev": "c74fd1b820c24ebe1065af1cabbe2b6a4c86641d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,23 +621,6 @@
"type": "github" "type": "github"
} }
}, },
"neotest-python": {
"flake": false,
"locked": {
"lastModified": 1698425037,
"narHash": "sha256-C3Dw+fl1QNYU9tg0fE52EzOqeGXxu1vq5SPmDnv2LD8=",
"owner": "MoritzBoehme",
"repo": "neotest-python",
"rev": "3c09dbafb0a1e3ac8b19eabc7157ec312cc2f2ee",
"type": "github"
},
"original": {
"owner": "MoritzBoehme",
"ref": "fix-runtimepath-search",
"repo": "neotest-python",
"type": "github"
}
},
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -593,11 +631,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1698138555, "lastModified": 1696892794,
"narHash": "sha256-HOzLvbRnHtpNQJJN52JYKnTm0d9K508QKsEFLbxjRHk=", "narHash": "sha256-KQ1X1CLjabnnLItHb2zlrSZzj4lQNkdZMx84QWcU9qA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "1094d0c0dbd0f37ccc0f1d18c73c6066e5690664", "rev": "43f22853fecf312713deed983b9cde1a6bda6ebd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,14 +651,14 @@
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1698192055, "lastModified": 1696896059,
"narHash": "sha256-YC5IWqMTwdFxrIWYfdhW3SWmb356VtzcXt8fc49PCos=", "narHash": "sha256-GLJJRb2PSI9Hq1J4D0YVMV6lxHPP2QilEAWeIrEQSEI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "d3ea1553487b52fe7603c830994475f51cd619db", "rev": "4ea129658fe3e7ecaebe574093ed3fe9673b5f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -636,11 +674,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697946153, "lastModified": 1696736548,
"narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=", "narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d", "rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -651,11 +689,11 @@
}, },
"nix-lazy-nvim": { "nix-lazy-nvim": {
"locked": { "locked": {
"lastModified": 1698421129, "lastModified": 1694868321,
"narHash": "sha256-pwpLc6SS3c4s6i2+MZa8y+JigFwAbFw69bwN8S1CYwQ=", "narHash": "sha256-LHPQkD+7ltdo77gpFQOnr8QAgYPdtFf9pm/Alwrs570=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "408ab5cad386453e3cce8233b377fc95320e4637", "rev": "1dc6361600111b1c46f6e85221334c8c47f88200",
"revCount": 5, "revCount": 4,
"type": "git", "type": "git",
"url": "https://git.moritzboeh.me/moritz/NixLazy.nvim" "url": "https://git.moritzboeh.me/moritz/NixLazy.nvim"
}, },
@ -674,17 +712,17 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1697392285, "lastModified": 1685886360,
"narHash": "sha256-1IBnF9IuStUWoAKJ74HNhV46+9Cbf/yZP6h6hJOJ1Cg=", "narHash": "sha256-mQ6Eryo7CFkt8KHVJcbg0HfXMGFrjMq04XnL9b9TsX0=",
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234", "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234", "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851",
"type": "github" "type": "github"
} }
}, },
@ -722,6 +760,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1688049487,
"narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@ -754,13 +810,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1697915759, "lastModified": 1692934111,
"narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1696725822,
"narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5aabb5780a11c500981993d49ee93cfa6df9307b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -788,11 +860,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1694767346,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -820,27 +892,43 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1697915759, "lastModified": 1688322751,
"narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1697915759, "lastModified": 1696757521,
"narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2646b294a146df2781b1ca49092450e8a32814e1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1696757521,
"narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "rev": "2646b294a146df2781b1ca49092450e8a32814e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -850,7 +938,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1689261696, "lastModified": 1689261696,
"narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
@ -866,30 +954,14 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1692934111,
"narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"none-ls-nvim": { "none-ls-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697600654, "lastModified": 1696658105,
"narHash": "sha256-dDMZEgT5uG31bEsLiX9r6MJlOJUdQyeTPJAeRcY2z7s=", "narHash": "sha256-4+B2F4ZweWTqXlhSs0jiBaKSv52G4X7p37KHfYl6sPo=",
"owner": "nvimtools", "owner": "nvimtools",
"repo": "none-ls.nvim", "repo": "none-ls.nvim",
"rev": "dc9b7e28f5573a1a2225ffb33893d23d3e052ed6", "rev": "ae339f45590cc421a68de885fc5a3261cc247362",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +972,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1698253808, "lastModified": 1696923989,
"narHash": "sha256-00mJdl0SYfSO/zQYpOaBV3sSZfQbl8cahI7CewTbEtA=", "narHash": "sha256-cANE1rSfOb3yxQ+bH7CTXZbj34AnQyzu0g22JDbLUpE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "923a29e2916f1d2589d933018b80b9ca2c4e39be", "rev": "0268065df586f8cae6b648432ebbda3b5ac96503",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -916,11 +988,11 @@
"nvim-lspconfig": { "nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698055249, "lastModified": 1696572942,
"narHash": "sha256-Ohckvu+Vt5CE5uZt2TJcUmG4QM97d1F67n2YmCaVGwo=", "narHash": "sha256-i3lDsFwoMddpN1I4t3Fj+Dthyxq7twCgpYuNtlvfI5Y=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "6428fcab6f3c09e934bc016c329806314384a41e", "rev": "2b361e043810d5587d9af0787f8ce40da92ec5e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,11 +1004,11 @@
"nvim-puppeteer": { "nvim-puppeteer": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697557313, "lastModified": 1696887151,
"narHash": "sha256-9aLDtdhyWzU8uqH6mohiLC6eEATC1Neb+rvcx7sxcdU=", "narHash": "sha256-voQru65IC5OM5JVwa1v62O7tmsIdGZJ6BS75lHt0Pxo=",
"owner": "chrisgrieser", "owner": "chrisgrieser",
"repo": "nvim-puppeteer", "repo": "nvim-puppeteer",
"rev": "b2793ab39120086fa59327d3901a847961198662", "rev": "4a2c68b93366eca5bca9e6b71e6cc8d643cfdca5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -967,15 +1039,15 @@
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1698227354, "lastModified": 1696846637,
"narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -987,11 +1059,11 @@
"rofi-wayland": { "rofi-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697052256, "lastModified": 1695649959,
"narHash": "sha256-3mTmwoeP7yUg7ldbatvQB+hwHhwuHOoZZb1ozWwSsVw=", "narHash": "sha256-WG1EyBYTbDsK4RsPgp8K/PlscvRSNthQSyN3cqxuXcc=",
"owner": "lbonn", "owner": "lbonn",
"repo": "rofi", "repo": "rofi",
"rev": "5cd1e3ca2b6b896b2e591b465cc590479ef07aab", "rev": "9d11a2b4a9095b3f0a092155f749900f7eb8e047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1019,12 +1091,11 @@
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"impermanence": "impermanence", "impermanence": "impermanence",
"master": "master", "master": "master",
"neotest-python": "neotest-python",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-lazy-nvim": "nix-lazy-nvim", "nix-lazy-nvim": "nix-lazy-nvim",
"nix-super": "nix-super", "nix-super": "nix-super",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_8",
"none-ls-nvim": "none-ls-nvim", "none-ls-nvim": "none-ls-nvim",
"nur": "nur", "nur": "nur",
"nvim-lspconfig": "nvim-lspconfig", "nvim-lspconfig": "nvim-lspconfig",
@ -1035,6 +1106,7 @@
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
"telekasten-nvim": "telekasten-nvim", "telekasten-nvim": "telekasten-nvim",
"telescope-nvim": "telescope-nvim",
"timers": "timers" "timers": "timers"
} }
}, },
@ -1056,11 +1128,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1697957990, "lastModified": 1696697597,
"narHash": "sha256-LlyEQ4z1immaiZV+MQMUXM3KpNoRY/xZVm8mmN5j3yg=", "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3ddf9649fdac7db15aeea95cb3114c13594d265", "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1163,11 +1235,11 @@
"telekasten-nvim": { "telekasten-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697095424, "lastModified": 1694166243,
"narHash": "sha256-lLy83LiGhyAdVV82YSJUfWyLqxK3ghFJ/FWNxBFl7mQ=", "narHash": "sha256-DblFcMlXsiHJCFojjpcwqZdnRqGuk79yoNBJTR8p5S4=",
"owner": "renerocksai", "owner": "renerocksai",
"repo": "telekasten.nvim", "repo": "telekasten.nvim",
"rev": "3fd50c62c1ed2f973ce8639c1218445e4e91a962", "rev": "bd5d323581f24ee124b33688287e6a22244c6f2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1176,10 +1248,26 @@
"type": "github" "type": "github"
} }
}, },
"telescope-nvim": {
"flake": false,
"locked": {
"lastModified": 1696709104,
"narHash": "sha256-v68sId4cWHneUaaYp2neVtBobNZo8lsxKoBhRF4yZrI=",
"owner": "nvim-telescope",
"repo": "telescope.nvim",
"rev": "5a747a9587e4bfc4ae086a38cc679fe54f983b69",
"type": "github"
},
"original": {
"owner": "nvim-telescope",
"repo": "telescope.nvim",
"type": "github"
}
},
"timers": { "timers": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_10",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -1218,18 +1306,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1697909146, "lastModified": 1696410538,
"narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -1249,11 +1337,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697981233, "lastModified": 1694628480,
"narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -22,7 +22,7 @@
# Programs # Programs
nix-super.inputs.nixpkgs.follows = "stable"; nix-super.inputs.nixpkgs.follows = "stable";
nix-super.url = "github:privatevoid-net/nix-super/ba035e1ea339a97e6ba6a1dd79e0c0e334240234"; nix-super.url = "github:privatevoid-net/nix-super/518ce777422c6ade8988a3dd1bebb407a08f3851"; # NOTE: because nix 1.18 is borked
rofi-wayland.flake = false; rofi-wayland.flake = false;
rofi-wayland.url = "github:lbonn/rofi/wayland"; rofi-wayland.url = "github:lbonn/rofi/wayland";
timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
@ -49,10 +49,10 @@
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
telekasten-nvim.flake = false; telekasten-nvim.flake = false;
telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
telescope-nvim.flake = false;
telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
none-ls-nvim.flake = false; none-ls-nvim.flake = false;
none-ls-nvim.url = "github:nvimtools/none-ls.nvim"; none-ls-nvim.url = "github:nvimtools/none-ls.nvim";
neotest-python.flake = false;
neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search";
# Hyprland # Hyprland
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";

View File

@ -32,6 +32,7 @@ in
firefox.enable = mkDefault true; firefox.enable = mkDefault true;
gpg.enable = mkDefault true; gpg.enable = mkDefault true;
hyprland.enable = mkDefault true; hyprland.enable = mkDefault true;
logseq.enable = mkDefault true;
nix-edit.enable = mkDefault true; nix-edit.enable = mkDefault true;
nvim.enable = mkDefault true; nvim.enable = mkDefault true;
python.versions."311".enable = mkDefault true; python.versions."311".enable = mkDefault true;
@ -124,9 +125,6 @@ in
}; };
# disable network-online.target # disable network-online.target
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;
boot = {
consoleLogLevel = 0;
kernelParams = [ "quiet" "udev.log_level=3" ];
};
}; };
} }

View File

@ -16,6 +16,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
lutris lutris
legendary-gl legendary-gl
heroic
mangohud mangohud
]; ];
}; };

View File

@ -306,25 +306,5 @@ with builtins;
plugin = nvim-puppeteer; plugin = nvim-puppeteer;
lazy = false; # NOTE: plugin lazy-loads itself. lazy = false; # NOTE: plugin lazy-loads itself.
} }
{
plugin = neotest;
lazy = false;
keys = [
{ key = "<leader>ct"; cmd = "<cmd>lua require('neotest').summary.toggle()<cr>"; desc = "Test"; }
];
dependencies = [
{ plugin = plenary-nvim; }
{ plugin = FixCursorHold-nvim; }
# adapters
{
plugin = neotest-python;
conf = /* lua */ ''
vim.opt.runtimepath:append("${neotest-python}")
'';
}
];
conf = readFile ./lua/neotest.lua;
}
]; ];
} }

View File

@ -1,7 +0,0 @@
require("neotest").setup({
adapters = {
require("neotest-python")({
dap = { justMyCode = false },
}),
},
})

View File

@ -30,6 +30,11 @@ with lib.my;
src = inputs.actions-preview-nvim; src = inputs.actions-preview-nvim;
}; };
telescope-nvim = prev.vimPlugins.telescope-nvim.overrideAttrs (_: {
version = mkVersionInput inputs.telescope-nvim;
src = inputs.telescope-nvim;
});
nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: { nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = mkVersionInput inputs.nvim-treesitter; version = mkVersionInput inputs.nvim-treesitter;
src = inputs.nvim-treesitter; src = inputs.nvim-treesitter;
@ -47,14 +52,9 @@ with lib.my;
src = inputs.nvim-puppeteer; src = inputs.nvim-puppeteer;
}; };
null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (_: { null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: {
version = mkVersionInput inputs.none-ls-nvim; version = mkVersionInput inputs.none-ls-nvim;
src = inputs.none-ls-nvim; src = inputs.none-ls-nvim;
}); });
neotest-python = prev.vimPlugins.neotest-python.overrideAttrs (_: {
version = mkVersionInput inputs.neotest-python;
src = inputs.neotest-python;
});
}; };
} }