From 01c29fe84629327b36cc7a237cd92872fbb50177 Mon Sep 17 00:00:00 2001 From: scouckel Date: Sun, 3 May 2026 04:47:32 -0500 Subject: update + lix + no more millennium + oil-nvim + idek anymore --- flake.lock | 486 +++---------------------------- flake.nix | 14 +- modules/hosts/dragotha/dragotha.nix | 2 +- modules/hosts/tiamat/tiamat.nix | 1 - modules/hosts/vecna/vecna.nix | 1 - modules/nixosModules/createHost.nix | 1 + modules/nixosModules/desktop/default.nix | 11 +- modules/nixosModules/desktop/gaming.nix | 7 +- modules/packages/environment.nix | 1 + modules/packages/kitty.nix | 2 +- modules/packages/nvf/_nvfConfig.nix | 13 + 11 files changed, 71 insertions(+), 468 deletions(-) diff --git a/flake.lock b/flake.lock index 92c2cd3..9821f01 100644 --- a/flake.lock +++ b/flake.lock @@ -1,56 +1,5 @@ { "nodes": { - "abseil-src": { - "flake": false, - "locked": { - "lastModified": 1722535511, - "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", - "owner": "abseil", - "repo": "abseil-cpp", - "rev": "4447c7562e3bc702ade25105912dce503f0c4010", - "type": "github" - }, - "original": { - "owner": "abseil", - "ref": "20240722.0", - "repo": "abseil-cpp", - "type": "github" - } - }, - "asio-src": { - "flake": false, - "locked": { - "lastModified": 1702548444, - "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", - "owner": "chriskohlhoff", - "repo": "asio", - "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", - "type": "github" - }, - "original": { - "owner": "chriskohlhoff", - "ref": "asio-1-30-0", - "repo": "asio", - "type": "github" - } - }, - "curl-src": { - "flake": false, - "locked": { - "lastModified": 1743572790, - "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", - "owner": "curl", - "repo": "curl", - "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", - "type": "github" - }, - "original": { - "owner": "curl", - "ref": "curl-8_13_0", - "repo": "curl", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -72,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -106,56 +55,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "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" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, - "fmt-src": { - "flake": false, - "locked": { - "lastModified": 1758127535, - "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", - "owner": "fmtlib", - "repo": "fmt", - "rev": "e424e3f2e607da02742f73db84873b8084fc714c", - "type": "github" - }, - "original": { - "owner": "fmtlib", - "ref": "12.0.0", - "repo": "fmt", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -163,11 +62,11 @@ ] }, "locked": { - "lastModified": 1777349711, - "narHash": "sha256-PGKgo2dO6fK603QGI+DWXdKmS09pbJjjTxwRHdhkGZA=", + "lastModified": 1777780644, + "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1140540536d483e2730320100f6835d62c94fdf", + "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d", "type": "github" }, "original": { @@ -212,232 +111,6 @@ "type": "github" } }, - "incbin-src": { - "flake": false, - "locked": { - "lastModified": 1748303270, - "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - }, - "original": { - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - } - }, - "json-src": { - "flake": false, - "locked": { - "lastModified": 1744360948, - "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", - "owner": "nlohmann", - "repo": "json", - "rev": "55f93686c01528224f448c19128836e7df245f72", - "type": "github" - }, - "original": { - "owner": "nlohmann", - "ref": "v3.12.0", - "repo": "json", - "type": "github" - } - }, - "libgit2-src": { - "flake": false, - "locked": { - "lastModified": 1749227175, - "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.9.1", - "repo": "libgit2", - "type": "github" - } - }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1777373577, - "narHash": "sha256-K0sXr8tRA9L1FGE8Khl42NR+DmZOY9gNYCP8ljX7TAo=", - "rev": "faaa14a303dabc6309a52cc8e5eba86f9e29ccaf", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/faaa14a303dabc6309a52cc8e5eba86f9e29ccaf.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1773460763, - "narHash": "sha256-y9kC3ff89btXS8RD6pAtM50g0qtsim1I8HXBtgSqdbI=", - "rev": "5e56f5a973e24292b125dca9e9d506b0a91d6903", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5e56f5a973e24292b125dca9e9d506b0a91d6903.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, - "luajit-src": { - "flake": false, - "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", - "type": "github" - } - }, - "luajson-src": { - "flake": false, - "locked": { - "lastModified": 1763065879, - "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - } - }, - "millennium": { - "inputs": { - "abseil-src": "abseil-src", - "asio-src": "asio-src", - "curl-src": "curl-src", - "fmt-src": "fmt-src", - "incbin-src": "incbin-src", - "json-src": "json-src", - "libgit2-src": "libgit2-src", - "luajit-src": "luajit-src", - "luajson-src": "luajson-src", - "millennium-src": "millennium-src", - "minhook-src": "minhook-src", - "mini-src": "mini-src", - "minizip-src": "minizip-src", - "nixpkgs": "nixpkgs", - "re2-src": "re2-src", - "websocketpp-src": "websocketpp-src", - "zlib-src": "zlib-src" - }, - "locked": { - "dir": "packages/nix", - "lastModified": 1776469299, - "narHash": "sha256-6KV0OgBCKrbVP4EM9hqcospkoPImbt6VZ18Mbgi9bqY=", - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "rev": "19741152e4237810141a0f18868a6993939e556a", - "type": "github" - }, - "original": { - "dir": "packages/nix", - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "type": "github" - } - }, - "millennium-src": { - "flake": false, - "locked": { - "lastModified": 1770463863, - "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - } - }, - "minhook-src": { - "flake": false, - "locked": { - "lastModified": 1743163800, - "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", - "owner": "TsudaKageyu", - "repo": "minhook", - "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", - "type": "github" - }, - "original": { - "owner": "TsudaKageyu", - "ref": "v1.3.4", - "repo": "minhook", - "type": "github" - } - }, - "mini-src": { - "flake": false, - "locked": { - "lastModified": 1743356736, - "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", - "owner": "metayeti", - "repo": "mINI", - "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", - "type": "github" - }, - "original": { - "owner": "metayeti", - "ref": "0.9.18", - "repo": "mINI", - "type": "github" - } - }, - "minizip-src": { - "flake": false, - "locked": { - "lastModified": 1746408966, - "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", - "owner": "zlib-ng", - "repo": "minizip-ng", - "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "4.0.10", - "repo": "minizip-ng", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1770419553, @@ -477,11 +150,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1777229239, - "narHash": "sha256-OwSaWqlBdKn8QIa7BrPtJmlrr46U7AuwMc/toDKuMZw=", + "lastModified": 1777402031, + "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "3f1d78b63b6af353c0685b8a7411c04d980426e4", + "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", "type": "github" }, "original": { @@ -508,15 +181,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", - "owner": "nixos", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -524,11 +197,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -539,27 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777548390, + "narHash": "sha256-WacE23EbHTsBKvr8cu+1DFNbP6Rh1brHUH5SDUI0NQI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1775579569, - "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dfd9566f82a6e1d55c30f861879186440614696e", + "rev": "7aaa00e7cc9be6c316cb5f6617bd740dd435c59d", "type": "github" }, "original": { @@ -569,7 +226,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -594,14 +251,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1777150561, - "narHash": "sha256-YLVqyn6LpFa+h697TmZIk0qVIbe7MxMpL8UTF4K+efA=", + "lastModified": 1777478067, + "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", "owner": "NotAShelf", "repo": "nvf", - "rev": "5b4f9c63205e5b0ef180a2b0e4cc844111f96fa6", + "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", "type": "github" }, "original": { @@ -610,34 +267,14 @@ "type": "github" } }, - "re2-src": { - "flake": false, - "locked": { - "lastModified": 1762353507, - "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", - "owner": "google", - "repo": "re2", - "rev": "927f5d53caf8111721e734cf24724686bb745f55", - "type": "github" - }, - "original": { - "owner": "google", - "ref": "2025-11-05", - "repo": "re2", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", - "lix": "lix", - "lix-module": "lix-module", - "millennium": "millennium", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nvf": "nvf", "wrapper-modules": "wrapper-modules", "wrappers": "wrappers", @@ -659,48 +296,16 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "websocketpp-src": { - "flake": false, - "locked": { - "lastModified": 1587320717, - "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", - "owner": "zaphoyd", - "repo": "websocketpp", - "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", - "type": "github" - }, - "original": { - "owner": "zaphoyd", - "ref": "0.8.2", - "repo": "websocketpp", - "type": "github" - } - }, "wrapper-modules": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1777327843, - "narHash": "sha256-wwJ2Npr92nVL0cVJ3oOwamWoJ0M8zl7WfO9oD1Gk7GI=", + "lastModified": 1777766748, + "narHash": "sha256-NXtIdG/t0iJP7DGiQ4J3XkAKySc/8osBMvcoh4YULF4=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "81701c9bbee923d5d8f56c5e04f48fbf245c7507", + "rev": "1792c664c565741ef0993f3fd27d94c358f412ab", "type": "github" }, "original": { @@ -711,14 +316,14 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1776505856, - "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=", + "lastModified": 1777405024, + "narHash": "sha256-aFlRAeukwsJXd4b/0uLUTQaKo5wroOfVnoxTxi9sPVA=", "owner": "Lassulus", "repo": "wrappers", - "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8", + "rev": "cac6a55af3e4ebcabec478348ddd0fe032650834", "type": "github" }, "original": { @@ -735,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777356688, - "narHash": "sha256-fOhJpz7QAkBWAAih72CmnIfIN0pHfuZjhZQ/hBLNWxo=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b3c972b3d8537a9cf7a0db96b164c9c3e580884a", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { @@ -747,23 +352,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zlib-src": { - "flake": false, - "locked": { - "lastModified": 1754565515, - "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", - "owner": "zlib-ng", - "repo": "zlib-ng", - "rev": "425439062b114a0f6cf625022c41d929c7e879f9", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "2.2.5", - "repo": "zlib-ng", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index aa072a2..00fadfc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,13 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; wrappers.url = "github:Lassulus/wrappers"; wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -33,7 +23,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-flatpak.url = "github:gmodena/nix-flatpak"; - millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + # millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); diff --git a/modules/hosts/dragotha/dragotha.nix b/modules/hosts/dragotha/dragotha.nix index 82de721..e73eae8 100644 --- a/modules/hosts/dragotha/dragotha.nix +++ b/modules/hosts/dragotha/dragotha.nix @@ -5,7 +5,6 @@ }: { flake.nixosConfigurations.dragotha = inputs.nixpkgs.lib.nixosSystem { modules = [ - inputs.lix-module.nixosModules.default self.nixosModules.dragotha self.nixosModules.dragothaHardware @@ -34,6 +33,7 @@ trusted-public-keys = [ "linux-surface.cachix.org-1:h4xRj4dujnm9I9aL2V7OmUTiT7oEefGVwiI4UQrESsk=" ]; + trusted-users = ["jck" "root"]; }; hardware.graphics = { diff --git a/modules/hosts/tiamat/tiamat.nix b/modules/hosts/tiamat/tiamat.nix index 30f0a1f..12b1250 100644 --- a/modules/hosts/tiamat/tiamat.nix +++ b/modules/hosts/tiamat/tiamat.nix @@ -5,7 +5,6 @@ }: { flake.nixosConfigurations.tiamat = inputs.nixpkgs.lib.nixosSystem { modules = [ - inputs.lix-module.nixosModules.default self.nixosModules.tiamat self.nixosModules.tiamatHardware diff --git a/modules/hosts/vecna/vecna.nix b/modules/hosts/vecna/vecna.nix index e6dedbf..d3cd9a7 100644 --- a/modules/hosts/vecna/vecna.nix +++ b/modules/hosts/vecna/vecna.nix @@ -5,7 +5,6 @@ }: { flake.nixosConfigurations.vecna = inputs.nixpkgs.lib.nixosSystem { modules = [ - inputs.lix-module.nixosModules.default self.nixosModules.vecna self.nixosModules.vecnaHardware diff --git a/modules/nixosModules/createHost.nix b/modules/nixosModules/createHost.nix index 18fc915..a4996cb 100644 --- a/modules/nixosModules/createHost.nix +++ b/modules/nixosModules/createHost.nix @@ -68,6 +68,7 @@ }; nixpkgs.config.allowUnfree = true; + nix.package = pkgs.lix; nix.settings = { experimental-features = ["nix-command" "flakes"]; auto-optimise-store = true; diff --git a/modules/nixosModules/desktop/default.nix b/modules/nixosModules/desktop/default.nix index 1f8a2c8..f4df60e 100644 --- a/modules/nixosModules/desktop/default.nix +++ b/modules/nixosModules/desktop/default.nix @@ -6,7 +6,6 @@ flake.nixosModules.desktop = {pkgs, ...}: { imports = [ self.nixosModules.gaming - self.nixosModules.mullvad self.nixosModules.pipewire self.nixosModules.printing self.nixosModules.tailscaleDesktop @@ -39,6 +38,7 @@ pkgs.vlc pkgs.winetricks pkgs.wineWow64Packages.stable + pkgs.wl-clipboard ]; boot.plymouth.enable = true; @@ -53,5 +53,14 @@ corefonts unifont ]; + + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + obs-pipewire-audio-capture + obs-vaapi + wlrobs + ]; + }; }; } diff --git a/modules/nixosModules/desktop/gaming.nix b/modules/nixosModules/desktop/gaming.nix index 36db573..94851f7 100644 --- a/modules/nixosModules/desktop/gaming.nix +++ b/modules/nixosModules/desktop/gaming.nix @@ -8,11 +8,13 @@ inputs.nix-flatpak.nixosModules.nix-flatpak ]; - nixpkgs.overlays = [inputs.millennium.overlays.default]; + # nixpkgs.overlays = [ + # inputs.millennium.overlays.default + # ]; programs.steam = { enable = true; - package = pkgs.millennium-steam; + # package = pkgs.millennium-steam; protontricks.enable = true; extest.enable = true; @@ -23,6 +25,7 @@ }; environment.systemPackages = with pkgs; [ + faugus-launcher prismlauncher heroic ]; diff --git a/modules/packages/environment.nix b/modules/packages/environment.nix index cfdd46e..31ff8c0 100644 --- a/modules/packages/environment.nix +++ b/modules/packages/environment.nix @@ -32,6 +32,7 @@ pkgs.btop pkgs.killall pkgs.lazygit + pkgs.nix-output-monitor pkgs.p7zip pkgs.rsync pkgs.speedtest-cli diff --git a/modules/packages/kitty.nix b/modules/packages/kitty.nix index 53580cb..55e9752 100644 --- a/modules/packages/kitty.nix +++ b/modules/packages/kitty.nix @@ -19,7 +19,7 @@ shell_integration = "enabled"; allow_remote_control = "yes"; - confirm_os_window_close = -1; + confirm_os_window_close = 0; # Gruvbox Material Dark Hard background = "#1d2021"; diff --git a/modules/packages/nvf/_nvfConfig.nix b/modules/packages/nvf/_nvfConfig.nix index f7b2c60..2a94619 100644 --- a/modules/packages/nvf/_nvfConfig.nix +++ b/modules/packages/nvf/_nvfConfig.nix @@ -73,6 +73,12 @@ silent = true; action = ":noh"; } + { + key = "e"; + mode = "n"; + action = ":Oil"; + desc = "Open Oil File Explorer"; + } ]; lsp = { @@ -118,6 +124,13 @@ motion = { precognition.enable = true; }; + oil-nvim = { + enable = true; + setupOpts = { + view_options.show_hidden = true; + }; + gitStatus.enable = true; + }; }; visuals = { -- cgit v1.3.1