Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b1a4574f17 |
314
flake.lock
generated
314
flake.lock
generated
@@ -8,11 +8,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761656077,
|
"lastModified": 1760836749,
|
||||||
"narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
|
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
|
"rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761806975,
|
"lastModified": 1760083914,
|
||||||
"narHash": "sha256-GLGdVJSPH0LnsO64Biw0WFJaj1PlltYxgH13f+FGWgQ=",
|
"narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=",
|
||||||
"owner": "anyrun-org",
|
"owner": "anyrun-org",
|
||||||
"repo": "anyrun",
|
"repo": "anyrun",
|
||||||
"rev": "329d31af9ba038ef65db9914eb94de695c738377",
|
"rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -83,11 +83,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760101617,
|
"lastModified": 1759499898,
|
||||||
"narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
|
"narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
|
"rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -100,10 +100,14 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"authentik-src": "authentik-src",
|
"authentik-src": "authentik-src",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": [
|
||||||
|
"flake-parts"
|
||||||
|
],
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"napalm": "napalm",
|
"napalm": "napalm",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"pyproject-build-systems": "pyproject-build-systems",
|
"pyproject-build-systems": "pyproject-build-systems",
|
||||||
"pyproject-nix": "pyproject-nix",
|
"pyproject-nix": "pyproject-nix",
|
||||||
"systems": "systems_3",
|
"systems": "systems_3",
|
||||||
@@ -119,7 +123,6 @@
|
|||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "version/2025.8.4",
|
|
||||||
"repo": "authentik-nix",
|
"repo": "authentik-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -146,15 +149,15 @@
|
|||||||
"flake-schemas": "flake-schemas",
|
"flake-schemas": "flake-schemas",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762036128,
|
"lastModified": 1760747305,
|
||||||
"narHash": "sha256-0VgVPYq5upSXc+LSn3ubxJhH+DLdakYW4QXeabo0Ivg=",
|
"narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=",
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "499783c86e6e9436534d1a23b35da98c7f6af3f4",
|
"rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -209,11 +212,11 @@
|
|||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762065744,
|
"lastModified": 1760856120,
|
||||||
"narHash": "sha256-c04mxJoCb8f6BBrdaREWmdQq+pfp395olXhC+B0G7DI=",
|
"narHash": "sha256-yH1K/WDJpwIIw7e3wKdRgwHAZ38LXgcGE2Ecvk3I6GU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "fenix",
|
"repo": "fenix",
|
||||||
"rev": "e0f24085a4a0da1c32adc308ec4c518ae886ff35",
|
"rev": "b435bfccee71c6591dbce2fcfabe3e17e98c09fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -240,11 +243,11 @@
|
|||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761588595,
|
"lastModified": 1747046372,
|
||||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -324,14 +327,16 @@
|
|||||||
},
|
},
|
||||||
"flake-parts_2": {
|
"flake-parts_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756770412,
|
"lastModified": 1760813311,
|
||||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
"narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
"rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -342,27 +347,7 @@
|
|||||||
},
|
},
|
||||||
"flake-parts_3": {
|
"flake-parts_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1762040540,
|
|
||||||
"narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "0010412d62a25d959151790968765a70c436598b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753121425,
|
"lastModified": 1753121425,
|
||||||
@@ -378,7 +363,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_5": {
|
"flake-parts_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"lanzaboote",
|
"lanzaboote",
|
||||||
@@ -399,7 +384,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_6": {
|
"flake-parts_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"nvf",
|
"nvf",
|
||||||
@@ -407,11 +392,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760948891,
|
"lastModified": 1759362264,
|
||||||
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -420,7 +405,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_7": {
|
"flake-parts_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"tuirun",
|
"tuirun",
|
||||||
@@ -478,8 +463,8 @@
|
|||||||
},
|
},
|
||||||
"fonts": {
|
"fonts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_4",
|
"flake-parts": "flake-parts_3",
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753431871,
|
"lastModified": 1753431871,
|
||||||
@@ -586,11 +571,11 @@
|
|||||||
},
|
},
|
||||||
"hardware": {
|
"hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761933221,
|
"lastModified": 1760106635,
|
||||||
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
|
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "7467f155fcba189eb088a7601f44fbef7688669b",
|
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -601,15 +586,15 @@
|
|||||||
},
|
},
|
||||||
"helix-flake": {
|
"helix-flake": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762054696,
|
"lastModified": 1760832569,
|
||||||
"narHash": "sha256-4wyNPyycaPDS13OC+YPkQOrrf3ZCS/ipAh9lfo121Nw=",
|
"narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "0b61e721aaae794c950c72f765388dcc5f9f32fa",
|
"rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -625,11 +610,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762087455,
|
"lastModified": 1760887455,
|
||||||
"narHash": "sha256-hpbPma1eUKwLAmiVRoMgIHbHiIKFkcACobJLbDt6ABw=",
|
"narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "43e205606aeb253bfcee15fd8a4a01d8ce8384ca",
|
"rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -667,11 +652,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761878381,
|
"lastModified": 1760662441,
|
||||||
"narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
|
"narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
|
"rev": "722792af097dff5790f1a66d271a47759f477755",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -725,11 +710,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760445448,
|
"lastModified": 1759490292,
|
||||||
"narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
|
"narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
|
"rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -789,11 +774,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762027241,
|
"lastModified": 1757420192,
|
||||||
"narHash": "sha256-w0NhWx95Xao6Dh3G1p7G1cHwGBknwPVPG5VRghk3LSg=",
|
"narHash": "sha256-jVkY2ax7e+V+M4RwLZTJnOVTdjR5Bj10VstJuK60tl4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hypridle",
|
"repo": "hypridle",
|
||||||
"rev": "f3d1f3b232a5e3267008568196397b03fab244d2",
|
"rev": "f158b2fe9293f9b25f681b8e46d84674e7bc7f01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -812,17 +797,17 @@
|
|||||||
"hyprlang": "hyprlang",
|
"hyprlang": "hyprlang",
|
||||||
"hyprutils": "hyprutils",
|
"hyprutils": "hyprutils",
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"systems": "systems_4",
|
"systems": "systems_4",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761869718,
|
"lastModified": 1760874867,
|
||||||
"narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
|
"narHash": "sha256-w2JettCPyqWKMYoJRCTc5/nsSvGrSV9jG4kbn8Q0pZk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland",
|
"repo": "hyprland",
|
||||||
"rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
|
"rev": "59ff7b2f891d06f4097128faf7027a3863542167",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -889,11 +874,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759610243,
|
"lastModified": 1749046714,
|
||||||
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
|
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-protocols",
|
"repo": "hyprland-protocols",
|
||||||
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
|
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1021,11 +1006,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761675634,
|
"lastModified": 1760023949,
|
||||||
"narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=",
|
"narHash": "sha256-fu0B4duamVdbkPio/czu1XhsPLRXUJpZLDrSk3nih4U=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlock",
|
"repo": "hyprlock",
|
||||||
"rev": "98b86752fe4867bd14ef96a92ea788229af93130",
|
"rev": "36ec73f166d9434a3f27c96c575198906f77644a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1206,11 +1191,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761748321,
|
"lastModified": 1760534924,
|
||||||
"narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=",
|
"narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "533db5857c9e00ca352558a928417116ee08a824",
|
"rev": "100b4e000032b865563a9754e5bca189bc544764",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1223,8 +1208,8 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-compat": "flake-compat_4",
|
"flake-compat": "flake-compat_4",
|
||||||
"flake-parts": "flake-parts_5",
|
"flake-parts": "flake-parts_4",
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_7",
|
||||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||||
"rust-overlay": "rust-overlay_3"
|
"rust-overlay": "rust-overlay_3"
|
||||||
},
|
},
|
||||||
@@ -1293,11 +1278,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762088055,
|
"lastModified": 1760839259,
|
||||||
"narHash": "sha256-zh7fDPmhmoXVTtODiDhOLlutwNLJmwOlLphVKuCCiZA=",
|
"narHash": "sha256-9KYm1Oh3jB2Xf0LiFxIBFgOuqRN4FNW4PKfrxXDV418=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "nix-gaming",
|
"repo": "nix-gaming",
|
||||||
"rev": "d74c3702fdc737276baccab80c2053e8cde5dba5",
|
"rev": "6aa0613ecf363840e011006b05aefa094b78b053",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1346,21 +1331,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1754788789,
|
|
||||||
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixpkgs.lib",
|
|
||||||
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixpkgs.lib",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-lib_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751159883,
|
"lastModified": 1751159883,
|
||||||
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
|
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
|
||||||
@@ -1375,22 +1345,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1761880412,
|
|
||||||
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758690382,
|
"lastModified": 1758690382,
|
||||||
@@ -1409,11 +1363,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757745802,
|
"lastModified": 1760703608,
|
||||||
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
|
"narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=",
|
||||||
"owner": "NixOS",
|
"owner": "PedroHLC",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
|
"rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1424,22 +1378,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1761907660,
|
|
||||||
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_5": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753250450,
|
"lastModified": 1753250450,
|
||||||
"narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
|
"narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
|
||||||
@@ -1455,7 +1393,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759381078,
|
"lastModified": 1759381078,
|
||||||
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
||||||
@@ -1471,13 +1409,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761114652,
|
"lastModified": 1759381078,
|
||||||
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
|
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
|
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1487,7 +1425,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754243818,
|
"lastModified": 1754243818,
|
||||||
"narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=",
|
"narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=",
|
||||||
@@ -1503,13 +1441,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761907660,
|
"lastModified": 1760524057,
|
||||||
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1519,20 +1457,36 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_9": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1759386674,
|
||||||
|
"narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "625ad6366178f03acd79f9e3822606dd7985b657",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nvf": {
|
"nvf": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_5",
|
"flake-compat": "flake-compat_5",
|
||||||
"flake-parts": "flake-parts_6",
|
"flake-parts": "flake-parts_5",
|
||||||
"mnw": "mnw",
|
"mnw": "mnw",
|
||||||
"nixpkgs": "nixpkgs_10",
|
"nixpkgs": "nixpkgs_9",
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762093557,
|
"lastModified": 1760153667,
|
||||||
"narHash": "sha256-esmyNNa8TvduITLfqYPSMroyZ9vxJr2nsvjYmHmO+Ag=",
|
"narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "20d8fca94dceaf943686598da7fba31b37100e50",
|
"rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1551,11 +1505,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760663237,
|
"lastModified": 1758108966,
|
||||||
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
|
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
|
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1648,7 +1602,7 @@
|
|||||||
"chaotic": "chaotic",
|
"chaotic": "chaotic",
|
||||||
"fenix": "fenix",
|
"fenix": "fenix",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_2",
|
||||||
"fonts": "fonts",
|
"fonts": "fonts",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"hardware": "hardware",
|
"hardware": "hardware",
|
||||||
@@ -1661,7 +1615,7 @@
|
|||||||
"hyprpaper": "hyprpaper",
|
"hyprpaper": "hyprpaper",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nix-gaming": "nix-gaming",
|
"nix-gaming": "nix-gaming",
|
||||||
"nixpkgs": "nixpkgs_9",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"nvf": "nvf",
|
"nvf": "nvf",
|
||||||
"systems": "systems_6",
|
"systems": "systems_6",
|
||||||
"treefmt-nix": "treefmt-nix",
|
"treefmt-nix": "treefmt-nix",
|
||||||
@@ -1672,11 +1626,11 @@
|
|||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762016333,
|
"lastModified": 1760714286,
|
||||||
"narHash": "sha256-PT8hXDYyeRjh9BGyLF/nZWm9TqRwP2EzeKuqUFH0M3w=",
|
"narHash": "sha256-WOt9KquZ1BXjMcVyHpMeliqNRL6BfRvBHFGfRDriDx4=",
|
||||||
"owner": "rust-lang",
|
"owner": "rust-lang",
|
||||||
"repo": "rust-analyzer",
|
"repo": "rust-analyzer",
|
||||||
"rev": "fca718c0f2074bdccf9a996bb37b0fcaff80dc97",
|
"rev": "1e20331e42449dfc0b44bce84147a06772d045d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1694,11 +1648,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761964689,
|
"lastModified": 1760668505,
|
||||||
"narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
|
"narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "63d22578600f70d293aede6bc737efef60ebd97f",
|
"rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1861,11 +1815,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761311587,
|
"lastModified": 1760889407,
|
||||||
"narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
|
"narHash": "sha256-ppIp04fmz+BaTpJs1nIOmPADg02asfQFrFbhb3SmxsE=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
|
"rev": "3f258dead9fed51f53862366d3a6bc1b622ee7cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1876,7 +1830,7 @@
|
|||||||
},
|
},
|
||||||
"tuirun": {
|
"tuirun": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_7",
|
"flake-parts": "flake-parts_6",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
@@ -1949,11 +1903,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760713634,
|
"lastModified": 1755354946,
|
||||||
"narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
|
"narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
|
"rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1969,11 +1923,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762074512,
|
"lastModified": 1759969704,
|
||||||
"narHash": "sha256-m8ZY0rmq9QXnIR08/vOyK9MnEbiziZG8mPGAVwoYEPQ=",
|
"narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "eb05f21bcf0f380e45537db6c5df13b50acaa4a6",
|
"rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5",
|
||||||
"revCount": 143,
|
"revCount": 137,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.sr.ht/~canasta/zen-browser-flake"
|
"url": "https://git.sr.ht/~canasta/zen-browser-flake"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -53,7 +53,11 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
authentik = {
|
authentik = {
|
||||||
url = "github:nix-community/authentik-nix/version/2025.8.4";
|
url = "github:nix-community/authentik-nix";
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
flake-parts.follows = "flake-parts";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake-compat.url = "github:edolstra/flake-compat";
|
flake-compat.url = "github:edolstra/flake-compat";
|
||||||
|
|||||||
@@ -38,11 +38,17 @@ in
|
|||||||
./settings.nix
|
./settings.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-0ad53967-bb38-4485-be75-ca55ae4c3b68".device = "/dev/disk/by-uuid/0ad53967-bb38-4485-be75-ca55ae4c3b68";
|
|
||||||
networking.hostName = "bunk";
|
networking.hostName = "bunk";
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/var/lib/swapfile";
|
||||||
|
size = 32 * 1024;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
|
environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
system.stateVersion = lib.mkDefault "25.05";
|
system.stateVersion = lib.mkDefault "23.11";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +1,47 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
lib,
|
||||||
];
|
modulesPath,
|
||||||
|
...
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
}:
|
||||||
boot.initrd.kernelModules = [ ];
|
{
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
boot.extraModulePackages = [ ];
|
boot = {
|
||||||
|
initrd = {
|
||||||
fileSystems."/" =
|
availableKernelModules = [
|
||||||
{ device = "/dev/disk/by-uuid/d15672b5-dc97-4f99-9ad2-70f9ddf20447";
|
"nvme"
|
||||||
fsType = "btrfs";
|
"xhci_pci"
|
||||||
options = [ "subvol=@" ];
|
"ahci"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
kernelModules = [ "amdgpu" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-2f0dfe96-bc63-4f38-b190-3d9fa45dc560".device = "/dev/disk/by-uuid/2f0dfe96-bc63-4f38-b190-3d9fa45dc560";
|
kernelModules = [ "kvm-amd" ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/F3FC-3CDF";
|
device = "/dev/disk/by-uuid/da41c89a-7ab8-4697-9a14-0d115b97cc2e";
|
||||||
fsType = "vfat";
|
fsType = "ext4";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
};
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device =
|
||||||
[ { device = "/dev/disk/by-uuid/e6464248-0d1e-4950-bf48-4cebeabaf871"; }
|
"/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3";
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/7E84-D168";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
boot = {
|
boot = {
|
||||||
kernel = {
|
kernel = {
|
||||||
variant = "latest";
|
variant = "latest";
|
||||||
hardware = [ "amd" ];
|
hardware = ["amd"];
|
||||||
};
|
};
|
||||||
loader = {
|
loader = {
|
||||||
default = {
|
default = {
|
||||||
@@ -20,20 +20,13 @@
|
|||||||
};
|
};
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
vendors = [ "amd" ];
|
vendors = ["amd"];
|
||||||
};
|
};
|
||||||
logitech = {
|
logitech = {
|
||||||
enable = false;
|
enable = false;
|
||||||
};
|
};
|
||||||
network = {
|
network = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nameservers = [
|
|
||||||
"192.168.88.1"
|
|
||||||
"192.168.88.69"
|
|
||||||
];
|
|
||||||
search = [
|
|
||||||
"taila7448a.ts.net"
|
|
||||||
];
|
|
||||||
interfaces = {
|
interfaces = {
|
||||||
"wlp6s0" = {
|
"wlp6s0" = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
@@ -130,10 +123,10 @@
|
|||||||
enable = false;
|
enable = false;
|
||||||
};
|
};
|
||||||
thunar = {
|
thunar = {
|
||||||
enable = false;
|
enable = true;
|
||||||
};
|
};
|
||||||
yubikey = {
|
yubikey = {
|
||||||
enable = false;
|
enable = true;
|
||||||
};
|
};
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = false;
|
enable = false;
|
||||||
@@ -175,7 +168,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
mullvad = {
|
mullvad = {
|
||||||
enable = false;
|
enable = true;
|
||||||
};
|
};
|
||||||
nix-ld = {
|
nix-ld = {
|
||||||
enable = false;
|
enable = false;
|
||||||
@@ -198,14 +191,11 @@
|
|||||||
samba = {
|
samba = {
|
||||||
enable = false;
|
enable = false;
|
||||||
};
|
};
|
||||||
tailscale = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
udisks = {
|
udisks = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
zram = {
|
zram = {
|
||||||
enable = true;
|
enable = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
system = {
|
system = {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
name = "DP-3";
|
name = "DP-3";
|
||||||
width = 2560;
|
width = 2560;
|
||||||
height = 1440;
|
height = 1440;
|
||||||
refreshRate = "143.99";
|
refreshRate = "240";
|
||||||
position = "0x0";
|
position = "0x0";
|
||||||
transform = 0;
|
transform = 0;
|
||||||
bitDepth = 10;
|
bitDepth = 10;
|
||||||
|
|||||||
@@ -6,9 +6,8 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib) mkIf mkEnableOption;
|
inherit (lib) mkIf mkEnableOption;
|
||||||
packageNames = map (p: p.pname or p.name or null) config.home.packages;
|
inherit (lib.meta) getExe;
|
||||||
hasPackage = name: lib.any (x: x == name) packageNames;
|
inherit (pkgs) eza bat;
|
||||||
hasEza = hasPackage "eza";
|
|
||||||
cfg = config.home.programs.fish;
|
cfg = config.home.programs.fish;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -29,9 +28,7 @@ in
|
|||||||
nixclean = "nh clean all --keep 3";
|
nixclean = "nh clean all --keep 3";
|
||||||
nixdev = "nix develop ~/.nix-config -c $SHELL";
|
nixdev = "nix develop ~/.nix-config -c $SHELL";
|
||||||
nixup = "nh os switch -H $hostname";
|
nixup = "nh os switch -H $hostname";
|
||||||
nixupn = "nh os switch -n -H $hostname";
|
nixupv = "nh os switch -v -H $hostname";
|
||||||
nixupv = "nh os switch -v --show-trace -H $hostname";
|
|
||||||
nixupvn = "nh os switch -n -v --show-trace -H $hostname";
|
|
||||||
flakeup = "nix flake update";
|
flakeup = "nix flake update";
|
||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
@@ -47,8 +44,12 @@ in
|
|||||||
nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
|
nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
|
||||||
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||||
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||||
ls = mkIf hasEza "eza";
|
tree = "${getExe eza} --tree --icons=always";
|
||||||
tree = mkIf hasEza "eza --tree --icons=always";
|
cat = "${getExe bat} --style=plain";
|
||||||
|
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
|
||||||
|
ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
|
||||||
|
lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
|
||||||
|
la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
|
||||||
# Clear screen and scrollback
|
# Clear screen and scrollback
|
||||||
clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
|
clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
|
||||||
};
|
};
|
||||||
@@ -58,12 +59,14 @@ in
|
|||||||
# Merge history when pressing up
|
# Merge history when pressing up
|
||||||
up-or-search = lib.readFile ./up-or-search.fish;
|
up-or-search = lib.readFile ./up-or-search.fish;
|
||||||
# Check stuff in PATH
|
# Check stuff in PATH
|
||||||
nix-inspect = # fish
|
nix-inspect =
|
||||||
|
# fish
|
||||||
''
|
''
|
||||||
set -s PATH | grep "PATH\[.*/nix/store" | cut -d '|' -f2 | grep -v -e "-man" -e "-terminfo" | perl -pe 's:^/nix/store/\w{32}-([^/]*)/bin$:\1:' | sort | uniq
|
set -s PATH | grep "PATH\[.*/nix/store" | cut -d '|' -f2 | grep -v -e "-man" -e "-terminfo" | perl -pe 's:^/nix/store/\w{32}-([^/]*)/bin$:\1:' | sort | uniq
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
interactiveShellInit = # fish
|
interactiveShellInit =
|
||||||
|
# fish
|
||||||
''
|
''
|
||||||
# Open command buffer in vim when alt+e is pressed
|
# Open command buffer in vim when alt+e is pressed
|
||||||
bind \ee edit_command_buffer
|
bind \ee edit_command_buffer
|
||||||
|
|||||||
@@ -15,54 +15,47 @@ in
|
|||||||
};
|
};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = [ pkgs.gh ];
|
home.packages = [ pkgs.gh ];
|
||||||
programs = {
|
programs.git = {
|
||||||
git = {
|
enable = true;
|
||||||
enable = true;
|
userName = osConfig.settings.accounts.username;
|
||||||
settings = {
|
userEmail = osConfig.settings.accounts.mail;
|
||||||
# user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
|
||||||
user = {
|
|
||||||
name = osConfig.settings.accounts.username;
|
|
||||||
email = osConfig.settings.accounts.mail;
|
|
||||||
signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
|
|
||||||
};
|
|
||||||
signing = {
|
|
||||||
format = lib.mkDefault "ssh";
|
|
||||||
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
|
|
||||||
signByDefault = true;
|
|
||||||
};
|
|
||||||
gpg = {
|
|
||||||
# format = lib.mkDefault "ssh";
|
|
||||||
ssh.allowedSignersFile =
|
|
||||||
config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
|
|
||||||
};
|
|
||||||
commit = {
|
|
||||||
verbose = true;
|
|
||||||
gpgSign = false;
|
|
||||||
};
|
|
||||||
init.defaultBranch = "main";
|
|
||||||
merge.conflictStyle = "diff3";
|
|
||||||
diff.algorithm = "histogram";
|
|
||||||
log.date = "iso";
|
|
||||||
column.ui = "auto";
|
|
||||||
branch.sort = "committerdate";
|
|
||||||
push.autoSetupRemote = true;
|
|
||||||
rerere.enabled = true;
|
|
||||||
};
|
|
||||||
lfs.enable = true;
|
|
||||||
ignores = [
|
|
||||||
".direnv"
|
|
||||||
"result"
|
|
||||||
".jj"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
delta = {
|
delta = {
|
||||||
enableGitIntegration = true;
|
|
||||||
enable = true;
|
enable = true;
|
||||||
options.dark = true;
|
options.dark = true;
|
||||||
};
|
};
|
||||||
|
extraConfig = {
|
||||||
|
# user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
||||||
|
user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
|
||||||
|
signing = {
|
||||||
|
format = lib.mkDefault "ssh";
|
||||||
|
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
|
||||||
|
signByDefault = true;
|
||||||
|
};
|
||||||
|
gpg = {
|
||||||
|
# format = lib.mkDefault "ssh";
|
||||||
|
ssh.allowedSignersFile =
|
||||||
|
config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
|
||||||
|
};
|
||||||
|
commit = {
|
||||||
|
verbose = true;
|
||||||
|
gpgSign = false;
|
||||||
|
};
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
merge.conflictStyle = "diff3";
|
||||||
|
diff.algorithm = "histogram";
|
||||||
|
log.date = "iso";
|
||||||
|
column.ui = "auto";
|
||||||
|
branch.sort = "committerdate";
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
rerere.enabled = true;
|
||||||
|
};
|
||||||
|
lfs.enable = true;
|
||||||
|
ignores = [
|
||||||
|
".direnv"
|
||||||
|
"result"
|
||||||
|
".jj"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.configFile."git/allowed_signers".text = ''
|
xdg.configFile."git/allowed_signers".text = ''
|
||||||
${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
|
${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -3,15 +3,13 @@
|
|||||||
osConfig,
|
osConfig,
|
||||||
clib,
|
clib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
inherit (lib) mkIf;
|
inherit (lib) mkIf;
|
||||||
cfg = osConfig.nixos.programs.hyprland;
|
cfg = osConfig.nixos.programs.hyprland;
|
||||||
|
|
||||||
bg = osConfig.settings.theme.background;
|
bg = osConfig.settings.theme.background;
|
||||||
inherit (clib.theme.bgs) resolve;
|
inherit (clib.theme.bgs) resolve;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.hyprlock = {
|
programs.hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -54,7 +52,6 @@ in
|
|||||||
position = "0, 20";
|
position = "0, 20";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
font_family = "DepartureMono Nerd Font Mono Italic";
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
label = [
|
label = [
|
||||||
@@ -66,7 +63,7 @@ in
|
|||||||
shadow_boost = 0.5;
|
shadow_boost = 0.5;
|
||||||
color = "rgba(FFFFFFFF)";
|
color = "rgba(FFFFFFFF)";
|
||||||
font_size = 25;
|
font_size = 25;
|
||||||
font_family = "DepartureMono Nerd Font Mono Regular";
|
font_family = "Input Mono Compressed";
|
||||||
position = "0, 230";
|
position = "0, 230";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
@@ -79,7 +76,7 @@ in
|
|||||||
shadow_boost = 0.5;
|
shadow_boost = 0.5;
|
||||||
color = "rgba(FFFFFFFF)";
|
color = "rgba(FFFFFFFF)";
|
||||||
font_size = 85;
|
font_size = 85;
|
||||||
font_family = "DepartureMono Nerd Font Mono Regular";
|
font_family = "Input Mono Compressed";
|
||||||
position = "0, 300";
|
position = "0, 300";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
|
|||||||
@@ -62,8 +62,16 @@ in
|
|||||||
[
|
[
|
||||||
cmatrix
|
cmatrix
|
||||||
xcur2png
|
xcur2png
|
||||||
|
ripgrep
|
||||||
|
file
|
||||||
|
fd
|
||||||
|
gnused
|
||||||
nix-tree
|
nix-tree
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
|
unzip
|
||||||
|
zip
|
||||||
|
gnutar
|
||||||
|
p7zip
|
||||||
]
|
]
|
||||||
|
|
||||||
(mkIf cfg.common.enable [
|
(mkIf cfg.common.enable [
|
||||||
|
|||||||
@@ -131,23 +131,15 @@
|
|||||||
"3": "3",
|
"3": "3",
|
||||||
"4": "4",
|
"4": "4",
|
||||||
"5": "5",
|
"5": "5",
|
||||||
"6": "6",
|
"active": "_",
|
||||||
"7": "7",
|
"default": "_"
|
||||||
"8": "8",
|
|
||||||
"9": "9",
|
|
||||||
"default": "_",
|
|
||||||
"active": "_"
|
|
||||||
},
|
},
|
||||||
"on-click": "activate",
|
"on-click": "activate",
|
||||||
"show-special": false,
|
"show-special": false,
|
||||||
"on-scroll-up": "hyprctl dispatch workspace r-1",
|
"on-scroll-up": "hyprctl dispatch workspace r-1",
|
||||||
"on-scroll-down": "hyprctl dispatch workspace r+1",
|
"on-scroll-down": "hyprctl dispatch workspace r+1",
|
||||||
"persistent-workspaces": {
|
"persistent-workspaces": {
|
||||||
"1": [],
|
"*": 3
|
||||||
"2": [],
|
|
||||||
"3": [],
|
|
||||||
"4": [],
|
|
||||||
"5": []
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"niri/workspaces": {
|
"niri/workspaces": {
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ tooltip label {
|
|||||||
margin: 0 0px;
|
margin: 0 0px;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: #fbf1c7;
|
color: #fbf1c7;
|
||||||
border-top: 4px solid transparent;
|
border-top: 2px solid transparent;
|
||||||
border-bottom: 4px solid transparent;
|
border-bottom: 2px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button:hover {
|
#workspaces button:hover {
|
||||||
@@ -45,7 +45,7 @@ tooltip label {
|
|||||||
background-image: url("assets/button.svg");
|
background-image: url("assets/button.svg");
|
||||||
background-position: center;
|
background-position: center;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 21px 18px;
|
background-size: 24px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#custom-trayicon {
|
#custom-trayicon {
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ let
|
|||||||
|
|
||||||
commonPackages = with pkgs; [
|
commonPackages = with pkgs; [
|
||||||
libva
|
libva
|
||||||
libva-vdpau-driver
|
vaapiVdpau
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
|
|
||||||
commonPackages32 = with pkgs.pkgsi686Linux; [
|
commonPackages32 = with pkgs.pkgsi686Linux; [
|
||||||
libva
|
libva
|
||||||
libva-vdpau-driver
|
vaapiVdpau
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,14 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
|
inherit (lib.meta) getExe;
|
||||||
|
inherit (pkgs) eza bat;
|
||||||
inherit (lib) mkIf mkEnableOption mkMerge;
|
inherit (lib) mkIf mkEnableOption mkMerge;
|
||||||
|
|
||||||
cfg = config.nixos.programs.fish;
|
cfg = config.nixos.programs.fish;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
nixos.programs.fish = {
|
nixos.programs.fish = {
|
||||||
enable = mkEnableOption "Enables fish shell";
|
enable = mkEnableOption "Enables fish shell";
|
||||||
@@ -19,7 +22,6 @@ in {
|
|||||||
(mkIf cfg.enable {
|
(mkIf cfg.enable {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
useBabelfish = true;
|
|
||||||
vendor = {
|
vendor = {
|
||||||
completions.enable = true;
|
completions.enable = true;
|
||||||
config.enable = true;
|
config.enable = true;
|
||||||
@@ -35,9 +37,7 @@ in {
|
|||||||
nixclean = "nh clean all --keep 3";
|
nixclean = "nh clean all --keep 3";
|
||||||
nixdev = "nix develop ~/.nix-config -c $SHELL";
|
nixdev = "nix develop ~/.nix-config -c $SHELL";
|
||||||
nixup = "nh os switch -H $hostname";
|
nixup = "nh os switch -H $hostname";
|
||||||
nixupn = "nh os switch -n -H $hostname";
|
nixupv = "nh os switch -v -H $hostname";
|
||||||
nixupv = "nh os switch -v --show-trace -H $hostname";
|
|
||||||
nixupvn = "nh os switch -n -v --show-trace -H $hostname";
|
|
||||||
flakeup = "nix flake update";
|
flakeup = "nix flake update";
|
||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
@@ -53,8 +53,12 @@ in {
|
|||||||
nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
|
nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
|
||||||
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||||
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||||
ls = lib.getExe pkgs.eza;
|
tree = "${getExe eza} --tree --icons=always";
|
||||||
tree = "${lib.getExe pkgs.eza} --tree --icons=always";
|
cat = "${getExe bat} --style=plain";
|
||||||
|
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
|
||||||
|
ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
|
||||||
|
lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
|
||||||
|
la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
|
||||||
# Clear screen and scrollback
|
# Clear screen and scrollback
|
||||||
clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
|
clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,9 +18,7 @@ in
|
|||||||
gaps_in = 2;
|
gaps_in = 2;
|
||||||
gaps_out = "4, 4, 4, 4";
|
gaps_out = "4, 4, 4, 4";
|
||||||
border_size = 3;
|
border_size = 3;
|
||||||
#col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
|
"col.active_border" = "rgb(4c7a5d)";
|
||||||
#col.inactive_border = rgba(595959aa)
|
|
||||||
"col.active_border" = "rgb(4c7a5d)"; # rgba(b16286ee) 45deg
|
|
||||||
"col.inactive_border" = "rgb(504945)";
|
"col.inactive_border" = "rgb(504945)";
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
resize_on_border = true;
|
resize_on_border = true;
|
||||||
|
|||||||
@@ -49,6 +49,20 @@ in
|
|||||||
"$mod, P, pseudo,"
|
"$mod, P, pseudo,"
|
||||||
"$mod, J, togglesplit,"
|
"$mod, J, togglesplit,"
|
||||||
"$mod, C, exec, hyprctl dispatch exec copyq toggle"
|
"$mod, C, exec, hyprctl dispatch exec copyq toggle"
|
||||||
|
"$mod, left, movefocus, l"
|
||||||
|
"$mod, right, movefocus, r"
|
||||||
|
"$mod, up, movefocus, u"
|
||||||
|
"$mod, down, movefocus, d"
|
||||||
|
"$mod, 1, workspace, 1"
|
||||||
|
"$mod, 2, workspace, 2"
|
||||||
|
"$mod, 3, workspace, 3"
|
||||||
|
"$mod, 4, workspace, 4"
|
||||||
|
"$mod, 5, workspace, 5"
|
||||||
|
"$mod, 6, workspace, 6"
|
||||||
|
"$mod, 7, workspace, 7"
|
||||||
|
"$mod, 8, workspace, 8"
|
||||||
|
"$mod, 9, workspace, 9"
|
||||||
|
"$mod, 0, workspace, 10"
|
||||||
"$mod SHIFT, 1, movetoworkspace, 1"
|
"$mod SHIFT, 1, movetoworkspace, 1"
|
||||||
"$mod SHIFT, 2, movetoworkspace, 2"
|
"$mod SHIFT, 2, movetoworkspace, 2"
|
||||||
"$mod SHIFT, 3, movetoworkspace, 3"
|
"$mod SHIFT, 3, movetoworkspace, 3"
|
||||||
@@ -61,30 +75,6 @@ in
|
|||||||
"$mod SHIFT, 0, movetoworkspace, 10"
|
"$mod SHIFT, 0, movetoworkspace, 10"
|
||||||
"CTRL SHIFT, Escape, exec, ${runOnce "resources"}"
|
"CTRL SHIFT, Escape, exec, ${runOnce "resources"}"
|
||||||
|
|
||||||
"$mod, 1, workspace, 1"
|
|
||||||
"$mod, 2, workspace, 2"
|
|
||||||
"$mod, 3, workspace, 3"
|
|
||||||
"$mod, 4, workspace, 4"
|
|
||||||
"$mod, 5, workspace, 5"
|
|
||||||
"$mod, 6, workspace, 6"
|
|
||||||
"$mod, 7, workspace, 7"
|
|
||||||
"$mod, 8, workspace, 8"
|
|
||||||
"$mod, 9, workspace, 9"
|
|
||||||
"$mod, 0, workspace, 10"
|
|
||||||
|
|
||||||
"$mod, left, movefocus, l"
|
|
||||||
"$mod, right, movefocus, r"
|
|
||||||
"$mod, up, movefocus, u"
|
|
||||||
"$mod, down, movefocus, d"
|
|
||||||
"$mod SHIFT, left, resizeactive, -20 0"
|
|
||||||
"$mod SHIFT, right, resizeactive, 20 0"
|
|
||||||
"$mod SHIFT, up, resizeactive, 0 -20"
|
|
||||||
"$mod SHIFT, down, resizeactive, 0 20"
|
|
||||||
"$mod CTRL, left, swapwindow, l"
|
|
||||||
"$mod CTRL, right, swapwindow, r"
|
|
||||||
"$mod CTRL, up, swapwindow, u"
|
|
||||||
"$mod CTRL, down, swapwindow, d"
|
|
||||||
|
|
||||||
",XF86AudioLowerVolume, exec, volume-control.sh --dec"
|
",XF86AudioLowerVolume, exec, volume-control.sh --dec"
|
||||||
",XF86AudioRaiseVolume, exec, volume-control.sh --inc"
|
",XF86AudioRaiseVolume, exec, volume-control.sh --inc"
|
||||||
",XF86AudioMute, exec, volume-control.sh --toggle"
|
",XF86AudioMute, exec, volume-control.sh --toggle"
|
||||||
|
|||||||
@@ -79,16 +79,10 @@ in
|
|||||||
xmrig
|
xmrig
|
||||||
ocl-icd
|
ocl-icd
|
||||||
dig
|
dig
|
||||||
unzip
|
|
||||||
zip
|
|
||||||
gnutar
|
|
||||||
gnused
|
|
||||||
p7zip
|
|
||||||
ripgrep
|
|
||||||
file
|
|
||||||
]
|
]
|
||||||
|
|
||||||
(mkIf cfg.common.enable [
|
(mkIf cfg.common.enable [
|
||||||
|
qt6.full
|
||||||
swappy
|
swappy
|
||||||
wayfreeze
|
wayfreeze
|
||||||
imagemagick
|
imagemagick
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protonup-ng
|
protonup
|
||||||
wine
|
wine
|
||||||
winetricks
|
winetricks
|
||||||
wine-wayland
|
wine-wayland
|
||||||
|
|||||||
@@ -16,10 +16,17 @@ in
|
|||||||
services.kanata = {
|
services.kanata = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.kanata-with-cmd;
|
package = pkgs.kanata-with-cmd;
|
||||||
keyboards.default = {
|
keyboards.hhkbse = {
|
||||||
extraDefCfg = ''
|
extraDefCfg = ''
|
||||||
process-unmapped-keys yes
|
process-unmapped-keys yes
|
||||||
|
linux-dev-names-include (
|
||||||
|
"HHKB-Hybrid_1 Keyboard"
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
|
devices = [
|
||||||
|
"/dev/input/by-id/usb-PFU_Limited_HHKB-Hybrid-event-kbd"
|
||||||
|
"/dev/input/event2"
|
||||||
|
];
|
||||||
config = builtins.readFile (./. + "/hhkbse.kbd");
|
config = builtins.readFile (./. + "/hhkbse.kbd");
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
2 3 4 5 6 7 8 9 0 + ´ ' §
|
2 3 4 5 6 7 8 9 0 + ´ ' §
|
||||||
e p ¨
|
e p ¨
|
||||||
l ö ä
|
l ö ä
|
||||||
-
|
|
||||||
z x rmet
|
z x rmet
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -26,16 +25,13 @@
|
|||||||
_ _ _ _ _ _ _ _ _ _ pgdn pgup del
|
_ _ _ _ _ _ _ _ _ _ pgdn pgup del
|
||||||
_ _ '
|
_ _ '
|
||||||
_ _ _
|
_ _ _
|
||||||
_
|
|
||||||
_ _ @level3
|
_ _ @level3
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
(deflayer level3
|
(deflayer level3
|
||||||
RA-2 RA-3 S-4 RA-5 S-¨ RA-7 RA-8 RA-9 RA-0 RA-+ ⇥ ⇤ S-'
|
RA-2 RA-3 S-4 RA-5 S-¨ RA-7 RA-8 RA-9 RA-0 RA-+ ⇥ ⇤ S-'
|
||||||
RA-5 ▲ RA-¨
|
RA-5 ▲ RA-¨
|
||||||
◀ ▼ ▶
|
◀ ▼ ▶
|
||||||
RA-<
|
|
||||||
RA-S-z RA-S-x @level3
|
RA-S-z RA-S-x @level3
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ in
|
|||||||
inputs.fonts.packages.${pkgs.system}.vcr-mono
|
inputs.fonts.packages.${pkgs.system}.vcr-mono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-color-emoji
|
noto-fonts-emoji
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
fira-code-symbols
|
fira-code-symbols
|
||||||
font-awesome
|
font-awesome
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
}: let
|
}: let
|
||||||
unit = "authentik";
|
unit = "authentik";
|
||||||
cfg = config.server.infra.${unit};
|
cfg = config.server.infra.${unit};
|
||||||
srv = config.server.infra;
|
srv = config.server.infra.www.domain;
|
||||||
in {
|
in {
|
||||||
options.server.infra.${unit} = {
|
options.server.infra.${unit} = {
|
||||||
enable = lib.mkEnableOption {
|
enable = lib.mkEnableOption {
|
||||||
@@ -14,7 +14,7 @@ in {
|
|||||||
};
|
};
|
||||||
url = lib.mkOption {
|
url = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
default = "auth.${srv.www.url}";
|
default = "auth.${srv.www.domain}";
|
||||||
};
|
};
|
||||||
port = lib.mkOption {
|
port = lib.mkOption {
|
||||||
type = lib.types.port;
|
type = lib.types.port;
|
||||||
|
|||||||
@@ -20,6 +20,11 @@
|
|||||||
)
|
)
|
||||||
svcNames);
|
svcNames);
|
||||||
|
|
||||||
|
revParts = lib.lists.reverseList (lib.splitString "." srv.ip);
|
||||||
|
revName = lib.concatStringsSep "." revParts;
|
||||||
|
|
||||||
|
localPTRs = ["${revName}.in-addr.arpa. PTR traefik.${srv.domain}"];
|
||||||
|
|
||||||
hostIp = hostname:
|
hostIp = hostname:
|
||||||
if hostname == "ziggy"
|
if hostname == "ziggy"
|
||||||
then "192.168.88.12"
|
then "192.168.88.12"
|
||||||
@@ -111,11 +116,10 @@ in {
|
|||||||
"255.255.255.255/32"
|
"255.255.255.255/32"
|
||||||
"2001:db8::/32"
|
"2001:db8::/32"
|
||||||
];
|
];
|
||||||
local-data =
|
local-data = localARecords;
|
||||||
[
|
|
||||||
''"traefik.${config.settings.accounts.domains.local}. A 192.168.88.14"''
|
# Example PTR entry: "14.88.168.192.in-addr.arpa. PTR traefik.cnix.dev."
|
||||||
]
|
# local-data-ptr = localPTRs;
|
||||||
++ localARecords;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
in {
|
in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
ollama
|
|
||||||
intel-compute-runtime
|
intel-compute-runtime
|
||||||
intel-graphics-compiler
|
intel-graphics-compiler
|
||||||
level-zero
|
level-zero
|
||||||
|
|||||||
@@ -4,8 +4,5 @@
|
|||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
input-fonts.acceptLicense = true;
|
input-fonts.acceptLicense = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays = [
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
ghostty = {
|
ghostty = {
|
||||||
enable = false;
|
enable = true;
|
||||||
};
|
};
|
||||||
helix = {
|
helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
enable = false;
|
enable = false;
|
||||||
};
|
};
|
||||||
nvf = {
|
nvf = {
|
||||||
enable = false;
|
enable = true;
|
||||||
};
|
};
|
||||||
nwg-bar = {
|
nwg-bar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user