summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpolwex <polwex@sortug.com>2025-05-08 20:14:37 +0700
committerpolwex <polwex@sortug.com>2025-05-08 20:14:37 +0700
commit3efdd55d5cc2e784c6934e9d133f16844c324aad (patch)
treeb901eda1a717f183eeeca297b54312e68a07e1c9
parent6dcb4af2623174c4c52202c7ea064f40a35091ed (diff)
m
Diffstat
-rw-r--r--.gitignore10
-rw-r--r--derivations/yek/flake.lock6
-rw-r--r--derivations/yek/flake.nix2
-rw-r--r--derivations/yek/package.nix2
-rw-r--r--devenv.lock103
-rw-r--r--flake.lock714
-rw-r--r--flake.nix6
-rw-r--r--hosts/cloud/bkk/nginx.nix36
-rw-r--r--hosts/cloud/packages.nix2
-rw-r--r--hosts/cloud/sortug/nginx.nix37
-rw-r--r--hosts/cloud/sortug/packages.nix20
-rw-r--r--hosts/editors.nix12
-rw-r--r--hosts/local/gui.nix7
-rw-r--r--hosts/local/i3.nix18
-rw-r--r--hosts/local/master/configuration.nix51
-rw-r--r--hosts/local/master/hardware-configuration.nix48
-rw-r--r--hosts/local/master/keyboard.nix4
-rw-r--r--hosts/local/master/rgb.nix15
-rw-r--r--hosts/local/master/rtl8188gu.nix56
-rw-r--r--hosts/local/nvidia.nix2
-rw-r--r--hosts/local/wayland.nix4
-rw-r--r--hosts/pkgs.nix8
22 files changed, 825 insertions, 338 deletions
diff --git a/.gitignore b/.gitignore
index b0ac3ed..754a23a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,11 @@
.aider*
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
diff --git a/derivations/yek/flake.lock b/derivations/yek/flake.lock
index bad2016..e19c85d 100644
--- a/derivations/yek/flake.lock
+++ b/derivations/yek/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1740367490,
+ "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github"
},
"original": {
diff --git a/derivations/yek/flake.nix b/derivations/yek/flake.nix
index 904d54f..9dc0497 100644
--- a/derivations/yek/flake.nix
+++ b/derivations/yek/flake.nix
@@ -13,7 +13,7 @@
pkgs = nixpkgs.legacyPackages.${system};
in {
packages.${system}.default = pkgs.callPackage ./package.nix {
- inherit (pkgs) lib;
+ inherit (pkgs) nixpkgs lib;
};
};
}
diff --git a/derivations/yek/package.nix b/derivations/yek/package.nix
index c8ddaf6..cf00581 100644
--- a/derivations/yek/package.nix
+++ b/derivations/yek/package.nix
@@ -8,7 +8,7 @@
nix-update-script,
versionCheckHook,
}: let
- version = "0.16.0";
+ version = "0.21.0";
in
rustPlatform.buildRustPackage {
pname = "yek";
diff --git a/devenv.lock b/devenv.lock
new file mode 100644
index 0000000..0b61657
--- /dev/null
+++ b/devenv.lock
@@ -0,0 +1,103 @@
+{
+ "nodes": {
+ "devenv": {
+ "locked": {
+ "dir": "src/modules",
+ "lastModified": 1743783972,
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "2f53e2f867e0c2ba18b880e66169366e5f8ca554",
+ "type": "github"
+ },
+ "original": {
+ "dir": "src/modules",
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1733328505,
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1742649964,
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1733477122,
+ "owner": "cachix",
+ "repo": "devenv-nixpkgs",
+ "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "rolling",
+ "repo": "devenv-nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "devenv": "devenv",
+ "git-hooks": "git-hooks",
+ "nixpkgs": "nixpkgs",
+ "pre-commit-hooks": [
+ "git-hooks"
+ ]
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.lock b/flake.lock
index a0c08a4..93f40e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1726755133,
- "narHash": "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=",
+ "lastModified": 1744897914,
+ "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=",
"owner": "yaxitech",
"repo": "ragenix",
- "rev": "687ee92114bce9c4724376cf6b21235abe880bfa",
+ "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223",
"type": "github"
},
"original": {
@@ -35,11 +35,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1723293904,
- "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+ "lastModified": 1736955230,
+ "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+ "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"type": "github"
},
"original": {
@@ -64,6 +64,34 @@
"type": "gitlab"
}
},
+ "cachix": {
+ "inputs": {
+ "devenv": [
+ "devenv"
+ ],
+ "flake-compat": [
+ "devenv"
+ ],
+ "git-hooks": [
+ "devenv"
+ ],
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1742042642,
+ "narHash": "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "a624d3eaf4b1d225f918de8543ed739f2f574203",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
"claude-desktop": {
"inputs": {
"flake-utils": [
@@ -74,11 +102,11 @@
]
},
"locked": {
- "lastModified": 1738150082,
- "narHash": "sha256-8CTUXRlFbybm5aGgnAkfAX3KO4NnqP4OgXr6RLU6leM=",
- "ref": "refs/heads/master",
- "rev": "c50cb8dd2b058355514e7a254d28b4cdcfc7c4f8",
- "revCount": 15,
+ "lastModified": 1743547640,
+ "narHash": "sha256-c42/Fsto5Kn9SWjUkLtZUNNgNZVC05qGCMOvL76Oxwg=",
+ "ref": "refs/heads/main",
+ "rev": "874712aff4a00830ba16cf874b76d65e207a360c",
+ "revCount": 30,
"type": "git",
"url": "file://git:file:/home/y/code/nix/claude-desktop-linux-flake"
},
@@ -89,11 +117,11 @@
},
"crane": {
"locked": {
- "lastModified": 1725409566,
- "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
+ "lastModified": 1741481578,
+ "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c",
+ "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
"type": "github"
},
"original": {
@@ -104,26 +132,11 @@
},
"crane_2": {
"locked": {
- "lastModified": 1737563566,
- "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "849376434956794ebc7a6b487d31aace395392ba",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "crane_3": {
- "locked": {
- "lastModified": 1731098351,
- "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
+ "lastModified": 1741481578,
+ "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
+ "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
"type": "github"
},
"original": {
@@ -155,6 +168,28 @@
"type": "github"
}
},
+ "devenv": {
+ "inputs": {
+ "cachix": "cachix",
+ "flake-compat": "flake-compat",
+ "git-hooks": "git-hooks",
+ "nix": "nix",
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1746681099,
+ "narHash": "sha256-PZwWcOiEXA6GDDdi+XlwJA+075QNtNUPDTkfgFh9m8s=",
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "a7f2ea275621391209fd702f5ddced32dd56a4e2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
"disko": {
"inputs": {
"nixpkgs": [
@@ -162,11 +197,11 @@
]
},
"locked": {
- "lastModified": 1739841949,
- "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
+ "lastModified": 1746695594,
+ "narHash": "sha256-pAAWYs3S+/tY65vemHZdVSXpeIz4JINEJZoPoBjr8JU=",
"owner": "nix-community",
"repo": "disko",
- "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
+ "rev": "6bb82b77ce140137177e30df067759931ab60a73",
"type": "github"
},
"original": {
@@ -178,11 +213,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@@ -210,6 +245,22 @@
"flake-compat_3": {
"flake": false,
"locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-compat_4": {
+ "flake": false,
+ "locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
@@ -223,7 +274,7 @@
"type": "github"
}
},
- "flake-compat_4": {
+ "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@@ -239,13 +290,13 @@
"type": "github"
}
},
- "flake-compat_5": {
+ "flake-compat_6": {
"locked": {
- "lastModified": 1717312683,
- "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+ "lastModified": 1746162366,
+ "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
"owner": "nix-community",
"repo": "flake-compat",
- "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+ "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
"type": "github"
},
"original": {
@@ -254,7 +305,7 @@
"type": "github"
}
},
- "flake-compat_6": {
+ "flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@@ -272,14 +323,18 @@
},
"flake-parts": {
"inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
+ "nixpkgs-lib": [
+ "devenv",
+ "nix",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1738453229,
- "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "lastModified": 1712014858,
+ "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
@@ -290,17 +345,35 @@
},
"flake-parts_2": {
"inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1743550720,
+ "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_3": {
+ "inputs": {
"nixpkgs-lib": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1730504689,
- "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+ "lastModified": 1741352980,
+ "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+ "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -309,16 +382,16 @@
"type": "github"
}
},
- "flake-parts_3": {
+ "flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
- "lastModified": 1738453229,
- "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "lastModified": 1743550720,
+ "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github"
},
"original": {
@@ -327,7 +400,7 @@
"type": "github"
}
},
- "flake-parts_4": {
+ "flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nur",
@@ -353,11 +426,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -473,16 +546,41 @@
},
"git-hooks": {
"inputs": {
- "flake-compat": "flake-compat",
+ "flake-compat": [
+ "devenv"
+ ],
"gitignore": "gitignore",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1742649964,
+ "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "git-hooks_2": {
+ "inputs": {
+ "flake-compat": "flake-compat_2",
+ "gitignore": "gitignore_2",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1737465171,
- "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+ "lastModified": 1746537231,
+ "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+ "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
"type": "github"
},
"original": {
@@ -494,6 +592,7 @@
"gitignore": {
"inputs": {
"nixpkgs": [
+ "devenv",
"git-hooks",
"nixpkgs"
]
@@ -515,6 +614,27 @@
"gitignore_2": {
"inputs": {
"nixpkgs": [
+ "git-hooks",
+ "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"
+ }
+ },
+ "gitignore_3": {
+ "inputs": {
+ "nixpkgs": [
"lanzaboote",
"pre-commit-hooks-nix",
"nixpkgs"
@@ -534,7 +654,7 @@
"type": "github"
}
},
- "gitignore_3": {
+ "gitignore_4": {
"inputs": {
"nixpkgs": [
"nixos-rk3588",
@@ -558,17 +678,16 @@
},
"helix": {
"inputs": {
- "crane": "crane_2",
"flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_5",
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1740074307,
- "narHash": "sha256-1duOlzdBv61aLohv45urOtqqzwi3RPcG/JTtxx0V4K8=",
+ "lastModified": 1746657487,
+ "narHash": "sha256-/EQDfj8aEDT7ENt/lIvvnHJNFYMLtvmqTnv3zb/HhCU=",
"owner": "helix-editor",
"repo": "helix",
- "rev": "0deb8bbce6f33124f3434c94c22f5177cb8caa9f",
+ "rev": "51d3b15557782d2194bc320b6945d6a971dd213d",
"type": "github"
},
"original": {
@@ -601,7 +720,7 @@
},
"homix": {
"inputs": {
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1720719665,
@@ -634,15 +753,15 @@
},
"kmonad": {
"inputs": {
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"dir": "nix",
- "lastModified": 1739962668,
- "narHash": "sha256-ns7btNiKU6+JViXt6k3g7iQp2Xyy0ZCi3wf59y3lS6s=",
+ "lastModified": 1746653967,
+ "narHash": "sha256-PL5yuy5b+0/hQR9rTLdzP1jVcsZarx67bECKVjapH8s=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "356c69f45b8cbb3c875616c91892f8b28ce40c13",
+ "rev": "4419fdc86634a1d41dad402aef456208764d74ad",
"type": "github"
},
"original": {
@@ -654,19 +773,19 @@
},
"lanzaboote": {
"inputs": {
- "crane": "crane_3",
- "flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_5",
+ "crane": "crane_2",
+ "flake-compat": "flake-compat_3",
+ "flake-parts": "flake-parts_3",
+ "nixpkgs": "nixpkgs_8",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1739186342,
- "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=",
+ "lastModified": 1745271491,
+ "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660",
+ "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba",
"type": "github"
},
"original": {
@@ -681,11 +800,11 @@
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
- "lastModified": 1739708078,
- "narHash": "sha256-ePo0EHEEKb/853zI4/or8Jea2aYE/dUgO/rUDXSakCA=",
+ "lastModified": 1746360860,
+ "narHash": "sha256-Vtl1JSnHbA6WlGVXjYPsex5mX8NTaGyeVSlYtkZGW24=",
"owner": "nix-community",
"repo": "lib-aggregate",
- "rev": "af2561272f74dd3d489d62efb98fe5f0b28fdbbe",
+ "rev": "75d6b241245412361502277e607c67a004a6e5b0",
"type": "github"
},
"original": {
@@ -694,18 +813,34 @@
"type": "github"
}
},
+ "libgit2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1697646580,
+ "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "type": "github"
+ }
+ },
"microvm": {
"inputs": {
"flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_6",
+ "nixpkgs": "nixpkgs_9",
"spectrum": "spectrum"
},
"locked": {
- "lastModified": 1739104176,
- "narHash": "sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI=",
+ "lastModified": 1746204357,
+ "narHash": "sha256-wg1VlK0OynQOrC7kB5pkjkDG13HuHy0AXpxLCStFKZg=",
"owner": "astro",
"repo": "microvm.nix",
- "rev": "d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2",
+ "rev": "717cbf49d61e46ad68cb8dcc183b3bf33678e1c2",
"type": "github"
},
"original": {
@@ -714,6 +849,39 @@
"type": "github"
}
},
+ "nix": {
+ "inputs": {
+ "flake-compat": [
+ "devenv"
+ ],
+ "flake-parts": "flake-parts",
+ "libgit2": "libgit2",
+ "nixpkgs": "nixpkgs_2",
+ "nixpkgs-23-11": [
+ "devenv"
+ ],
+ "nixpkgs-regression": [
+ "devenv"
+ ],
+ "pre-commit-hooks": [
+ "devenv"
+ ]
+ },
+ "locked": {
+ "lastModified": 1745930071,
+ "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=",
+ "owner": "domenkozar",
+ "repo": "nix",
+ "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "domenkozar",
+ "ref": "devenv-2.24",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -721,11 +889,11 @@
]
},
"locked": {
- "lastModified": 1739933872,
- "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
+ "lastModified": 1746254942,
+ "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
+ "rev": "760a11c87009155afa0140d55c40e7c336d62d7a",
"type": "github"
},
"original": {
@@ -736,15 +904,15 @@
},
"nix-gaming": {
"inputs": {
- "flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_7"
+ "flake-parts": "flake-parts_4",
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1740162289,
- "narHash": "sha256-jYhBd5VR2BKo75qDUQaWrhHVC5GJPJraTbGJVVQkfgM=",
+ "lastModified": 1746410227,
+ "narHash": "sha256-F2gKEIBfqfeQUcvMg0YD3xRnJIPyEgINR+ouTedoAtg=",
"owner": "fufexan",
"repo": "nix-gaming",
- "rev": "8172a58da94446a15ad5801a6d091a8d13f88e6c",
+ "rev": "3b68db5adeda4b4ac018aea0acf8ebb4941c4b15",
"type": "github"
},
"original": {
@@ -812,11 +980,11 @@
]
},
"locked": {
- "lastModified": 1737057290,
- "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+ "lastModified": 1742568034,
+ "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
"owner": "nix-community",
"repo": "nixos-generators",
- "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+ "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
"type": "github"
},
"original": {
@@ -849,11 +1017,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1740089251,
- "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
+ "lastModified": 1746621361,
+ "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
+ "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5",
"type": "github"
},
"original": {
@@ -866,18 +1034,18 @@
"nixos-mailserver": {
"inputs": {
"blobs": "blobs",
- "flake-compat": "flake-compat_3",
+ "flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-24_11": "nixpkgs-24_11"
},
"locked": {
- "lastModified": 1739121270,
- "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=",
+ "lastModified": 1746637515,
+ "narHash": "sha256-bUq2uHmsfY3SpJrR4dpncITykufTiD2320JsOKgIYl0=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3",
+ "rev": "a7d2b05a9920d90f5eb8076f449acdb6c1ad79ca",
"type": "gitlab"
},
"original": {
@@ -890,7 +1058,7 @@
"inputs": {
"flake-utils": "flake-utils_6",
"nixos-generators": "nixos-generators_2",
- "nixpkgs": "nixpkgs_8",
+ "nixpkgs": "nixpkgs_11",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@@ -909,15 +1077,15 @@
},
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_4",
- "nixpkgs": "nixpkgs_9"
+ "flake-compat": "flake-compat_5",
+ "nixpkgs": "nixpkgs_12"
},
"locked": {
- "lastModified": 1740046902,
- "narHash": "sha256-Xbhz8eEqBmNpvqaGFbF5JopmfNJccWUr8eExtU/iGX4=",
+ "lastModified": 1746453552,
+ "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "c4f6ae89468939d9fcf1a317c062cf5dd02004ea",
+ "rev": "be618645aa0adf461f778500172b6896d5ab2d01",
"type": "github"
},
"original": {
@@ -929,16 +1097,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1730768919,
- "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -976,35 +1144,26 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1738452942,
- "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ "lastModified": 1743296961,
+ "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+ "type": "github"
},
"original": {
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
- "lastModified": 1738452942,
- "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
- }
- },
- "nixpkgs-lib_3": {
- "locked": {
- "lastModified": 1739667890,
- "narHash": "sha256-7QtSNdCEbYG1v+ZVrFWhBkhlo2GWehPffWC0BP1VZSo=",
+ "lastModified": 1743296961,
+ "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "9b883b6d4d3bd580734ddb4b5bfde8ebffd26559",
+ "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github"
},
"original": {
@@ -1013,23 +1172,22 @@
"type": "github"
}
},
- "nixpkgs-stable": {
+ "nixpkgs-lib_3": {
"locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+ "lastModified": 1746321463,
+ "narHash": "sha256-43ZRYqB6pkhfKPZamMbuD/JrGYcapX87feHxMNyfyDQ=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "168ab62539da203ca62ab16b7f8cf411530b91e7",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
"type": "github"
}
},
- "nixpkgs-stable_2": {
+ "nixpkgs-stable": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
@@ -1047,14 +1205,14 @@
},
"nixpkgs-unfree": {
"inputs": {
- "nixpkgs": "nixpkgs_11"
+ "nixpkgs": "nixpkgs_14"
},
"locked": {
- "lastModified": 1739974972,
- "narHash": "sha256-2h+XbO6bNo9tIsncEYyToaSYPurPJQ+jlspucuMGjQw=",
+ "lastModified": 1746627828,
+ "narHash": "sha256-PVuLogqEfVguSORIh24xJrwAsWlRlq9z8AiwRIEPALE=",
"owner": "numtide",
"repo": "nixpkgs-unfree",
- "rev": "4ca196c1dc39328d1cd8e873519bbd9b74c55a95",
+ "rev": "da131f08156961b129413abca09b60a693b591d6",
"type": "github"
},
"original": {
@@ -1066,18 +1224,18 @@
},
"nixpkgs-wayland": {
"inputs": {
- "flake-compat": "flake-compat_5",
+ "flake-compat": "flake-compat_6",
"lib-aggregate": "lib-aggregate",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1740142881,
- "narHash": "sha256-tJHzZd5T2YJ7P70wy1bda++Sax9edT/3Onv7x+lLAlY=",
+ "lastModified": 1746672544,
+ "narHash": "sha256-Vvts0v5bxwvkIB1/P3i3ESqFF+yDcwzWa/M8CnC8H7A=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "cd1e927d3e66c3af30e860a006da744bba2c7cad",
+ "rev": "df5989d7dd28e2a5e752db06154b0f706c94c1b3",
"type": "github"
},
"original": {
@@ -1088,11 +1246,59 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1746269363,
+ "narHash": "sha256-Q0lKWway9OmZnkDTpAoAE9VLXHOHqCqdJ3N0tkSM99g=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "b6aef6c3553f849e1e6c08f1bcd3061df2b69fc4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_11": {
+ "locked": {
+ "lastModified": 1729256560,
+ "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_12": {
+ "locked": {
+ "lastModified": 1742937945,
+ "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-24.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_13": {
+ "locked": {
+ "lastModified": 1746461020,
+ "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github"
},
"original": {
@@ -1102,13 +1308,13 @@
"type": "github"
}
},
- "nixpkgs_11": {
+ "nixpkgs_14": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1746461020,
+ "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github"
},
"original": {
@@ -1116,13 +1322,13 @@
"type": "indirect"
}
},
- "nixpkgs_12": {
+ "nixpkgs_15": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1746461020,
+ "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github"
},
"original": {
@@ -1132,13 +1338,13 @@
"type": "github"
}
},
- "nixpkgs_13": {
+ "nixpkgs_16": {
"locked": {
- "lastModified": 1702151865,
- "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+ "lastModified": 1743964447,
+ "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+ "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
"type": "github"
},
"original": {
@@ -1150,43 +1356,43 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1728018373,
- "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
- "owner": "nixos",
+ "lastModified": 1717432640,
+ "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+ "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
+ "owner": "NixOS",
+ "ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1719690277,
- "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
+ "lastModified": 1733477122,
+ "narHash": "sha256-qamMCz5mNpQmgBwc8SB5tVMlD5sbwVIToVZtSxMph9s=",
+ "owner": "cachix",
+ "repo": "devenv-nixpkgs",
+ "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
+ "owner": "cachix",
+ "ref": "rolling",
+ "repo": "devenv-nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1735648875,
- "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=",
+ "lastModified": 1730768919,
+ "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50",
+ "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github"
},
"original": {
@@ -1198,31 +1404,31 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1731919951,
- "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
- "owner": "NixOS",
+ "lastModified": 1740560979,
+ "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
+ "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-unstable-small",
+ "owner": "nixos",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1733212471,
- "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
- "owner": "nixos",
+ "lastModified": 1719690277,
+ "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+ "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github"
},
"original": {
- "owner": "nixos",
+ "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -1230,11 +1436,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1739451785,
- "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
+ "lastModified": 1744157173,
+ "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
+ "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f",
"type": "github"
},
"original": {
@@ -1246,48 +1452,48 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1729256560,
- "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+ "lastModified": 1741516043,
+ "narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+ "rev": "8adda98a4e637d0d8a867f19ace5ed6680ecc94a",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1739624908,
- "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
- "owner": "NixOS",
+ "lastModified": 1746141548,
+ "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
+ "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-24.11",
+ "owner": "nixos",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
- "flake-parts": "flake-parts_4",
- "nixpkgs": "nixpkgs_12",
+ "flake-parts": "flake-parts_5",
+ "nixpkgs": "nixpkgs_15",
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1740186587,
- "narHash": "sha256-kPaYbFAZYo4QAiDLAD+5YKw9FNBntxojgWS5TOY11Ls=",
+ "lastModified": 1746694489,
+ "narHash": "sha256-g7kaChZ34J4RabOLJt1t37dLysmOjKNxW1gEmZ8kJnQ=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "93be748a381ae0c5e97b64ffe9bafaa77312a974",
+ "rev": "62161e584fcd651968963baf092a4a02931de216",
"type": "github"
},
"original": {
@@ -1299,11 +1505,11 @@
"polybar-themes": {
"flake": false,
"locked": {
- "lastModified": 1734447678,
- "narHash": "sha256-4DCxqOklMWzlEhWq6v6I5eKt5dpSFSy//CUG5U+sFpY=",
+ "lastModified": 1744988472,
+ "narHash": "sha256-TxsO28Rd0U/FgA9v5M6426rFW0wNVdN1AVOazxsbMNo=",
"owner": "adi1090x",
"repo": "polybar-themes",
- "rev": "291f9399c2dfb072f7de17821222b8c2c54c563b",
+ "rev": "03e542779448dd9fdb1e3451858cf66cf13b31bd",
"type": "github"
},
"original": {
@@ -1321,7 +1527,7 @@
"nixos-rk3588",
"flake-utils"
],
- "gitignore": "gitignore_3",
+ "gitignore": "gitignore_4",
"nixpkgs": [
"nixos-rk3588",
"nixpkgs"
@@ -1351,19 +1557,18 @@
"lanzaboote",
"flake-compat"
],
- "gitignore": "gitignore_2",
+ "gitignore": "gitignore_3",
"nixpkgs": [
"lanzaboote",
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1731363552,
- "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+ "lastModified": 1741379162,
+ "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+ "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github"
},
"original": {
@@ -1376,10 +1581,11 @@
"inputs": {
"agenix": "agenix",
"claude-desktop": "claude-desktop",
+ "devenv": "devenv",
"disko": "disko",
- "flake-parts": "flake-parts",
+ "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
- "git-hooks": "git-hooks",
+ "git-hooks": "git-hooks_2",
"helix": "helix",
"homix": "homix",
"impermanence": "impermanence",
@@ -1394,9 +1600,9 @@
"nixos-mailserver": "nixos-mailserver",
"nixos-rk3588": "nixos-rk3588",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_10",
+ "nixpkgs": "nixpkgs_13",
"nixpkgs-darwin": "nixpkgs-darwin",
- "nixpkgs-stable": "nixpkgs-stable_2",
+ "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unfree": "nixpkgs-unfree",
"nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
@@ -1415,11 +1621,11 @@
]
},
"locked": {
- "lastModified": 1725675754,
- "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
+ "lastModified": 1741400194,
+ "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
+ "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f",
"type": "github"
},
"original": {
@@ -1436,11 +1642,11 @@
]
},
"locked": {
- "lastModified": 1737599167,
- "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=",
+ "lastModified": 1740623427,
+ "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "38374302ae9edf819eac666d1f276d62c712dd06",
+ "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
"type": "github"
},
"original": {
@@ -1457,11 +1663,11 @@
]
},
"locked": {
- "lastModified": 1731897198,
- "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+ "lastModified": 1741573199,
+ "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+ "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
"type": "github"
},
"original": {
@@ -1473,11 +1679,11 @@
"spectrum": {
"flake": false,
"locked": {
- "lastModified": 1733308308,
- "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=",
+ "lastModified": 1745937988,
+ "narHash": "sha256-8BsgirAbalgq7XRHE9il8XBX/RYCALVj5zGqDvbOEc4=",
"ref": "refs/heads/main",
- "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2",
- "revCount": 792,
+ "rev": "65a511b120aa28f40bcdbb333fd221f33ced4760",
+ "revCount": 854,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
@@ -1614,17 +1820,17 @@
},
"waybar": {
"inputs": {
- "flake-compat": "flake-compat_6",
+ "flake-compat": "flake-compat_7",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1740125099,
- "narHash": "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=",
+ "lastModified": 1745487176,
+ "narHash": "sha256-eF1l/KB8eXKTNf+CJ34gh5si3RZCZzme/W9StA+oTiw=",
"owner": "alexays",
"repo": "waybar",
- "rev": "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae",
+ "rev": "0332d2ebf84392c82c86d615079f762f27de94ba",
"type": "github"
},
"original": {
@@ -1652,14 +1858,14 @@
},
"wrapper-manager": {
"inputs": {
- "nixpkgs": "nixpkgs_13"
+ "nixpkgs": "nixpkgs_16"
},
"locked": {
- "lastModified": 1724503599,
- "narHash": "sha256-WVhNq3QjnG/2mi772CkTxZCQcomKV5S03TbQKwe1Kj4=",
+ "lastModified": 1744611115,
+ "narHash": "sha256-7WsdYgA6bh9dytXdLKQYUkUdSux6fNo7SZXYqMJx72k=",
"owner": "viperML",
"repo": "wrapper-manager",
- "rev": "c936f9203217e654a6074d206505c16432edbc70",
+ "rev": "a4990b7da8e7845974031599e7f6104226cfb43e",
"type": "github"
},
"original": {
@@ -1675,8 +1881,8 @@
]
},
"locked": {
- "lastModified": 1740186522,
- "narHash": "sha256-2UY5FdAqAhYV1qb9Ckd/L80nsjNP7+OxszUW6YqsCck=",
+ "lastModified": 1740469068,
+ "narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=",
"path": "/home/y/nixconf/derivations/yek",
"type": "path"
},
diff --git a/flake.nix b/flake.nix
index 05e4f39..3e7de94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,12 @@
########### this fucking guy ########
nixos-rk3588.url = "github:ryan4yin/nixos-rk3588";
+ devenv = {
+ url = "github:cachix/devenv";
+ };
+
+ # determinate systems patched nix. supposedly for enterprise
+ # determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
};
outputs = inputs: import ./outputs.nix inputs;
}
diff --git a/hosts/cloud/bkk/nginx.nix b/hosts/cloud/bkk/nginx.nix
index 3314674..7de02ee 100644
--- a/hosts/cloud/bkk/nginx.nix
+++ b/hosts/cloud/bkk/nginx.nix
@@ -85,23 +85,23 @@
proxy_cache off;
'';
};
- # virtualHosts."t.urbit.men" = {
- # enableACME = true;
- # forceSSL = true;
- # locations."/" = {
- # proxyPass = "http://127.0.0.1:8081";
- # # proxyWebsockets = true; # needed if you need to use WebSocket
- # extraConfig = ''
- # proxy_set_header Host $host;
- # proxy_set_header Forwarded $proxy_add_x_forwarded_for;
- # '';
- # };
- # extraConfig = ''
- # chunked_transfer_encoding off;
- # proxy_http_version 1.1;
- # proxy_buffering off;
- # proxy_cache off;
- # '';
- # };
+ virtualHosts."t.urbit.men" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/" = {
+ proxyPass = "http://127.0.0.1:3000";
+ # proxyWebsockets = true; # needed if you need to use WebSocket
+ extraConfig = ''
+ proxy_set_header Host $host;
+ proxy_set_header Forwarded $proxy_add_x_forwarded_for;
+ '';
+ };
+ extraConfig = ''
+ chunked_transfer_encoding off;
+ proxy_http_version 1.1;
+ proxy_buffering off;
+ proxy_cache off;
+ '';
+ };
};
}
diff --git a/hosts/cloud/packages.nix b/hosts/cloud/packages.nix
index 07ce147..1169342 100644
--- a/hosts/cloud/packages.nix
+++ b/hosts/cloud/packages.nix
@@ -33,7 +33,7 @@
testdisk
tokei # Handy tool to see lines of code by language
watchexec # Fileystem watcher/executor useful for speedy development
- xsv # CSV file parsing utility
+ # xsv # CSV file parsing utility
just # Intriguing new make replacement
mdcat # Markdown converter/reader for the CLI
tree
diff --git a/hosts/cloud/sortug/nginx.nix b/hosts/cloud/sortug/nginx.nix
index 68a0c5b..5c129fb 100644
--- a/hosts/cloud/sortug/nginx.nix
+++ b/hosts/cloud/sortug/nginx.nix
@@ -58,6 +58,25 @@
proxyWebsockets = true; # needed if you need to use WebSocket
};
};
+ # polwex
+ virtualHosts."pw.sortug.com" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/" = {
+ proxyPass = "http://127.0.0.1:8091";
+ # proxyWebsockets = true; # needed if you need to use WebSocket
+ extraConfig = ''
+ proxy_set_header Host $host;
+ proxy_set_header Forwarded $proxy_add_x_forwarded_for;
+ '';
+ };
+ extraConfig = ''
+ proxy_http_version 1.1;
+ chunked_transfer_encoding off;
+ proxy_buffering off;
+ proxy_cache off;
+ '';
+ };
virtualHosts."p.sortug.com" = {
enableACME = true;
forceSSL = true;
@@ -76,6 +95,24 @@
proxy_cache off;
'';
};
+ virtualHosts."papa.sortug.com" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/" = {
+ proxyPass = "http://127.0.0.1:8924";
+ # proxyWebsockets = true; # needed if you need to use WebSocket
+ extraConfig = ''
+ proxy_set_header Host $host;
+ proxy_set_header Forwarded $proxy_add_x_forwarded_for;
+ '';
+ };
+ extraConfig = ''
+ proxy_http_version 1.1;
+ chunked_transfer_encoding off;
+ proxy_buffering off;
+ proxy_cache off;
+ '';
+ };
virtualHosts."mcp.sortug.com" = {
enableACME = true;
forceSSL = true;
diff --git a/hosts/cloud/sortug/packages.nix b/hosts/cloud/sortug/packages.nix
index 6985acb..72ce5c4 100644
--- a/hosts/cloud/sortug/packages.nix
+++ b/hosts/cloud/sortug/packages.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
-
{
- nixpkgs.config = {
- allowUnfree = true;
- };
+ config,
+ pkgs,
+ ...
+}: {
+ nixpkgs.config = {
+ allowUnfree = true;
+ };
environment.systemPackages = with pkgs; [
neovim
@@ -31,7 +33,6 @@
testdisk
tokei # Handy tool to see lines of code by language
watchexec # Fileystem watcher/executor useful for speedy development
- xsv # CSV file parsing utility
just # Intriguing new make replacement
mdcat # Markdown converter/reader for the CLI
tree
@@ -42,12 +43,11 @@
curl
caddy # simple web server made with go
innernet
-
+
# s3
minio
# databases
- # postgresql
- # sqlite
+ # postgresql
+ # sqlite
];
}
-
diff --git a/hosts/editors.nix b/hosts/editors.nix
index 241ea57..78d0fdd 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -5,10 +5,14 @@
}: {
environment.variables.EDITOR = "hx";
environment.variables.F = "hx";
- environment.systemPackages = [
- pkgs.neovim
+ environment.systemPackages = with pkgs; [
+ neovim
#inputs.helix.packages.${pkgs.system}.helix
- pkgs.nodePackages.prettier
- pkgs.helix
+ nodePackages.prettier
+ helix
+ vscode-langservers-extracted
+ nil
+ alejandra
+ superhtml
];
}
diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index 82d78b1..d783f28 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -12,7 +12,7 @@
foot
# messaging
- signal-desktop
+ signal-desktop-bin
tdesktop
# video
mpv
@@ -25,7 +25,7 @@
#browsers
brave
firefox
- librewolf
+ # librewolf
vivaldi
chromium
# mail
@@ -36,7 +36,7 @@
xfce.thunar
#
libreoffice
- digikam
+ # digikam
gimp
qbittorrent
zathura # pdf
@@ -46,5 +46,6 @@
ryujinx
wineWowPackages.staging
dosbox
+ siyuan
];
}
diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index f955c56..b9e67a7 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -1,10 +1,14 @@
{pkgs, ...}: {
environment.pathsToLink = ["/libexec"];
services.xserver = {
- xkb.layout = "us";
- xkb.variant = "";
+ xkb.options = "compose:ralt";
+ # xkb.layout = "us";
+ # xkb.variant = "";
enable = true;
autorun = false;
+ # displayManager = {
+ # startx.enable = true;
+ # };
desktopManager = {
xterm.enable = false;
};
@@ -45,6 +49,7 @@
# screenshots
flameshot
shutter
+ maim
xclip
pavucontrol
# icons
@@ -111,7 +116,14 @@
# screen capture
#
- xdg.portal.enable = true;
+ xdg.portal = {
+ enable = true;
+ xdgOpenUsePortal = true;
+ extraPortals = [
+ pkgs.xdg-desktop-portal-gtk
+ pkgs.xdg-desktop-portal-gnome
+ ];
+ };
xdg.portal.config.common.default = "*";
xdg.portal.wlr.enable = true;
services.dbus.enable = true;
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index 375c10b..83de833 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -9,18 +9,19 @@
../../unfree.nix
#../../android.nix
../gui.nix
- ../i3.nix
+ # ../i3.nix
# ../gnome.nix
- # ../wayland.nix
+ ../wayland.nix
../nvidia.nix
./keyboard.nix
- ./rgb.nix
+ # ./rgb.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# boot.kernelPackages = pkgs.linuxPackages_latest;
+ boot.kernelPackages = pkgs.linuxPackages_zen;
boot.kernelParams = ["intel_pstate=active"];
# boot.supportedFilesystems = ["ntfs"];
services.fprintd.enable = true;
@@ -34,8 +35,14 @@
time.timeZone = "Asia/Bangkok";
# Enable the OpenSSH daemon.
- # services.openssh.enable = true;
- # services.openssh.ports = [5555];
+ services.openssh = {
+ enable = true;
+ ports = [5555];
+ settings.PasswordAuthentication = false;
+ };
+ services.tailscale = {
+ enable = true;
+ };
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
@@ -46,11 +53,13 @@
#
#
environment.systemPackages = [
- pkgs.nodejs
- pkgs.python312
+ # for AI IDE shit
+ # pkgs.nodejs
+ # pkgs.python312
# pkgs.openrgb-with-all-plugins
];
-
+ environment.etc."X11/xorg.conf.d/20-nvidia.conf".source = ./xorg.conf;
+ services.xserver.displayManager.xserverArgs = ["-config ${./xorg.conf}"];
system.stateVersion = "23.11"; # Did you read the comment?
#debugging segfaults
@@ -71,4 +80,30 @@
# Ensure the script is copied to the system
# environment.etc."startup.sh".source = ./startup.sh;
+ # temp!
+ # run vllm through docker (its broken in nixpkgs, but this may be better anyway?)
+ # virtualisation.oci-containers = {
+ # backend = "podman";
+ # containers = {
+ # vllm = {
+ # autoStart = false;
+ # image = "vllm/vllm-openai:latest";
+ # ports = ["5000:5000"];
+ # extraOptions = [
+ # "--runtime"
+ # "nvidia"
+ # "--gpus"
+ # "all"
+ # "--ipc"
+ # "host"
+ # "--pull=always"
+ # "--network=host"
+ # ];
+ # cmd = [
+ # "--model"
+ # "mistralai/Mistral-7B-v0.1"
+ # ];
+ # };
+ # };
+ # };
}
diff --git a/hosts/local/master/hardware-configuration.nix b/hosts/local/master/hardware-configuration.nix
index 6e2ed9f..8439f01 100644
--- a/hosts/local/master/hardware-configuration.nix
+++ b/hosts/local/master/hardware-configuration.nix
@@ -1,32 +1,38 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
+}: let
+ rtl8188gu = config.boot.kernelPackages.callPackage ./rtl8188gu.nix {};
+in {
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-intel" ];
- boot.extraModulePackages = [ ];
+ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+ boot.initrd.kernelModules = [];
+ boot.kernelModules = ["kvm-intel"];
+ boot.extraModulePackages = [];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/3f1343f2-1ba3-4c57-b95e-bb808d3dffd3";
- fsType = "ext4";
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/3f1343f2-1ba3-4c57-b95e-bb808d3dffd3";
+ fsType = "ext4";
+ };
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/C676-FD24";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/C676-FD24";
+ fsType = "vfat";
+ options = ["fmask=0077" "dmask=0077"];
+ };
- swapDevices =
- [ { device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9"; }
- ];
+ swapDevices = [
+ {device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9";}
+ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix
index d6ba135..f148d74 100644
--- a/hosts/local/master/keyboard.nix
+++ b/hosts/local/master/keyboard.nix
@@ -31,10 +31,10 @@
keyboards = {
wirelessThinkpad = {
device = "/dev/input/by-id/usb-Lenovo_TrackPoint_Keyboard_II-event-kbd";
- config = builtins.readFile ./thinkpad2.kbd;
+ config = builtins.readFile ./thinkpad.kbd;
};
wiredThinkpad = {
- device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd";
+ device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_usb_Keyboard_with_TrackPoint-event-kbd";
config = builtins.readFile ./thinkpad.kbd;
};
};
diff --git a/hosts/local/master/rgb.nix b/hosts/local/master/rgb.nix
index 66dbbfb..cd5ffae 100644
--- a/hosts/local/master/rgb.nix
+++ b/hosts/local/master/rgb.nix
@@ -14,9 +14,18 @@
in {
# config = {
# services.udev.packages = [pkgs.openrgb];
- services.hardware.openrgb.enable = true;
- # boot.kernelModules = ["i2c-dev"];
- # hardware.i2c.enable = true;
+ services.hardware.openrgb = {
+ enable = true;
+ motherboard = "intel";
+ package = pkgs.openrgb-with-all-plugins;
+ };
+ boot.kernelParams = ["acpi_enforce_resources=lax"];
+ boot.kernelModules = ["i2c-dev" "i2c-pii4"];
+ hardware.i2c.enable = true;
+ environment.systemPackages = with pkgs; [
+ i2c-tools
+ liquidctl
+ ];
# systemd.services.no-rgb = {
# description = "no-rgb";
diff --git a/hosts/local/master/rtl8188gu.nix b/hosts/local/master/rtl8188gu.nix
new file mode 100644
index 0000000..74aa78a
--- /dev/null
+++ b/hosts/local/master/rtl8188gu.nix
@@ -0,0 +1,56 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ kernel,
+ bc,
+}: let
+ modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8188gu";
+in
+ stdenv.mkDerivation rec {
+ name = "r8188gu-${kernel.version}-${version}";
+ # on update please verify that the source matches the realtek version
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "McMCCRU";
+ repo = "rtl8188gu";
+ rev = "bb3292dbb72ba6675b5465245eee0e69912f6e76";
+ hash = "sha256-ixu8v3ikTdqlNBEp6YrvuoDWKyi0RxjySXr+fTuO77Q=";
+ };
+
+ hardeningDisable = ["pic"];
+
+ nativeBuildInputs = kernel.moduleBuildDependencies ++ [bc];
+
+ preBuild =
+ ''
+ makeFlagsArray+=("KVER=${kernel.modDirVersion}")
+ makeFlagsArray+=("KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")
+ makeFlagsArray+=("modules")
+
+ # try to make it work for v5.8 - but update_mgmt_frame_registrations is too different
+ #find -type f -exec sed -i 's/sha256_/rtl_sha256_/g ; s/timespec/timespec64/ ; s/getboottime/getboottime64/ ; s/mgmt_frame_register/update_mgmt_frame_registrations/g' {} \+
+ find -type f -exec sed -i 's/timespec/timespec64/ ; s/getboottime/getboottime64/ ; s/entry = proc_create_data.*/entry = NULL;/' {} \+
+ ''
+ + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+ makeFlagsArray+=("ARCH=arm64")
+ '';
+
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ mkdir -p ${modDestDir}
+ find . -name '*.ko' -exec cp --parents '{}' ${modDestDir} \;
+ find ${modDestDir} -name '*.ko' -exec xz -f '{}' \;
+ '';
+
+ meta = with lib; {
+ description = "Realtek RTL8188GU driver";
+ longDescription = ''
+ A kernel module for Realtek 8188 network cards.
+ '';
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ };
+ }
diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix
index 295d05d..40217ac 100644
--- a/hosts/local/nvidia.nix
+++ b/hosts/local/nvidia.nix
@@ -12,6 +12,7 @@
else config.boot.kernelPackages.nvidiaPackages.beta;
in {
boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
+ environment.systemPackages = [pkgs.nvitop];
# boot.kernelPackages = lib.mkForce unfreePkgs.linuxKernel.packages.linux_xanmod_latest;
# boot.kernelParams = ["video=HDMI-A-1:1920x1080"];
#
@@ -51,6 +52,7 @@ in {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
+ # forceFullCompositionPipeline = true;
# nvidiaSettings = true;
open = false;
};
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 5c191fe..8de0450 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -19,7 +19,7 @@
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
- extraOptions = ["unsupported-gpu" "--verbose" "--debug"];
+ # extraOptions = ["unsupported-gpu" "--verbose" "--debug"];
extraPackages = with pkgs; [
xdg-utils
xdg-desktop-portal
@@ -96,7 +96,7 @@
tigervnc
foliate
# code
- kompare
+ kdePackages.kompare
meld
# tmp
# browser TTS
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 36584b7..a084f51 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -44,17 +44,16 @@
ncdu
zip
unzip
+ p7zip
# images
imagemagick
# nix
- nil
- alejandra
#nixfmt
direnv
nix-direnv
devenv
- #inputs.devenv.packages.${pkgs.system}.default
+ # inputs.devenv.packages.${pkgs.system}.default
# scraping
python312Packages.yt-dlp
# markdown lsp
@@ -63,7 +62,6 @@
#crypto
# electrum
# yacreader
- superhtml
# ai stuff!
# aider-chat
@@ -90,6 +88,8 @@
appimage-run
# disk automount
udiskie
+ nodejs
+ bun
# /mac
]
++ lib.optionals pkgs.stdenv.isDarwin [
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-15 13:23:52 +0000