Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

Merge branch 'rewrite' into main-merge

Browse source
This commit is contained in:
Christoph Hollizeck 2025-11-13 01:02:09 +01:00
commit 1c5847d03b
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
17 changed files with 404 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.envrc
View file

@ -1 +0,0 @@
export SOPS_AGE_KEY=$(ssh-to-age -i ~/.ssh/id_ed25519 -private-key)

525
flake.lock generated
View file

@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1760101617,
"narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
"lastModified": 1762356719,
"narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
"rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
"type": "github"
},
"original": {
@ -87,11 +87,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1761553912,
"narHash": "sha256-3UOEQPBlZo9OixT9L1zoD67QheopTG8/EfRPGKyP9bg=",
"lastModified": 1762510976,
"narHash": "sha256-KGoSj8qMOOPaNE48RTtuNBbqOvKLTeklnRHWWvE/TXo=",
"owner": "catppuccin",
"repo": "nix",
"rev": "7b42c91911c143ae3ea32a79cc8582b5920f24e3",
"rev": "728cb0a667ce37bb0c68557dba819c7fb54ff1c8",
"type": "github"
},
"original": {
@ -110,11 +110,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1761839147,
"narHash": "sha256-DXDb6AVCRPosOkQPyvVrHpO//VXqyzS3uLWiasTuENI=",
"lastModified": 1762791812,
"narHash": "sha256-O7Ne62r8hKE3FPqUsukMblxyYCFTh2jV5gHgIsI3rnE=",
"owner": "cachix",
"repo": "devenv",
"rev": "bb7849648b68035f6b910120252c22b28195cf54",
"rev": "1faab0d28c573f2a8dba2cf457b9d383adba252a",
"type": "github"
},
"original": {
@ -131,11 +131,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1761806629,
"narHash": "sha256-3u8345VliQtbpOtCNYYpDTCsjS8A9osrpU03E8TaIBw=",
"lastModified": 1762757174,
"narHash": "sha256-i2CZAiJNQsC7Wwk8fUZHS130W8HHLbmYqgT6ErYp5Zw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "c7c690951af16e60912678fab6155fb120cc27b0",
"rev": "9ada5aa8ebd5062c8c399ae59c3f77f266216a24",
"type": "github"
},
"original": {
@ -195,11 +195,11 @@
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
@ -211,11 +211,11 @@
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
@ -266,11 +266,29 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"lastModified": 1762810396,
"narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1762440070,
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
"type": "github"
},
"original": {
@ -332,11 +350,11 @@
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"lastModified": 1762441963,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
"type": "github"
},
"original": {
@ -358,11 +376,11 @@
]
},
"locked": {
"lastModified": 1758108966,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"lastModified": 1762441963,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
"type": "github"
},
"original": {
@ -482,11 +500,11 @@
"gpg-base-conf": {
"flake": false,
"locked": {
"lastModified": 1746158414,
"narHash": "sha256-4jkYn38XgaA7qm8xoIHH8pjPiie2K2JU97Tas04Zl5A=",
"lastModified": 1762009215,
"narHash": "sha256-yXptsucJ3BYhA6DdPZ8S88Lu6PfhlFed1GMJy2niT00=",
"owner": "drduh",
"repo": "config",
"rev": "0ae075a000dd2f6cc64a06180986c827b0c94836",
"rev": "6734a79fc08677e70ee4c789fbbc720cacf4ef4c",
"type": "github"
},
"original": {
@ -503,11 +521,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1761863388,
"narHash": "sha256-UwdHjEui1q4HGrkTekvIpwM/R+pD4fCh+vKlsvZSVyU=",
"lastModified": 1762716787,
"narHash": "sha256-YfcY28igFL5ZPCTtVBaVUvnhcWg8tyiBVSlULpXEIeQ=",
"owner": "helix-editor",
"repo": "helix",
"rev": "9dcd19e664a9efe2d6960710ddba3bbd8fda12b6",
"rev": "a79292b630ae4a0e6e37814ad21411ab50926c73",
"type": "github"
},
"original": {
@ -523,11 +541,11 @@
]
},
"locked": {
"lastModified": 1761845621,
"narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
"lastModified": 1762787259,
"narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
"rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
"type": "github"
},
"original": {
@ -545,11 +563,11 @@
]
},
"locked": {
"lastModified": 1752603129,
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"lastModified": 1762351818,
"narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
"type": "github"
},
"original": {
@ -565,11 +583,11 @@
]
},
"locked": {
"lastModified": 1759126670,
"narHash": "sha256-p+HObKRf2j3DfI4mcrJoF+WR7IIg9demMioYBsRH0GM=",
"lastModified": 1761971414,
"narHash": "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=",
"owner": "outfoxxed",
"repo": "hy3",
"rev": "af94b011af255de87b2b026121fab1e6f2c56c6d",
"rev": "16dae4d8f853b0d3e8434ee9941f9fc0155b8952",
"type": "github"
},
"original": {
@ -623,11 +641,11 @@
]
},
"locked": {
"lastModified": 1760445448,
"narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
"lastModified": 1762462052,
"narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
"rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
"type": "github"
},
"original": {
@ -670,8 +688,8 @@
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-guiutils": "hyprland-guiutils",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
@ -683,11 +701,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1761780088,
"narHash": "sha256-ylKrWQeIAGyysfHbgZpcWUs9UsbiOBIVXTPqaiV3lf0=",
"lastModified": 1762755326,
"narHash": "sha256-YYTzQUQDnVdtN3k40sC5kq6yL70riU8bM8cQLz38jzk=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "6ade4d58cab67e18aa758ef664e36421cab4d8b2",
"rev": "0b1d690676589503f0addece30e936a240733699",
"type": "github"
},
"original": {
@ -696,6 +714,52 @@
"type": "github"
}
},
"hyprland-guiutils": {
"inputs": {
"aquamarine": [
"hyprland",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprtoolkit": "hyprtoolkit",
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1762755186,
"narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "66356e20a8ed348aa49c1b9ceace786e224225b3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"type": "github"
}
},
"hyprland-plugins": {
"inputs": {
"hyprland": [
@ -713,11 +777,11 @@
]
},
"locked": {
"lastModified": 1761824067,
"narHash": "sha256-dB27qZRH2X5h2KM99UBYmksxb2ly2EGp5eSznTzRDe0=",
"lastModified": 1762115485,
"narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "7a07883c4d3e7ec6726862586483ea119e20eb0f",
"rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c",
"type": "github"
},
"original": {
@ -751,74 +815,6 @@
"type": "github"
}
},
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1749154592,
"narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1759080228,
"narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
@ -902,6 +898,58 @@
"type": "github"
}
},
"hyprtoolkit": {
"inputs": {
"aquamarine": [
"hyprland",
"hyprland-guiutils",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprland-guiutils",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprland-guiutils",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-guiutils",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprland-guiutils",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"hyprland-guiutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-guiutils",
"systems"
]
},
"locked": {
"lastModified": 1762463729,
"narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprtoolkit",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@ -914,11 +962,11 @@
]
},
"locked": {
"lastModified": 1759619523,
"narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
"lastModified": 1762387740,
"narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
"rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
"type": "github"
},
"original": {
@ -1004,11 +1052,11 @@
},
"import-tree": {
"locked": {
"lastModified": 1761120675,
"narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=",
"lastModified": 1762327901,
"narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=",
"owner": "vic",
"repo": "import-tree",
"rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719",
"rev": "90fa129798be99cde036b78658e89475710966a1",
"type": "github"
},
"original": {
@ -1024,11 +1072,11 @@
]
},
"locked": {
"lastModified": 1761733523,
"narHash": "sha256-Z0i6J9KaMZW7bBwQOj4XZ4mZFfegvaAtvnT3suUMhPc=",
"lastModified": 1762341531,
"narHash": "sha256-wlWo/A1lOkzvo6PHMnVMKiXuv+dyX1UBCjFpJJ6tNiY=",
"owner": "nix-community",
"repo": "nh",
"rev": "78494d6b8587c8cb36e51949f1177a4ee42a41f8",
"rev": "6c77c9371ed92ac1f93d2b7eaf9fb86ad3433bae",
"type": "github"
},
"original": {
@ -1045,11 +1093,11 @@
"rust-overlay": []
},
"locked": {
"lastModified": 1761800210,
"narHash": "sha256-v9/VHMISSjYpj5RgaN9qqsuC4OPVklLpN1l33HBXSE4=",
"lastModified": 1762804232,
"narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "7c0dcddee782d2ca68620ec423d08d932ef059df",
"rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3",
"type": "github"
},
"original": {
@ -1072,11 +1120,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1761724527,
"narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=",
"lastModified": 1762810134,
"narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842",
"rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b",
"type": "github"
},
"original": {
@ -1088,11 +1136,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1761721311,
"narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=",
"lastModified": 1762804232,
"narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e",
"rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3",
"type": "github"
},
"original": {
@ -1141,6 +1189,27 @@
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1762740007,
"narHash": "sha256-CtMgV9vfm16x/0NBQmQQe/Vbv423cPWeNfBtiVYcUBk=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "8dce0b23e30b03efbdc94e8db7cb27298446e4cc",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nix-ld": {
"inputs": {
"nixpkgs": [
@ -1148,11 +1217,11 @@
]
},
"locked": {
"lastModified": 1761554027,
"narHash": "sha256-LMnsUobJtqhNnHc9FAp4V/MPMb82+YiXnjbUreg/0n8=",
"lastModified": 1762763360,
"narHash": "sha256-sGxV5zfmy/s9V+/QA0q2ihCu0FZcKVraFuVKiUavGg8=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "e7d1eba1d561ada0bdb1177ff5d7ce2f8447e974",
"rev": "b6255fb02dfe52ac5ebb515e99ed12b74163db5a",
"type": "github"
},
"original": {
@ -1163,11 +1232,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1761827175,
"narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=",
"lastModified": 1762463231,
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "43ffe9ac82567512abb83187cb673de1091bdfa8",
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
"type": "github"
},
"original": {
@ -1184,11 +1253,11 @@
]
},
"locked": {
"lastModified": 1761563673,
"narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
"lastModified": 1762251193,
"narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
"rev": "e001844d4553aef268f97b32d3a825b6370eed91",
"type": "github"
},
"original": {
@ -1199,11 +1268,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1760524057,
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"lastModified": 1762111121,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github"
},
"original": {
@ -1213,22 +1282,6 @@
"type": "github"
}
},
"nixpkgs-25_05": {
"locked": {
"lastModified": 1759143472,
"narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-latest-factorio": {
"locked": {
"lastModified": 1757278553,
@ -1247,11 +1300,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1754788789,
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
"lastModified": 1761765539,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github"
},
"original": {
@ -1260,13 +1313,44 @@
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1761765539,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1762815089,
"narHash": "sha256-s4bnfnNMsKvbV4Jk5YCSks690q+MCsjmGjekqXHJsg8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d119b962754c8bcaf782aee7e83306d44e42c954",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1761468971,
"narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
"lastModified": 1762756533,
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
"type": "github"
},
"original": {
@ -1278,11 +1362,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1761672384,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"lastModified": 1762596750,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"type": "github"
},
"original": {
@ -1310,11 +1394,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1761672384,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"lastModified": 1762596750,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"type": "github"
},
"original": {
@ -1326,27 +1410,27 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1759036355,
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"lastModified": 1762721782,
"narHash": "sha256-ftv0n3xkKawHQgxZ6FGr2F1GdaYT/79aESm4t1LQ6X4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"rev": "e5d07586ec39f74b390308f2e00040c23bdef530",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1760596604,
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
"lastModified": 1762361079,
"narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
"rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
"type": "github"
},
"original": {
@ -1374,11 +1458,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"lastModified": 1762111121,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github"
},
"original": {
@ -1398,11 +1482,11 @@
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"lastModified": 1762441963,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
"type": "github"
},
"original": {
@ -1429,11 +1513,13 @@
"nh-flake": "nh-flake",
"niri": "niri",
"niri-flake": "niri-flake",
"nix-gaming": "nix-gaming",
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_3",
"nixpkgs-latest-factorio": "nixpkgs-latest-factorio",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix",
@ -1447,11 +1533,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1761739801,
"narHash": "sha256-ONUpb+l5oEIb9iOGkmUhze5YjRexZ6sc3mwQyLXlcms=",
"lastModified": 1762722525,
"narHash": "sha256-cM1u88yehAW7S4Y4t7+fDHwmtXSOZUh24ELmAtYH37c=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "769ebafdc66559d620bdc414743f32bb28180c58",
"rev": "21f8445ea523e83cd4f11b0a67a3a5ced2b1f56f",
"type": "github"
},
"original": {
@ -1487,15 +1573,14 @@
"blobs": "blobs",
"flake-compat": "flake-compat_5",
"git-hooks": "git-hooks_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-25_05": "nixpkgs-25_05"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1759489698,
"narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=",
"lastModified": 1762740199,
"narHash": "sha256-B8aMgLj5moqKVDlgxo29Ef2jX9SsUkAQhJalpI9MNgA=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1",
"rev": "b633223a33f6aa2a81a8f65ed056be4234bd0822",
"type": "gitlab"
},
"original": {
@ -1509,11 +1594,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1760998189,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"lastModified": 1762812535,
"narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
"type": "github"
},
"original": {
@ -1587,11 +1672,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1761311587,
"narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
"lastModified": 1762410071,
"narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
"rev": "97a30861b13c3731a84e09405414398fbf3e109f",
"type": "github"
},
"original": {
@ -1628,11 +1713,11 @@
]
},
"locked": {
"lastModified": 1760713634,
"narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
"lastModified": 1761431178,
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {
@ -1661,11 +1746,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1761622056,
"narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=",
"lastModified": 1762747449,
"narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "0728d59ff6463a502e001fb090f6eb92dbc04756",
"rev": "6338574bc5c036487486acde264f38f39ea15fad",
"type": "github"
},
"original": {
@ -1680,11 +1765,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1761859061,
"narHash": "sha256-5C2x+ZQQZAAy0LowYgacT1KG83nXxjcYKMzedx89Wtw=",
"lastModified": 1762748864,
"narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "26142b84460636c55bd612ae67225056c7faf134",
"rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3",
"type": "github"
},
"original": {
@ -1702,11 +1787,11 @@
]
},
"locked": {
"lastModified": 1761826449,
"narHash": "sha256-4cbXup+ilfZZwyPcNYhUcVsoA0qtbnAEopuPItZ2DEc=",
"lastModified": 1762735003,
"narHash": "sha256-F5mQBMc1fNZnyVzBWTB6RsSglWwpTTBekHxzPeGegD4=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "ed15dd96c4dcecc69e6c13523af38504944a3794",
"rev": "b4dc0184e0cff5094d4a746a5cd34ef30f6fdc12",
"type": "github"
},
"original": {
@ -1726,11 +1811,11 @@
]
},
"locked": {
"lastModified": 1761592723,
"narHash": "sha256-7MMLpYL/EF3wqHIt7Fl3uQJZH1Vvtvgnd24WFpnBzdQ=",
"lastModified": 1761894307,
"narHash": "sha256-crrxxlCPzJqEFEHyVHuX2PD1tX+sJBLwpjuXPBFj5TM=",
"owner": "zigtools",
"repo": "zls",
"rev": "8b2754ad49006e70cdbd29c1d57ffb0a2889b836",
"rev": "24f01e406dc211fbab71cfae25f17456962d4435",
"type": "github"
},
"original": {

6
flake.nix
View file

@ -7,6 +7,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default-linux";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
flake-parts.url = "github:hercules-ci/flake-parts";
import-tree.url = "github:vic/import-tree";
@ -40,6 +41,11 @@
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
###
# hyprland stuff
hyprland = {

4
modules/base/git.nix
View file

@ -56,8 +56,8 @@ topLevel: {
};
maintenance = {
repo = [
"home/${username}/projects/nixpkgs"
"home/${username}/projects/config"
"/home/${username}/projects/nixpkgs"
"/home/${username}/projects/config"
];
strategy = "incremental";
};

35
modules/base/system/helix.nix
View file

@ -7,7 +7,7 @@
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.system}.default;
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
environment = {
@ -19,9 +19,14 @@
};
homeManager.cholli =
{ inputs, pkgs, ... }:
{
inputs,
lib,
pkgs,
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.system}.default;
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
home.file.".config/helix/ignore".text = ''
@ -107,14 +112,25 @@
language-servers = [
"nixd"
"nil"
"harper-ls"
];
}
{
# provided by the dev environment in the rust shell
# Provided by the dev environment in the rust shell
name = "rust";
auto-format = true;
formatter.command = "cargo fmt";
language-servers = [ "rust-analyzer" ];
language-servers = [
"rust-analyzer"
"harper-ls"
];
}
{
name = "zig";
language-servers = [
"zls"
"harper-ls"
];
}
];
@ -146,6 +162,15 @@
args = [ "--stdio" ];
config.provideFormatter = true;
};
harper-ls = {
command = "${lib.getExe pkgs.harper}";
args = [ "--stdio" ];
config = {
linters = {
long_sentences = false;
};
};
};
};
};
};

4
modules/base/system/nixdaemon.nix
View file

@ -27,7 +27,7 @@
programs.nh = {
enable = true;
package = inputs.nh-flake.packages.${pkgs.system}.nh;
package = inputs.nh-flake.packages.${pkgs.stdenv.hostPlatform.system}.nh;
flake = "/home/${username}/projects/config";
};
@ -59,12 +59,14 @@
"https://nix-community.cachix.org"
"https://nixcache.christophhollizeck.dev"
"https://hyprland.cachix.org"
"https://nix-gaming.cachix.org"
];
trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"christophhollizeck.dev:7pPAvm9xqFQB8FDApVNL6Tii1Jsv+Sj/LjEIkdeGhbA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
];
}
// (lib.optionalAttrs config.programs.direnv.enable {

2
modules/desktop/addons/hyprlock.nix
View file

@ -33,7 +33,7 @@
...
}:
let
hyprlock-package = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
hyprlock-package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock;
in
{
config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {

10
modules/desktop/addons/waybar.nix
View file

@ -1,6 +1,11 @@
{
flake.modules.homeManager.cholli =
{ lib, osConfig, ... }:
{
lib,
osConfig,
pkgs,
...
}:
{
config = lib.mkIf osConfig.programs.niri.enable {
@ -39,11 +44,13 @@
};
"wireplumber" = {
"format" = " {volume}%";
"on-click" = "${lib.getExe pkgs.pavucontrol}";
"max-volume" = 100;
"scroll-step" = 5;
};
"cpu" = {
"format" = " {usage}%";
"on-click" = "${lib.getExe pkgs.kitty} ${lib.getExe pkgs.btop}";
};
"memory" = {
"interval" = 30;
@ -51,6 +58,7 @@
};
"bluetooth" = {
"format" = "";
"on-click" = "${lib.getExe pkgs.kitty} ${lib.getExe pkgs.bluetui}";
"format-disabled" = "󰂲";
"format-connected" = "󰂱";
"tooltip-format" = "{controller_alias}\t{controller_address}";

2
modules/desktop/default.nix
View file

@ -9,7 +9,7 @@
...
}:
let
zenbrowser = inputs.zen-browser.packages."${pkgs.system}".default;
zenbrowser = inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default;
in
{

8
modules/desktop/hyprland.nix
View file

@ -8,7 +8,7 @@
...
}:
let
hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
focus-1password = pkgs.writeShellScriptBin "focus-or-open-1pass" ''
running=$(hyprctl -j clients | jq -r '.[] | select(.class == "1password") | .workspace.id')
@ -64,7 +64,7 @@
hyprland = {
enable = true;
package = hyprland-package;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
withUWSM = true;
};
};
@ -124,14 +124,14 @@
...
}:
let
hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
in
{
config = lib.mkIf osConfig.programs.hyprland.enable {
wayland.windowManager.hyprland = {
enable = true;
package = hyprland-package;
plugins = [ inputs.hy3.packages.${pkgs.system}.hy3 ];
plugins = [ inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 ];
systemd.variables = [ "--all" ];
settings = {
"$mod" = "SUPER";

8
modules/desktop/niri.nix
View file

@ -6,13 +6,13 @@
programs.niri = {
enable = true;
package = inputs.niri-flake.packages.${pkgs.system}.niri-unstable;
package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
};
environment.systemPackages = with pkgs; [
kitty
inputs.niri-flake.packages.${pkgs.system}.xwayland-satellite-unstable
inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable
wl-clipboard
xsel
@ -301,7 +301,7 @@
{
matches = [
{
app-id = "1Password";
app-id = "1password";
at-startup = true;
}
];
@ -507,7 +507,7 @@
{ argv = [ "obsidian" ]; }
{ argv = [ "discord" ]; }
{ argv = [ "1password" ]; }
{ sh = "steam"; }
{ sh = "sleep 1 && steam"; }
];
};

2
modules/dev/devenv.nix
View file

@ -3,7 +3,7 @@
{ inputs, pkgs, ... }:
{
environment.systemPackages = [
inputs.devenv.packages.${pkgs.system}.devenv
inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.devenv
];
};
}

3
modules/games/steam.nix
View file

@ -4,6 +4,9 @@
{
programs.steam = {
enable = true;
package = pkgs.steam.override {
extraBwrapArgs = [ "--unsetenv TZ" ];
};
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
extraCompatPackages = with pkgs; [ proton-ge-bin ];

4
modules/games/various-games.nix
View file

@ -1,6 +1,6 @@
{
flake.modules.nixos.games =
{ pkgs, ... }:
{ inputs, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
prismlauncher
@ -8,7 +8,7 @@
# gaming tools
pyfa
path-of-building
inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building
];
};
}

5
modules/hosts/loptland/default.nix
View file

@ -34,10 +34,13 @@ in
base
server
hydra
factorio-server
forgejo
forgejo-runner
# game server
minecraft-server
factorio-server
# apps
# Users

7
modules/hosts/yggdrasil/default.nix
View file

@ -23,8 +23,9 @@ in
obsidian
diebahn
path-of-building
termscp
nixpkgs-review
# inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen
];
services.teamviewer.enable = true;
@ -53,7 +54,7 @@ in
bluetooth
amdgpu
# dektops
# desktops
# hyprland
niri
@ -86,7 +87,7 @@ in
settings.builders-use-substitutes = true;
buildMachines = [
{
hostName = "nixberry";
hostName = "192.168.178.2";
sshUser = "remotebuild";
sshKey = "/root/.ssh/remotebuild";
systems = [ "aarch64-linux" ];

25
modules/server/minecraft.nix Normal file
View file

@ -0,0 +1,25 @@
{
flake.modules.nixos.minecraft-server =
{ ... }:
{
services.minecraft-server = {
enable = true;
eula = true;
openFirewall = true; # Opens the port the server is running on (by default 25565 but in this case 43000)
declarative = true;
whitelist = {
# This is a mapping from Minecraft usernames to UUIDs. You can use https://mcuuid.net/ to get a Minecraft UUID for a username
Daholli = "9e206940-3dfc-4331-b781-b43a9905087a";
};
serverProperties = {
server-port = 43000;
difficulty = 3;
gamemode = 1;
max-players = 5;
motd = "NixOS Minecraft server!";
white-list = true;
};
jvmOpts = "-Xms2048M -Xmx4096M";
};
};
}