summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-04-01 21:38:49 +0200
committeradikro <adikro@disroot.org>2026-04-01 21:38:49 +0200
commitb1e0a67ef30d0e6e957045bf254aa8f397d467d1 (patch)
tree6eab6d25e4dfea49717063c7094ef0c8cf09c6be
parent6e2d32bec6a82c9fa3cb1d9238fd86196f67702c (diff)
thinkpad sync
-rw-r--r--flake.lock496
-rw-r--r--flake.nix8
-rw-r--r--hm/env/swayidle.nix2
-rw-r--r--hm/env/waybar.nix2
-rw-r--r--hm/soft/browser.nix2
-rw-r--r--hm/soft/mpv.nix2
-rw-r--r--hosts/desktop/configuration.nix1
-rw-r--r--hosts/thinkpad/configuration.nix6
-rw-r--r--os/core/drivers.nix18
-rw-r--r--os/core/security.nix1
-rw-r--r--os/srv/gaming.nix23
11 files changed, 402 insertions, 159 deletions
diff --git a/flake.lock b/flake.lock
index ee96c59..c93f03a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,24 +1,36 @@
{
"nodes": {
- "arkenfox": {
- "inputs": {
- "flake-compat": "flake-compat",
- "nixpkgs": [
- "nixpkgs"
- ],
- "pre-commit": "pre-commit"
+ "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": 1770200864,
- "narHash": "sha256-COdM5Lwfw07Q+YefYmcop1VPEX7e2goM9IiwfIrJt0g=",
- "owner": "dwarfmaster",
- "repo": "arkenfox-nixos",
- "rev": "94638bbfacfa250e5c88aaa7a8f2145926fb8e08",
+ "lastModified": 1702548444,
+ "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=",
+ "owner": "chriskohlhoff",
+ "repo": "asio",
+ "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d",
"type": "github"
},
"original": {
- "owner": "dwarfmaster",
- "repo": "arkenfox-nixos",
+ "owner": "chriskohlhoff",
+ "ref": "asio-1-30-0",
+ "repo": "asio",
"type": "github"
}
},
@@ -40,6 +52,23 @@
"url": "https://git.bwaaa.monster/beaker"
}
},
+ "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"
+ }
+ },
"disko": {
"inputs": {
"nixpkgs": [
@@ -85,22 +114,6 @@
}
},
"flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1767039857,
- "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_2": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -114,7 +127,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
- "flake-compat_3": {
+ "flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1751685974,
@@ -130,7 +143,7 @@
"url": "https://git.lix.systems/lix-project/flake-compat.git"
}
},
- "flake-compat_4": {
+ "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1767039857,
@@ -302,6 +315,23 @@
"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"
+ }
+ },
"fsel": {
"inputs": {
"flake-utils": "flake-utils",
@@ -324,28 +354,6 @@
"type": "github"
}
},
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "arkenfox",
- "pre-commit",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -353,11 +361,11 @@
]
},
"locked": {
- "lastModified": 1774738535,
- "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=",
+ "lastModified": 1775047159,
+ "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a",
+ "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2",
"type": "github"
},
"original": {
@@ -388,6 +396,198 @@
"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"
+ }
+ },
+ "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": [
+ "nix-gaming-edge",
+ "nixpkgs"
+ ],
+ "re2-src": "re2-src",
+ "websocketpp-src": "websocketpp-src",
+ "zlib-src": "zlib-src"
+ },
+ "locked": {
+ "dir": "packages/nix",
+ "lastModified": 1774491538,
+ "narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=",
+ "owner": "SteamClientHomebrew",
+ "repo": "Millennium",
+ "rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8",
+ "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,
@@ -453,11 +653,11 @@
]
},
"locked": {
- "lastModified": 1774742707,
- "narHash": "sha256-a3FjZJxDOn0t18VwtIAgpNuUNaIEl6T+Awu5tXifQQw=",
+ "lastModified": 1774915815,
+ "narHash": "sha256-LocQzkSjVS4G0AKMBiEIVdBKCNTMZXQFjQMWFId4Jpg=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "7966a9c203276bea3b7e8dd2e125fd2b4c8b6753",
+ "rev": "9001416dc5d0ca24c8e4b5a44bfe7cd6fbeb1dd1",
"type": "github"
},
"original": {
@@ -469,11 +669,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1774725909,
- "narHash": "sha256-aOiiQCmjCrvo+jAUDO2oMa377FvOtU97aqvTm74ZRGU=",
+ "lastModified": 1774915197,
+ "narHash": "sha256-yor+eo8CVi7wBp7CjAMQnVoK+m197gsl7MvUzaqicns=",
"owner": "neovim",
"repo": "neovim",
- "rev": "d5516daf121aa718e79bcd423ee24c24492893c0",
+ "rev": "dbc4800dda2b0dc3290dc79955f857256e0694e2",
"type": "github"
},
"original": {
@@ -494,11 +694,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1774620721,
- "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=",
+ "lastModified": 1775042939,
+ "narHash": "sha256-qcCBdnnKj8g/TiYmfDl3LmTdLYVPxr08yht9JaTXW00=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7",
+ "rev": "0e4df2c05361ed0f5e8738335369b304a0962b02",
"type": "github"
},
"original": {
@@ -540,9 +740,30 @@
"type": "github"
}
},
+ "nix-gaming-edge": {
+ "inputs": {
+ "millennium": "millennium",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1775024047,
+ "narHash": "sha256-IJlm68GL8xQcKZnDsH3jOqgYfCJKrx0cr2TrKaUppD4=",
+ "owner": "powerofthe69",
+ "repo": "nix-gaming-edge",
+ "rev": "f03fb00a7a0eccfeb49a8551fd01a51f78902954",
+ "type": "github"
+ },
+ "original": {
+ "owner": "powerofthe69",
+ "repo": "nix-gaming-edge",
+ "type": "github"
+ }
+ },
"nixcord": {
"inputs": {
- "flake-compat": "flake-compat_2",
+ "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
@@ -550,11 +771,11 @@
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
- "lastModified": 1774800440,
- "narHash": "sha256-MQhm3HEVv9xHWQNIx/xp++q2+SUeH8hLohKZFIO7DZM=",
+ "lastModified": 1775060652,
+ "narHash": "sha256-/H9vs3NFCB4HGRfpvRXLDVl8k/up7qfIs/4d0tSXkdY=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "287d1894eb8f682a99660f1b8bcb0f063d948a0c",
+ "rev": "29cc1ce1d53b4e4b8c6249f843cae2604b305c1b",
"type": "github"
},
"original": {
@@ -565,11 +786,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1774777275,
- "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=",
+ "lastModified": 1774933469,
+ "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd",
+ "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337",
"type": "github"
},
"original": {
@@ -643,11 +864,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1774388614,
- "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
+ "lastModified": 1775002709,
+ "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
+ "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e",
"type": "github"
},
"original": {
@@ -659,11 +880,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1774386573,
- "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+ "lastModified": 1774709303,
+ "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+ "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github"
},
"original": {
@@ -675,11 +896,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1774386573,
- "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+ "lastModified": 1774709303,
+ "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+ "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github"
},
"original": {
@@ -733,11 +954,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1774803137,
- "narHash": "sha256-Tevm4k4U2/6SBdzMSp7TP0L+HSuhcJdZSbk2hoHfvN8=",
+ "lastModified": 1775067551,
+ "narHash": "sha256-sX1gR8TtUnT8H/FjDZ5J+72cMQIJbmrg7VzyMWkMYao=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "8d4a2c59ab7666082ed4aa0f91dbca6911a531da",
+ "rev": "251467ea54a21614389451797e96695625e1e25d",
"type": "github"
},
"original": {
@@ -748,7 +969,7 @@
},
"nvf": {
"inputs": {
- "flake-compat": "flake-compat_3",
+ "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_5",
"mnw": "mnw",
"ndg": "ndg",
@@ -758,11 +979,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1774736237,
- "narHash": "sha256-uQ+Was7QP9Bupr0XZyZXOAD32Ox8z2mJnevT2FmDwS8=",
+ "lastModified": 1774852850,
+ "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "a0636d5c977743851c91d3c2e74bfac90be48835",
+ "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
"type": "github"
},
"original": {
@@ -802,11 +1023,11 @@
"systems": "systems_4"
},
"locked": {
- "lastModified": 1774790305,
- "narHash": "sha256-tW1GBE0hzRBySkHYKGZS3tL82rllfOodPP/0xohr+Zg=",
+ "lastModified": 1774841714,
+ "narHash": "sha256-KusCEQLPAFn+aX6LD3pg8CVjTNDe0LaGYcpuvikNYog=",
"owner": "kuokuo123",
"repo": "otter-launcher",
- "rev": "869763de65d9d6f368c9931646a12c5aec42aa19",
+ "rev": "313ab686256f3113107159d698e3555b4fc4bf3c",
"type": "github"
},
"original": {
@@ -815,40 +1036,31 @@
"type": "github"
}
},
- "pre-commit": {
- "inputs": {
- "flake-compat": [
- "arkenfox",
- "flake-compat"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "arkenfox",
- "nixpkgs"
- ]
- },
+ "re2-src": {
+ "flake": false,
"locked": {
- "lastModified": 1769939035,
- "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+ "lastModified": 1762353507,
+ "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=",
+ "owner": "google",
+ "repo": "re2",
+ "rev": "927f5d53caf8111721e734cf24724686bb745f55",
"type": "github"
},
"original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
+ "owner": "google",
+ "ref": "2025-11-05",
+ "repo": "re2",
"type": "github"
}
},
"root": {
"inputs": {
- "arkenfox": "arkenfox",
"disko": "disko",
"fsel": "fsel",
"home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"niri": "niri",
+ "nix-gaming-edge": "nix-gaming-edge",
"nixcord": "nixcord",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
@@ -928,11 +1140,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1774718281,
- "narHash": "sha256-tQXPdiwU7Wqh91y85k6MwffoMRxl/rwaWpvI1Lhkr8A=",
+ "lastModified": 1774938158,
+ "narHash": "sha256-lkxHU999pm5HDcMRjJlj0qTyTyMZY4r3a7lySWUpbl4=",
"owner": "gabm",
"repo": "Satty",
- "rev": "590253c8bba01f5c559808dd432cbb80bc4bd7c8",
+ "rev": "7986f9e63dd68e58fbe7d31207b62d59db9b7a8c",
"type": "github"
},
"original": {
@@ -948,11 +1160,11 @@
]
},
"locked": {
- "lastModified": 1774760784,
- "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
+ "lastModified": 1774910634,
+ "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
+ "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
"type": "github"
},
"original": {
@@ -1074,17 +1286,17 @@
},
"waybar": {
"inputs": {
- "flake-compat": "flake-compat_4",
+ "flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1774475860,
- "narHash": "sha256-8V4qLObIgFfkrmpDhoT2+CY2wdv3RBjKM66M74Q8d9A=",
+ "lastModified": 1774943664,
+ "narHash": "sha256-ADGHtKZ+iqqax8T63Sy47r8Uvmz/smj2sMf8pOyn9gk=",
"owner": "Alexays",
"repo": "Waybar",
- "rev": "49460defdc9876acae4212769daab9bbe0666d61",
+ "rev": "1e965ccce06faf9515d0570329c12f7245d958ed",
"type": "github"
},
"original": {
@@ -1093,6 +1305,23 @@
"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"
+ }
+ },
"xwayland-satellite-stable": {
"flake": false,
"locked": {
@@ -1135,11 +1364,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1774567340,
- "narHash": "sha256-skKD1hvAvilKkK406RgNl6X/YJgkSsoZmtHmdfeoyWI=",
+ "lastModified": 1774966394,
+ "narHash": "sha256-WKql66dDQdnpUKQafIW8iTqcdp+H7LDQ+y3dxju9u8w=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "935eb6b2989f8a7ce219a2a71a539365c8dccfbb",
+ "rev": "6b143c1f4d9b0531643b25025daf94d59baf8dfc",
"type": "github"
},
"original": {
@@ -1147,6 +1376,23 @@
"repo": "yazi",
"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 8130a60..7fb8394 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,13 @@
nur.url = "github:nix-community/NUR";
- omnisearch = {
- url = "git+https://git.bwaaa.monster/omnisearch";
+ nix-gaming-edge = {
+ url = "github:powerofthe69/nix-gaming-edge";
inputs.nixpkgs.follows = "nixpkgs";
};
- arkenfox = {
- url = "github:dwarfmaster/arkenfox-nixos";
+ omnisearch = {
+ url = "git+https://git.bwaaa.monster/omnisearch";
inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/hm/env/swayidle.nix b/hm/env/swayidle.nix
index 1150948..11e562c 100644
--- a/hm/env/swayidle.nix
+++ b/hm/env/swayidle.nix
@@ -12,7 +12,7 @@ in
config = lib.mkIf cfg.enable {
services.swayidle = {
enable = true;
- systemdTarget = "graphical-session.target";
+ systemdTargets = [ "graphical-session.target" ];
events = {
# before-sleep = "${pkgs.swaylock-effects}/bin/swaylock -f";
lock = "${pkgs.swaylock-effects}/bin/swaylock -f";
diff --git a/hm/env/waybar.nix b/hm/env/waybar.nix
index 5b6762e..6176216 100644
--- a/hm/env/waybar.nix
+++ b/hm/env/waybar.nix
@@ -13,7 +13,7 @@ in
enable = true;
systemd = {
enable = true;
- target = "graphical-session.target";
+ targets = [ "graphical-session.target" ];
};
};
xdg.configFile."waybar/config.jsonc".source = lib.mkForce (
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
index 5edbeb9..a66b733 100644
--- a/hm/soft/browser.nix
+++ b/hm/soft/browser.nix
@@ -60,6 +60,7 @@ in
"policy-MetaGer".metaData.hidden = true;
"policy-Startpage".metaData.hidden = true;
"policy-Mojeek".metaData.hidden = true;
+
"OmniSearch" = {
urls = [ { template = "http://127.0.0.1:8087/search?q={searchTerms}"; } ];
definedAliases = [ "@o" ];
@@ -93,7 +94,6 @@ in
packages = with pkgs.nur.repos.rycee.firefox-addons; [
vimium
sidebery
- bitwarden
buster-captcha-solver
sponsorblock
dearrow
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index 7967611..2878727 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -46,8 +46,6 @@ in
gpu-api = "vulkan";
vo = "gpu-next";
hwdec = "vaapi";
- # gpu-hwdec-interop = "vaapi";
- # hwdec-codecs = "all";
scale = "ewa_lanczossharp";
cscale = "ewa_lanczos";
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 6f4757e..f12c54b 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -29,6 +29,7 @@
cpu = "amd";
graphics = {
enable = true;
+ version = "git";
amdgpu.enable = true;
};
};
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 8fa03c4..cfdcd8e 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -45,7 +45,11 @@
swapfile.enable = true;
};
network.enable = true;
- security.enable = true;
+ security = {
+ enable = true;
+ sandboxing.enable = true;
+ antivirus.enable = true;
+ };
ssh.enable = true;
storage.enable = true;
users.enable = true;
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 4198bf5..9b373db 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -2,12 +2,14 @@
config,
lib,
pkgs,
+ inputs,
...
}:
let
cfg = config.os.core.drivers;
in
{
+ imports = [ inputs.nix-gaming-edge.nixosModules.default ];
options.os.core.drivers = {
enable = lib.mkEnableOption "enables hardware drivers";
@@ -23,6 +25,14 @@ in
graphics = {
enable = lib.mkEnableOption "graphics support";
+ version = lib.mkOption {
+ type = lib.types.enum [
+ "stable"
+ "git"
+ ];
+ default = "stable";
+ description = "Which Mesa version to use. 'git' uses the mesa-git overlay.";
+ };
amdgpu.enable = lib.mkEnableOption "amd specific gpu features";
};
@@ -76,6 +86,14 @@ in
rocmPackages.clr.icd
];
})
+ (lib.mkIf (cfg.graphics.enable && cfg.graphics.version == "git") {
+ nixpkgs.overlays = [ inputs.nix-gaming-edge.overlays.mesa-git ];
+ drivers.mesa-git = {
+ enable = true;
+ # cacheCleanup.enable = true;
+ # steamOrphanCleanup.enable = true;
+ };
+ })
{
boot.kernelPackages =
let
diff --git a/os/core/security.nix b/os/core/security.nix
index 34e2f1f..afd6297 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -100,7 +100,6 @@ in
environment.systemPackages = with pkgs; [
veracrypt
- bitwarden-desktop
keepassxc
];
}
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 28ebcc3..2fcf340 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -80,34 +80,11 @@ in
# --- VR SUPPORT ---
(lib.mkIf cfg.vr.enable {
- programs.alvr = {
- enable = true;
- openFirewall = true;
- package = pkgs.alvr.overrideAttrs (
- finalAttrs: prevAttrs: {
- version = "20.13.0";
-
- src = pkgs.fetchFromGitHub {
- owner = "alvr-org";
- repo = "ALVR";
- tag = "v${finalAttrs.version}";
- fetchSubmodules = true;
- hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
- };
-
- cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
- inherit (finalAttrs) src;
- hash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
- };
- }
- );
- };
services.wivrn = {
enable = true;
openFirewall = true;
highPriority = true;
steam.importOXRRuntimes = true;
- defaultRuntime = true;
};
environment.systemPackages = [ pkgs.android-tools ];
users.users.${username}.extraGroups = [ "adbusers" ];