jopejoe1/nix-conf
1
0
Fork 0
mirror of https://codeberg.org/jopejoe1/nix-conf.git synced 2025-06-07 21:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: jopejoe1:88e4d59f0ca8d27caaf1b47aed7e909f6e5dffaf
Branches Tags
jopejoe1:main
..
compare: jopejoe1:bde12865f895f7632d8cc663f80345d6d69168d5
Branches Tags
jopejoe1:main

No commits in common. "88e4d59f0ca8d27caaf1b47aed7e909f6e5dffaf" and "bde12865f895f7632d8cc663f80345d6d69168d5" have entirely different histories.
88e4d59f0c ... bde12865f8

17 changed files with 684 additions and 748 deletions
Download patch file Download diff file Expand all files Collapse all files

182
flake.lock generated
View file

@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735644329, "lastModified": 1728330715,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -99,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736711425, "lastModified": 1732645828,
"narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1736913802, "lastModified": 1732593794,
"narHash": "sha256-72be03HWS5Q8I1W9hlWRVicZxL5MJURVKbnJGIcbjIE=", "narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "79a77a7d0b22e82d52a90055cc8206447ab85285", "rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1726153070,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1730504689,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,14 +333,18 @@
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1732021966,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736785676, "lastModified": 1732482255,
"narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +397,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1736688610, "lastModified": 1731242966,
"narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736370755, "lastModified": 1732324260,
"narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -507,11 +511,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1736643958, "lastModified": 1732410305,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +538,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1735024884, "lastModified": 1731763758,
"narHash": "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk=", "narHash": "sha256-zcoxeMRGPpOd46dLeo2bgGLkjW5w50VC5DwZlvZD+A4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "97b45ac774699b1cfd267e98a8bdecb74bace593", "rev": "80a2e7d6d9816a80fd412befd5f173836e675185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,15 +569,15 @@
}, },
"nixos-facter-modules_2": { "nixos-facter-modules_2": {
"locked": { "locked": {
"lastModified": 1736931726, "lastModified": 1732288619,
"narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=",
"owner": "nix-community", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", "rev": "862648589993a96480c2255197a28feea712f68f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"type": "github" "type": "github"
} }
@ -586,11 +590,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736730523, "lastModified": 1732496924,
"narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -601,11 +605,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736441705, "lastModified": 1732483221,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +630,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734098258, "lastModified": 1727367213,
"narHash": "sha256-3mzGstXtPqt+zWzXqesgQ2haEI6LNCFhc/uU3Bcj6Ak=", "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "231f5f6370e78d04675c9fa8199be6c3b1b85773", "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -641,48 +645,48 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1733808091, "lastModified": 1727264057,
"narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736798957, "lastModified": 1732014248,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_11": { "nixpkgs-24_05": {
"locked": { "locked": {
"lastModified": 1734083684, "lastModified": 1717144377,
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -703,11 +707,11 @@
"treefmt-nix": "treefmt-nix_4" "treefmt-nix": "treefmt-nix_4"
}, },
"locked": { "locked": {
"lastModified": 1736961674, "lastModified": 1732629460,
"narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=", "narHash": "sha256-Cr8EyxEFPbVmX6p8LsslFBjDEuVlFNPILrWlwbBNnNA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93", "rev": "8b19d154823619af7ced464185e8d13ec80a758b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -725,11 +729,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735854821, "lastModified": 1731936508,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,11 +752,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735854821, "lastModified": 1731936508,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -788,14 +792,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"lastModified": 1735230346, "lastModified": 1722877200,
"narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -837,11 +841,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736808430, "lastModified": 1732575825,
"narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -857,11 +861,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736810122, "lastModified": 1732570520,
"narHash": "sha256-29Mp0xa3jXF33Qu92hd/uPz1HZWBestpEKmgG4RyzCo=", "narHash": "sha256-ANPZf+osgErYUs27N7ItYovc0d/TJKwOpMtlpk6W9+M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "61cc2047ad1a4c52ef18d117ac8e6ccfc0e38ea5", "rev": "0ba8119cd4077eaea0f2406b8e1ec491429b8fc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -966,11 +970,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733761991, "lastModified": 1727252110,
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -987,11 +991,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154270, "lastModified": 1732292307,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "rev": "705df92694af7093dfbb27109ce16d828a79155f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1007,11 +1011,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154270, "lastModified": 1732643199,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -2,8 +2,8 @@
description = "jopejoe1 NixOS configuration"; description = "jopejoe1 NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-facter-modules.url = "github:nix-community/nixos-facter-modules"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
# Outputs # Outputs
nixos-generators = { nixos-generators = {

2
home-modules/git/default.nix
View file

@ -18,7 +18,7 @@ in
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.git; package = pkgs.git;
userEmail = "jopejoe1@missing.ninja"; userEmail = "johannes@joens.email";
userName = "jopejoe1"; userName = "jopejoe1";
extraConfig = { extraConfig = {
core = { core = {

2
nixos-modules/boot/systemd/default.nix
View file

@ -13,7 +13,7 @@ in
loader = { loader = {
systemd-boot = { systemd-boot = {
enable = true; enable = true;
configurationLimit = 5; configurationLimit = 10;
editor = false; editor = false;
}; };
efi = { efi = {

3
nixos-modules/printing/default.nix
View file

@ -17,7 +17,7 @@ in
services.printing = { services.printing = {
enable = true; enable = true;
webInterface = true; webInterface = true;
drivers = with pkgs; [ hplip ]; drivers = with pkgs; [ ];
}; };
hardware = { hardware = {
@ -30,7 +30,6 @@ in
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns4 = true; nssmdns4 = true;
nssmdns6 = true;
openFirewall = true; openFirewall = true;
}; };
}; };

4
nixos-modules/sops/default.nix
View file

@ -11,9 +11,7 @@ let
in in
{ {
options.jopejoe1.sops = { options.jopejoe1.sops = {
enable = (lib.mkEnableOption "Enable sops") // { enable = (lib.mkEnableOption "Enable sops") // { default = true;};
default = true;
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

2
nixos-modules/users/jopejoe1/default.nix
View file

@ -18,7 +18,7 @@ in
users.users.jopejoe1 = { users.users.jopejoe1 = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.nushell; shell = pkgs.nushell;
description = "jopejoe1"; description = "Johannes Jöns";
hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC"; hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
extraGroups = [ extraGroups = [
"wheel" "wheel"

4
systems/benzaiten/default.nix
View file

@ -10,8 +10,8 @@
./hardware-configuration.nix ./hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
#nixos-hardware.nixosModules.common-gpu-nvidia #nixos-hardware.nixosModules.common-gpu-nvidia
#nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
#nixos-hardware.nixosModules.common-pc-laptop-hdd nixos-hardware.nixosModules.common-pc-laptop-hdd
]; ];
facter.reportPath = ./facter.json; facter.reportPath = ./facter.json;

65
systems/hetzner/default.nix
View file

@ -6,9 +6,6 @@
... ...
}: }:
let
network_interface_name = (lib.elemAt config.facter.report.hardware.network_interface 0).unix_device_name;
in
{ {
imports = [ imports = [
@ -43,36 +40,10 @@ in
}; };
}; };
networking = { networking.firewall = {
firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [ 21 80 ];
21 allowedUDPPorts = [ 21 80 ];
80
];
allowedUDPPorts = [
21
80
];
};
bridges.br0.interfaces = [
network_interface_name
];
useDHCP = false;
interfaces."br0" = {
useDHCP = true;
ipv4.addresses = [
{
address = "192.168.100.3";
prefixLength = 24;
}
];
};
defaultGateway = {
address = "192.168.100.1";
interface = network_interface_name;
};
nameservers = [ "192.168.100.1" ];
}; };
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64"; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64";
@ -95,36 +66,6 @@ in
chrootlocalUser = true; chrootlocalUser = true;
}; };
services.akkoma = {
enable = true;
package = pkgs.akkoma.overrideAttrs (finalAttrs: previousAttrs: {
patches = [
(pkgs.fetchpatch2 {
url = "https://akkoma.dev/AkkomaGang/akkoma/pulls/846.patch";
hash = "sha256-KTv7YKzSAzLqBnG22EIbIiX4B5D4WUYT9FzZCb4CYrU=";
})
];
});
nginx = {
enableACME = true;
forceSSL = true;
};
config = {
":pleroma" = {
":instance" = {
name = "Nyan Social";
description = "More detailed description";
email = "admin@nyan.social";
registration_open = false;
};
"Pleroma.Web.Endpoint" = {
url.host = "nyan.social";
};
"Pleroma.Upload".base_url = "https://nyan.social/media/";
};
};
};
users.users.backupftp = { users.users.backupftp = {
isNormalUser = true; isNormalUser = true;
initialPassword = "backupPassword"; initialPassword = "backupPassword";

6
systems/hetzner/mail.nix
View file

@ -25,9 +25,6 @@
"net0loggy.de" "net0loggy.de"
"dtg-c.de" "dtg-c.de"
"joens.email" "joens.email"
"nyan.social"
"miau.social"
"pumkin.social"
]; ];
# A list of all login accounts. To create the password hashes, use # A list of all login accounts. To create the password hashes, use
@ -51,9 +48,6 @@
"@net0loggy.de" "@net0loggy.de"
"@dtg-c.de" "@dtg-c.de"
"@joens.email" "@joens.email"
"@nyan.social"
"@miau.social"
"@pumpkin.social"
]; ];
}; };
}; };

26
systems/hetzner/nginx.nix
View file

@ -58,8 +58,7 @@
"cache.missing.ninja" = { "cache.missing.ninja" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/".proxyPass = locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
"http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
}; };
"nix.missing.ninja" = { "nix.missing.ninja" = {
forceSSL = true; forceSSL = true;
@ -72,6 +71,15 @@
specialArgs.modulesPath = pkgs.path + "/nixos/modules"; specialArgs.modulesPath = pkgs.path + "/nixos/modules";
urlPrefix = "https://github.com/nix-community/disko/blob/master/"; urlPrefix = "https://github.com/nix-community/disko/blob/master/";
} }
{
modules = lib.attrValues self.inputs.nixos-hardware.nixosModules;
name = "NixOS Hardware";
specialArgs = {
modulesPath = pkgs.path + "/nixos/modules";
inherit pkgs;
};
urlPrefix = "https://github.com/NixOS/nixos-hardware/blob/master/";
}
{ {
modules = [ modules = [
self.inputs.snm.nixosModules.default self.inputs.snm.nixosModules.default
@ -90,29 +98,23 @@
urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/"; urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/";
} }
{ {
optionsJSON = optionsJSON = (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json;
(import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json;
name = "NixOS"; name = "NixOS";
urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/"; urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/";
} }
{ {
optionsJSON = optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + /share/doc/nixos/options.json;
self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos
+ /share/doc/nixos/options.json;
name = "Home Manager NixOS"; name = "Home Manager NixOS";
urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/";
} }
{ {
optionsJSON = optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + /share/doc/home-manager/options.json;
self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json
+ /share/doc/home-manager/options.json;
optionsPrefix = "home-manager.users.<name>"; optionsPrefix = "home-manager.users.<name>";
name = "Home Manager"; name = "Home Manager";
urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/";
} }
{ {
optionsJSON = optionsJSON = self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json;
self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json;
optionsPrefix = "programs.nixvim"; optionsPrefix = "programs.nixvim";
name = "NixVim"; name = "NixVim";
urlPrefix = "https://github.com/nix-community/nixvim/tree/main/"; urlPrefix = "https://github.com/nix-community/nixvim/tree/main/";

17
systems/kuraokami/default.nix
View file

@ -50,22 +50,15 @@
networking = { networking = {
hostId = "16c22faf"; hostId = "16c22faf";
firewall = {
allowedTCPPorts = [ 8080 ];
allowedUDPPorts = [ 8080 ];
};
}; };
services = { services = {
hardware.openrgb = { hardware.openrgb = {
enable = true; enable = true;
}; };
zerotierone.joinNetworks = [
"d5e5fb653774ee43"
];
postgresql = { postgresql = {
enable = true; enable = true;
extensions = ps: with ps; [ pg_libversion ]; extraPlugins = ps: with ps; [ pg_libversion ];
enableTCPIP = true; enableTCPIP = true;
initialScript = pkgs.writeText "backend-initScript" '' initialScript = pkgs.writeText "backend-initScript" ''
CREATE DATABASE repology CREATE DATABASE repology
@ -84,10 +77,6 @@
openFirewall = true; openFirewall = true;
secretKeyFile = "/var/cache-priv-key.pem"; secretKeyFile = "/var/cache-priv-key.pem";
}; };
shairport-sync = {
enable = true;
package = pkgs.shairport-sync-airplay2;
};
}; };
nixpkgs = { nixpkgs = {
@ -116,11 +105,11 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
prismlauncher prismlauncher
picard picard
#mixxx mixxx
goverlay goverlay
strawberry-qt6 strawberry-qt6
jitsi-meet-electron
thunderbird thunderbird
gh
(ffmpeg-full.override { (ffmpeg-full.override {
#withTensorflow = true; #withTensorflow = true;
withUnfree = true; withUnfree = true;

13
systems/omoikane/default.nix
View file

@ -65,10 +65,6 @@
udev.packages = [ pkgs.yubikey-personalization ]; udev.packages = [ pkgs.yubikey-personalization ];
fwupd.enable = true; fwupd.enable = true;
libinput.enable = true; libinput.enable = true;
#repology.enable = true;
zerotierone.joinNetworks = [
"d5e5fb653774ee43"
];
}; };
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -83,6 +79,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
prismlauncher prismlauncher
goverlay
thunderbird thunderbird
strawberry-qt6 strawberry-qt6
picard picard
@ -109,16 +106,14 @@
"nixos-test" "nixos-test"
]; ];
networking.firewall = {
allowedTCPPorts = [ 8080 ];
allowedUDPPorts = [ 8080 ];
};
boot.binfmt.emulatedSystems = [ boot.binfmt.emulatedSystems = [
"riscv64-linux" "riscv64-linux"
"aarch64-linux" "aarch64-linux"
"armv6l-linux" "armv6l-linux"
]; ];
boot.plymouth = {
enable = true;
};
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
programs.captive-browser = { programs.captive-browser = {

2
systems/omoikane/disk.nix
View file

@ -1,4 +1,4 @@
{ ... }: {...}:
{ {
disko.devices = { disko.devices = {
disk = { disk = {

1088
systems/omoikane/facter.json
View file

File diff suppressed because it is too large Load diff

2
systems/omoikane/hardware.nix
View file

@ -12,7 +12,7 @@
fileSystems."/home/jopejoe1/Public/games" = { fileSystems."/home/jopejoe1/Public/games" = {
device = "/dev/sda"; device = "/dev/sda";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "compression=zstd" "nofail" ]; options = [ "compression=zstd" ];
}; };
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";

6
systems/zap/wp-test.nix
View file

@ -121,9 +121,11 @@
if ! test -e "${hostStateDir}/secret-keys.php"; then if ! test -e "${hostStateDir}/secret-keys.php"; then
umask 0177 umask 0177
echo "<?php" >> "${hostStateDir}/secret-keys.php" echo "<?php" >> "${hostStateDir}/secret-keys.php"
${lib.concatMapStringsSep "\n" (var: '' ${
lib.concatMapStringsSep "\n" (var: ''
echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php" echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php"
'') secretsVars} '') secretsVars
}
echo "?>" >> "${hostStateDir}/secret-keys.php" echo "?>" >> "${hostStateDir}/secret-keys.php"
chmod 440 "${hostStateDir}/secret-keys.php" chmod 440 "${hostStateDir}/secret-keys.php"
fi fi