Compare commits
6 commits
main
...
add-server
| Author | SHA1 | Date | |
|---|---|---|---|
b761f7218b
|
|||
|
c58816d17a
|
|||
|
006daa6ebc
|
|||
|
6c75a3644f
|
|||
|
d472424a4e
|
|||
|
43e754db72
|
41 changed files with 209 additions and 856 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
# ❄️ flocon
|
# ❄️ nix
|
||||||
|
|
||||||
My NixOS configurations, using flakes.
|
My NixOS configurations, using flakes.
|
||||||
|
|
||||||
|
|
@ -20,7 +20,6 @@ Additionally using a lot of other software you can find in the configuration fil
|
||||||
| [hosts](hosts/) | Host-specific |
|
| [hosts](hosts/) | Host-specific |
|
||||||
| [lib](lib/) | Helper functions |
|
| [lib](lib/) | Helper functions |
|
||||||
| [modules](modules/) | NixOS modules |
|
| [modules](modules/) | NixOS modules |
|
||||||
| [pkgs](pkgs/) | Custom packages |
|
|
||||||
| [system](system/) | NixOS configuration |
|
| [system](system/) | NixOS configuration |
|
||||||
|
|
||||||
My configuration is structured based on the following principles:
|
My configuration is structured based on the following principles:
|
||||||
|
|
|
||||||
285
flake.lock
285
flake.lock
|
|
@ -1,32 +1,9 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"agenix": {
|
|
||||||
"inputs": {
|
|
||||||
"darwin": "darwin",
|
|
||||||
"home-manager": "home-manager",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1723293904,
|
|
||||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
|
||||||
"owner": "ryantm",
|
|
||||||
"repo": "agenix",
|
|
||||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ryantm",
|
|
||||||
"repo": "agenix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ags": {
|
"ags": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"systems": "systems_2"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728326430,
|
"lastModified": 1728326430,
|
||||||
|
|
@ -83,28 +60,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"darwin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"agenix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1700795494,
|
|
||||||
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
|
||||||
"owner": "lnl7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lnl7",
|
|
||||||
"ref": "master",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"deploy-rs": {
|
"deploy-rs": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
|
|
@ -134,11 +89,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1730865784,
|
"lastModified": 1729491205,
|
||||||
"narHash": "sha256-6kJYNjVCyf1tYgpqm7QOYcMkkD/RsaSfrsC2+ojmFAI=",
|
"narHash": "sha256-luvUK8ZTRTdsVao7VqnxvGEvA3rjEmfiwakDyHxQhx8=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "b8d22442e09a02eb8b830d41726ac371be21b7cd",
|
"rev": "9764579885c84ba5d4bcd9d3061409a527ff805c",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -240,11 +195,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730504689,
|
"lastModified": 1727826117,
|
||||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -288,7 +243,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -306,7 +261,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -324,14 +279,14 @@
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_8"
|
"systems": "systems_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -399,36 +354,15 @@
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"agenix",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703113217,
|
"lastModified": 1729459288,
|
||||||
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730837930,
|
|
||||||
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -555,11 +489,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730875971,
|
"lastModified": 1729499378,
|
||||||
"narHash": "sha256-VpTY0Urm0tebIndEP3qCsfAEjh8IB0d9j7XRZkNLRrw=",
|
"narHash": "sha256-gslhStBw58+LAbcver/2/Q6zjPq9xNZQ/IcoIh7OBck=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "563b10c27839d0b08353d4cd3563e0f9beb3468d",
|
"rev": "2e46e95f0e5be7cea740163d87edf628e755cc3e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -588,11 +522,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730871742,
|
"lastModified": 1729444736,
|
||||||
"narHash": "sha256-wK7UD90LxLr8oELIYPhUS6+IPU32JGESaHd/tny5/ig=",
|
"narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "8867a4f84c4bd07235abd37828b0d724321facbe",
|
"rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -608,11 +542,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730604744,
|
"lastModified": 1729394935,
|
||||||
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
|
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
|
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -623,11 +557,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730886862,
|
"lastModified": 1729509737,
|
||||||
"narHash": "sha256-wCZtRGM1NGxq6VG4+TMzfsa4cuG2VJVtowtYuWW5W3g=",
|
"narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "90642a0deae927fa911d49d4f7c5616257105141",
|
"rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -666,14 +600,14 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_2": {
|
"nixpkgs-lib_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730504152,
|
"lastModified": 1727825735,
|
||||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_3": {
|
"nixpkgs-lib_3": {
|
||||||
|
|
@ -706,11 +640,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730741070,
|
"lastModified": 1729307008,
|
||||||
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -754,11 +688,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730785428,
|
"lastModified": 1729256560,
|
||||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -770,11 +704,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730785428,
|
"lastModified": 1729256560,
|
||||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -817,22 +751,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1711404521,
|
|
||||||
"narHash": "sha256-cYhDZ3RYLiXAi4LQDGuQjjDDbtP00Wd/Vjal/jWyTuA=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_9": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726871744,
|
"lastModified": 1726871744,
|
||||||
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
||||||
|
|
@ -974,14 +892,14 @@
|
||||||
"plugin-vim-vsnip": "plugin-vim-vsnip",
|
"plugin-vim-vsnip": "plugin-vim-vsnip",
|
||||||
"plugin-which-key": "plugin-which-key",
|
"plugin-which-key": "plugin-which-key",
|
||||||
"rnix-lsp": "rnix-lsp",
|
"rnix-lsp": "rnix-lsp",
|
||||||
"systems": "systems_6"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730289819,
|
"lastModified": 1728378979,
|
||||||
"narHash": "sha256-GYEgdCLzNODbMNEeYbMa5EWgEwTEMxdSSPTz8uEwZdQ=",
|
"narHash": "sha256-CW/5Cs9m8HupL+6iRMpdHE88OmK9MXH2h3BcXCQw440=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "8ff50562d7203a2b87bc6409e806f13b115d6b48",
|
"rev": "0947ab38c0bc79780eec599161306157b8de74a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1000,11 +918,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730635861,
|
"lastModified": 1729372184,
|
||||||
"narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=",
|
"narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "293668587937daae1df085ee36d2b2d0792b7a0f",
|
"rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2630,24 +2548,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"portfolio": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_8"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730891412,
|
|
||||||
"narHash": "sha256-EEXp1jQMoA7off1ioqB5aJM1a5ZfGS6KQVsYSZ/ub78=",
|
|
||||||
"owner": "nezia1",
|
|
||||||
"repo": "portfolio",
|
|
||||||
"rev": "082cc68c67deead967bf177d048995c6a27ef84e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nezia1",
|
|
||||||
"repo": "portfolio",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre-commit-hooks-nix": {
|
"pre-commit-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
|
|
@ -2697,12 +2597,11 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
|
||||||
"ags": "ags",
|
"ags": "ags",
|
||||||
"basix": "basix",
|
"basix": "basix",
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
"firefox-addons": "firefox-addons",
|
"firefox-addons": "firefox-addons",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nix-index-db": "nix-index-db",
|
"nix-index-db": "nix-index-db",
|
||||||
|
|
@ -2710,8 +2609,7 @@
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nvf": "nvf",
|
"nvf": "nvf",
|
||||||
"plasma-manager": "plasma-manager",
|
"plasma-manager": "plasma-manager",
|
||||||
"portfolio": "portfolio",
|
"systems": "systems_6",
|
||||||
"systems": "systems_7",
|
|
||||||
"treefmt-nix": "treefmt-nix",
|
"treefmt-nix": "treefmt-nix",
|
||||||
"wezterm": "wezterm"
|
"wezterm": "wezterm"
|
||||||
}
|
}
|
||||||
|
|
@ -2776,11 +2674,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729477859,
|
"lastModified": 1726280639,
|
||||||
"narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
|
"narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
|
"rev": "e9f8641c92f26fd1e076e705edb12147c384171d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2790,21 +2688,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
|
|
@ -2819,6 +2702,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"systems_3": {
|
"systems_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
|
@ -2865,21 +2763,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_6": {
|
"systems_6": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_7": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
|
|
@ -2894,7 +2777,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_8": {
|
"systems_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
|
@ -2911,14 +2794,14 @@
|
||||||
},
|
},
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_9"
|
"nixpkgs": "nixpkgs_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730321837,
|
"lastModified": 1729242555,
|
||||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
"narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
"rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2929,7 +2812,7 @@
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701680307,
|
"lastModified": 1701680307,
|
||||||
|
|
@ -2974,11 +2857,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "nix",
|
"dir": "nix",
|
||||||
"lastModified": 1730734444,
|
"lastModified": 1729006311,
|
||||||
"narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=",
|
"narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=",
|
||||||
"owner": "wez",
|
"owner": "wez",
|
||||||
"repo": "wezterm",
|
"repo": "wezterm",
|
||||||
"rev": "51c794ac500a2033b9dc570c71810518bfa667a9",
|
"rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2992,16 +2875,16 @@
|
||||||
"xwayland-satellite-stable": {
|
"xwayland-satellite-stable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730166465,
|
"lastModified": 1718165778,
|
||||||
"narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
|
"narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
|
"rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"ref": "v0.5",
|
"ref": "v0.4",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -3009,11 +2892,11 @@
|
||||||
"xwayland-satellite-unstable": {
|
"xwayland-satellite-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730258684,
|
"lastModified": 1729139001,
|
||||||
"narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=",
|
"narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58",
|
"rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
19
flake.nix
19
flake.nix
|
|
@ -5,8 +5,6 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
systems,
|
systems,
|
||||||
agenix,
|
|
||||||
deploy-rs,
|
|
||||||
treefmt-nix,
|
treefmt-nix,
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
|
|
@ -18,18 +16,12 @@
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.alejandra
|
pkgs.alejandra
|
||||||
pkgs.git
|
pkgs.git
|
||||||
deploy-rs.packages.${pkgs.system}.default
|
|
||||||
agenix.packages.${pkgs.system}.default
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
|
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
|
||||||
nixosModules = import ./modules;
|
nixosModules = import ./modules;
|
||||||
nixosConfigurations = let
|
nixosConfigurations = import ./hosts {inherit self inputs;};
|
||||||
lib' = import ./lib {inherit inputs lib';};
|
|
||||||
in
|
|
||||||
import ./hosts {inherit inputs lib';};
|
|
||||||
packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
|
|
||||||
deploy.nodes = import ./nodes {inherit self inputs;};
|
deploy.nodes = import ./nodes {inherit self inputs;};
|
||||||
};
|
};
|
||||||
inputs = {
|
inputs = {
|
||||||
|
|
@ -51,10 +43,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# other
|
# other
|
||||||
agenix = {
|
|
||||||
url = "github:ryantm/agenix";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
ags.url = "github:Aylur/ags";
|
ags.url = "github:Aylur/ags";
|
||||||
basix.url = "github:notashelf/basix";
|
basix.url = "github:notashelf/basix";
|
||||||
deploy-rs.url = "github:serokell/deploy-rs";
|
deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
|
|
@ -62,11 +50,8 @@
|
||||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
niri.url = "github:sodiboo/niri-flake";
|
niri = {url = "github:sodiboo/niri-flake";};
|
||||||
nvf.url = "github:notashelf/nvf";
|
nvf.url = "github:notashelf/nvf";
|
||||||
|
|
||||||
portfolio.url = "github:nezia1/portfolio";
|
|
||||||
|
|
||||||
plasma-manager = {
|
plasma-manager = {
|
||||||
url = "github:nix-community/plasma-manager";
|
url = "github:nix-community/plasma-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,7 @@
|
||||||
in {
|
in {
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
policies = {
|
||||||
extraPolicies = {
|
|
||||||
DisableTelemetry = true;
|
DisableTelemetry = true;
|
||||||
DisablePocket = true;
|
DisablePocket = true;
|
||||||
DisableFeedbackCommands = true;
|
DisableFeedbackCommands = true;
|
||||||
|
|
@ -21,9 +20,9 @@ in {
|
||||||
OfferToSaveLogins = false;
|
OfferToSaveLogins = false;
|
||||||
OffertosaveloginsDefault = false;
|
OffertosaveloginsDefault = false;
|
||||||
PasswordManagerEnabled = false;
|
PasswordManagerEnabled = false;
|
||||||
SearchSuggestEnabled = true;
|
|
||||||
|
|
||||||
# https://github.com/Sly-Harvey/NixOS/blob/f9da2691ea46565256ad757959cfc26ec6cee10d/modules/programs/browser/firefox/default.nix#L58-L163
|
# https://github.com/Sly-Harvey/NixOS/blob/f9da2691ea46565256ad757959cfc26ec6cee10d/modules/programs/browser/firefox/default.nix#L58-L163
|
||||||
|
# TODO: declare which block lists are needed
|
||||||
"3rdparty".Extensions = {
|
"3rdparty".Extensions = {
|
||||||
"addon@darkreader.org" = {
|
"addon@darkreader.org" = {
|
||||||
permissions = ["internal:privateBrowsingAllowed"];
|
permissions = ["internal:privateBrowsingAllowed"];
|
||||||
|
|
@ -53,40 +52,6 @@ in {
|
||||||
uiTheme = "dark";
|
uiTheme = "dark";
|
||||||
advancedUserEnabled = true;
|
advancedUserEnabled = true;
|
||||||
userFiltersTrusted = true;
|
userFiltersTrusted = true;
|
||||||
importedLists = [
|
|
||||||
"https://raw.githubusercontent.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/main/list.txt"
|
|
||||||
];
|
|
||||||
selectedFilterLists = [
|
|
||||||
"FRA-0"
|
|
||||||
"adguard-cookies"
|
|
||||||
"adguard-mobile-app-banners"
|
|
||||||
"adguard-other-annoyances"
|
|
||||||
"adguard-popup-overlays"
|
|
||||||
"adguard-social"
|
|
||||||
"adguard-spyware-url"
|
|
||||||
"adguard-widgets"
|
|
||||||
"easylist"
|
|
||||||
"easylist-annoyances"
|
|
||||||
"easylist-chat"
|
|
||||||
"easylist-newsletters"
|
|
||||||
"easylist-notifications"
|
|
||||||
"easyprivacy"
|
|
||||||
"fanboy-cookiemonster"
|
|
||||||
"https://filters.adtidy.org/extension/ublock/filters/3.txt"
|
|
||||||
"https://github.com/DandelionSprout/adfilt/raw/master/LegitimateURLShortener.txt"
|
|
||||||
"plowe-0"
|
|
||||||
"ublock-annoyances"
|
|
||||||
"ublock-badware"
|
|
||||||
"ublock-cookies-adguard"
|
|
||||||
"ublock-cookies-easylist"
|
|
||||||
"ublock-filters"
|
|
||||||
"ublock-privacy"
|
|
||||||
"ublock-quick-fixes"
|
|
||||||
"ublock-unbreak"
|
|
||||||
"urlhaus-1"
|
|
||||||
"https://raw.githubusercontent.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/main/list.txt"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -107,6 +72,7 @@ in {
|
||||||
ublock-origin
|
ublock-origin
|
||||||
violentmonkey
|
violentmonkey
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://git.jacekpoz.pl/poz/niksos/src/commit/a48647a1c5bc6877a1100a65f4dc169b2fc11ed7/hosts/hape/firefox.nix
|
# https://git.jacekpoz.pl/poz/niksos/src/commit/a48647a1c5bc6877a1100a65f4dc169b2fc11ed7/hosts/hape/firefox.nix
|
||||||
search = {
|
search = {
|
||||||
default = "SearxNG";
|
default = "SearxNG";
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,5 @@
|
||||||
nautilus
|
nautilus
|
||||||
simple-scan
|
simple-scan
|
||||||
entr
|
entr
|
||||||
# inputs.self.packages.${pkgs.system}.mcuxpresso.ide
|
|
||||||
# dfu-util
|
|
||||||
# segger-jlink
|
|
||||||
# inputs.self.packages.${pkgs.system}.mcuxpresso.config-tools
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
inherit (lib) getExe;
|
||||||
|
in {
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -60,10 +60,6 @@
|
||||||
|
|
||||||
git.enable = true;
|
git.enable = true;
|
||||||
|
|
||||||
utility = {
|
|
||||||
vim-wakatime.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
lsp = {
|
lsp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,15 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
pkgs,
|
home.packages = with pkgs; [
|
||||||
inputs,
|
bottles
|
||||||
...
|
lutris
|
||||||
}: {
|
mangohud
|
||||||
home.packages = [
|
path-of-building
|
||||||
pkgs.bottles
|
protonplus
|
||||||
pkgs.lutris
|
r2modman
|
||||||
pkgs.mangohud
|
|
||||||
pkgs.path-of-building
|
|
||||||
pkgs.protonplus
|
|
||||||
pkgs.r2modman
|
|
||||||
|
|
||||||
# steamtinkerlaunch dependencies
|
# steamtinkerlaunch dependencies
|
||||||
pkgs.xdotool
|
xdotool
|
||||||
pkgs.xorg.xwininfo
|
xorg.xwininfo
|
||||||
pkgs.yad
|
yad
|
||||||
|
|
||||||
inputs.self.packages.${pkgs.system}.bolt-launcher
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
_: {
|
||||||
services.udiskie.enable = true;
|
services.udiskie.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
lib,
|
||||||
config,
|
config,
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
programs.wezterm = {
|
programs.wezterm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# package = inputs.wezterm.packages.${pkgs.system}.default;
|
# package = inputs.wezterm.packages.${pkgs.system}.default;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
programs = {
|
programs = {
|
||||||
direnv = {
|
direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
programs.zellij = {
|
programs.zellij = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,6 @@
|
||||||
name = "fzf";
|
name = "fzf";
|
||||||
inherit (pkgs.fishPlugins.fzf) src;
|
inherit (pkgs.fishPlugins.fzf) src;
|
||||||
}
|
}
|
||||||
{
|
|
||||||
name = "autopair";
|
|
||||||
inherit (pkgs.fishPlugins.autopair) src;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableTransience = true;
|
enableTransience = true;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
programs.zoxide = {
|
programs.zoxide = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = false;
|
enableBashIntegration = false;
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,12 @@
|
||||||
{
|
{self, ...}: let
|
||||||
self,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
mod = "${self}/system";
|
mod = "${self}/system";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./networking.nix # generated at runtime by nixos-infect
|
./networking.nix # generated at runtime by nixos-infect
|
||||||
|
|
||||||
inputs.agenix.nixosModules.default
|
|
||||||
|
|
||||||
"${mod}/services/forgejo.nix"
|
"${mod}/services/forgejo.nix"
|
||||||
"${mod}/services/searx.nix"
|
"${mod}/services/searx.nix"
|
||||||
"${mod}/services/portfolio.nix"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.tmp.cleanOnBoot = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
|
|
@ -21,9 +14,6 @@ in {
|
||||||
networking.hostName = "anastacia";
|
networking.hostName = "anastacia";
|
||||||
networking.domain = "";
|
networking.domain = "";
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzs7SQH0Vjt9JHoXXmWy9fPU1I3rrRWV5magZFrI5al''];
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzs7SQH0Vjt9JHoXXmWy9fPU1I3rrRWV5magZFrI5al"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHKEPlN/GU9nJZPleA77HH5NA+6vyhhM84fTSjEwnEgq"
|
|
||||||
];
|
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
{modulesPath, ...}: {
|
{modulesPath, ...}: {
|
||||||
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
||||||
boot = {
|
boot.loader.grub.device = "/dev/sda";
|
||||||
loader.grub.device = "/dev/sda";
|
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
|
||||||
initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
|
boot.initrd.kernelModules = ["nvme"];
|
||||||
initrd.kernelModules = ["nvme"];
|
|
||||||
};
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/sda1";
|
device = "/dev/sda1";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,37 @@
|
||||||
{
|
{
|
||||||
|
self,
|
||||||
inputs,
|
inputs,
|
||||||
lib',
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib') mkSystem;
|
inherit (inputs.nixpkgs.lib) nixosSystem;
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs self;
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
vamos = mkSystem {
|
vamos = nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
inherit specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./vamos
|
./vamos
|
||||||
|
|
||||||
inputs.self.nixosModules.theme
|
self.nixosModules.theme
|
||||||
|
|
||||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
solaire = mkSystem {
|
solaire = nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
inherit specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./solaire
|
./solaire
|
||||||
inputs.self.nixosModules.theme
|
self.nixosModules.theme
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
anastacia = mkSystem {
|
anastacia = nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
inherit specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./anastacia
|
./anastacia
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,28 @@
|
||||||
{specialArgs, ...}: let
|
{
|
||||||
system = ../../system;
|
self,
|
||||||
home = ../../home;
|
specialArgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
mod = "${self}/system";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./modules
|
./modules
|
||||||
|
|
||||||
system
|
"${mod}"
|
||||||
"${system}/hardware/uni-sync.nix"
|
"${mod}/hardware/uni-sync.nix"
|
||||||
|
|
||||||
"${system}/programs/gnome.nix"
|
"${mod}/programs/gnome.nix"
|
||||||
"${system}/programs/games.nix"
|
"${mod}/programs/games.nix"
|
||||||
"${system}/hardware/nvidia.nix"
|
"${mod}/hardware/nvidia.nix"
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
users.nezia.imports = [
|
users.nezia.imports = [
|
||||||
home
|
"${self}/home"
|
||||||
"${home}/programs/games"
|
"${self}/home/programs/games"
|
||||||
|
|
||||||
"${home}/terminal/emulators/foot.nix"
|
"${self}/home/terminal/emulators/foot.nix"
|
||||||
];
|
];
|
||||||
extraSpecialArgs = specialArgs;
|
extraSpecialArgs = specialArgs;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@ in {
|
||||||
"${mod}/hardware/fprintd.nix"
|
"${mod}/hardware/fprintd.nix"
|
||||||
"${mod}/services/power.nix"
|
"${mod}/services/power.nix"
|
||||||
"${mod}/services/brightness.nix"
|
"${mod}/services/brightness.nix"
|
||||||
|
"${mod}/services/keyd.nix"
|
||||||
|
|
||||||
"${mod}/services/logind.nix"
|
"${mod}/services/logind.nix"
|
||||||
"${mod}/services/greetd.nix"
|
"${mod}/services/greetd.nix"
|
||||||
"${mod}/services/kanata.nix"
|
|
||||||
|
|
||||||
"${mod}/programs/niri"
|
"${mod}/programs/niri"
|
||||||
"${mod}/services/gnome.nix"
|
"${mod}/services/gnome.nix"
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
{
|
{
|
||||||
inputs,
|
pkgs,
|
||||||
lib',
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (inputs.nixpkgs) lib;
|
|
||||||
# convert rrggbb hex to rgba(r, g, b, a)
|
# convert rrggbb hex to rgba(r, g, b, a)
|
||||||
rgba = c: let
|
rgba = c: let
|
||||||
r = toString (hexToDec (builtins.substring 0 2 c));
|
r = toString (hexToDec (builtins.substring 0 2 c));
|
||||||
|
|
@ -87,25 +86,8 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# Create a KDE konsole color scheme from base16 colors
|
# Create a KDE konsole color scheme from base16 colors
|
||||||
mkKonsoleColorScheme = pkgs: scheme:
|
mkKonsoleColorScheme = scheme:
|
||||||
pkgs.writeText "${scheme.name}.colorscheme" (schemeToKonsole scheme);
|
pkgs.writeText "${scheme.name}.colorscheme" (schemeToKonsole scheme);
|
||||||
|
|
||||||
# https://github.com/diniamo/niqs/blob/caf396bb470619fa06936a379eec6e283c3c3d95/lib/default.nix#L13-L35C7
|
|
||||||
mkSystem = {system, ...} @ args:
|
|
||||||
lib.nixosSystem {
|
|
||||||
system = null;
|
|
||||||
specialArgs = {inherit inputs;};
|
|
||||||
modules =
|
|
||||||
[
|
|
||||||
{
|
|
||||||
_module.args = {
|
|
||||||
inherit system lib';
|
|
||||||
};
|
|
||||||
nixpkgs = {inherit system;};
|
|
||||||
}
|
|
||||||
]
|
|
||||||
++ args.modules or [];
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
inherit mkKonsoleColorScheme rgba mkSystem;
|
inherit mkKonsoleColorScheme rgba;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,208 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
fetchFromGitHub,
|
|
||||||
makeWrapper,
|
|
||||||
cmake,
|
|
||||||
ninja,
|
|
||||||
libarchive,
|
|
||||||
libz,
|
|
||||||
jdk17,
|
|
||||||
libcef,
|
|
||||||
luajit,
|
|
||||||
xorg,
|
|
||||||
mesa,
|
|
||||||
glib,
|
|
||||||
nss,
|
|
||||||
nspr,
|
|
||||||
atk,
|
|
||||||
at-spi2-atk,
|
|
||||||
libdrm,
|
|
||||||
expat,
|
|
||||||
libxkbcommon,
|
|
||||||
gtk3,
|
|
||||||
pango,
|
|
||||||
cairo,
|
|
||||||
alsa-lib,
|
|
||||||
dbus,
|
|
||||||
at-spi2-core,
|
|
||||||
cups,
|
|
||||||
systemd,
|
|
||||||
buildFHSEnv,
|
|
||||||
copyDesktopItems,
|
|
||||||
makeDesktopItem,
|
|
||||||
}: let
|
|
||||||
cef = libcef.overrideAttrs (_: {
|
|
||||||
installPhase = let
|
|
||||||
gl_rpath = lib.makeLibraryPath [
|
|
||||||
stdenv.cc.cc.lib
|
|
||||||
];
|
|
||||||
rpath = lib.makeLibraryPath [
|
|
||||||
glib
|
|
||||||
nss
|
|
||||||
nspr
|
|
||||||
atk
|
|
||||||
at-spi2-atk
|
|
||||||
libdrm
|
|
||||||
expat
|
|
||||||
xorg.libxcb
|
|
||||||
libxkbcommon
|
|
||||||
xorg.libX11
|
|
||||||
xorg.libXcomposite
|
|
||||||
xorg.libXdamage
|
|
||||||
xorg.libXext
|
|
||||||
xorg.libXfixes
|
|
||||||
xorg.libXrandr
|
|
||||||
mesa
|
|
||||||
gtk3
|
|
||||||
pango
|
|
||||||
cairo
|
|
||||||
alsa-lib
|
|
||||||
dbus
|
|
||||||
at-spi2-core
|
|
||||||
cups
|
|
||||||
xorg.libxshmfence
|
|
||||||
systemd
|
|
||||||
];
|
|
||||||
in ''
|
|
||||||
mkdir -p $out/lib/ $out/share/cef/
|
|
||||||
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
|
|
||||||
cp -r ../Resources/* $out/lib/
|
|
||||||
cp -r ../Release/* $out/lib/
|
|
||||||
patchelf --set-rpath "${rpath}" $out/lib/libcef.so
|
|
||||||
patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so
|
|
||||||
patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so
|
|
||||||
cp ../Release/*.bin $out/share/cef/
|
|
||||||
cp -r ../Resources/* $out/share/cef/
|
|
||||||
cp -r ../include $out
|
|
||||||
cp -r ../libcef_dll $out
|
|
||||||
cp -r ../cmake $out
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
bolt = stdenv.mkDerivation (finalAttrs: {
|
|
||||||
pname = "bolt-launcher";
|
|
||||||
version = "0.10.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "AdamCake";
|
|
||||||
repo = "bolt";
|
|
||||||
rev = finalAttrs.version;
|
|
||||||
fetchSubmodules = true;
|
|
||||||
hash = "sha256-2IoFzD+yhQv1Y7D+abeNUT23BC4P1xZTALF8Y+Zsg44=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
ninja
|
|
||||||
luajit
|
|
||||||
makeWrapper
|
|
||||||
copyDesktopItems
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
mesa
|
|
||||||
xorg.libX11
|
|
||||||
xorg.libxcb
|
|
||||||
libarchive
|
|
||||||
libz
|
|
||||||
cef
|
|
||||||
jdk17
|
|
||||||
];
|
|
||||||
|
|
||||||
desktopItems = [
|
|
||||||
(makeDesktopItem {
|
|
||||||
inherit (bolt) name;
|
|
||||||
desktopName = "Bolt Launcher";
|
|
||||||
keywords = [
|
|
||||||
"Game"
|
|
||||||
];
|
|
||||||
exec = "${bolt.name}";
|
|
||||||
terminal = false;
|
|
||||||
categories = ["Game"];
|
|
||||||
icon = "bolt-launcher";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-D CMAKE_BUILD_TYPE=Release"
|
|
||||||
"-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
|
|
||||||
"-G Ninja"
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
ls -al
|
|
||||||
mkdir -p cef/dist/Release cef/dist/Resources cef/dist/include
|
|
||||||
|
|
||||||
ln -s ${cef}/lib/* cef/dist/Release
|
|
||||||
|
|
||||||
ln -s ${cef}/share/cef/*.pak cef/dist/Resources
|
|
||||||
ln -s ${cef}/share/cef/icudtl.dat cef/dist/Resources
|
|
||||||
ln -s ${cef}/share/cef/locales cef/dist/Resources
|
|
||||||
|
|
||||||
ln -s ${cef}/include/* cef/dist/include
|
|
||||||
ln -s ${cef}/libcef_dll cef/dist/libcef_dll
|
|
||||||
|
|
||||||
ln -s ${cef}/cmake cef/dist/cmake
|
|
||||||
ln -s ${cef}/CMakeLists.txt cef/dist
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
for size in 16 32 64 128 256; do
|
|
||||||
size_dir="''${size}x''${size}"
|
|
||||||
ls -al $src/icon
|
|
||||||
mkdir -p $out/share/icons/hicolor/''${size_dir}/apps
|
|
||||||
cp $src/icon/$size.png $out/share/icons/hicolor/''${size_dir}/apps/bolt-launcher.png
|
|
||||||
done
|
|
||||||
mkdir -p $out/share/icons/hicolor/scalable/apps/
|
|
||||||
cp $src/icon/bolt.svg $out/share/icons/hicolor/scalable/apps/bolt-launcher.svg
|
|
||||||
'';
|
|
||||||
postFixup = ''
|
|
||||||
makeWrapper "$out/opt/bolt-launcher/bolt" "$out/bin/${finalAttrs.pname}-${finalAttrs.version}" \
|
|
||||||
--set JAVA_HOME "${jdk17}"
|
|
||||||
ls -al $out/bin
|
|
||||||
mkdir -p $out/lib
|
|
||||||
cp $out/usr/local/lib/libbolt-plugin.so $out/lib
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
in
|
|
||||||
buildFHSEnv {
|
|
||||||
inherit (bolt) name version;
|
|
||||||
|
|
||||||
targetPkgs = pkgs:
|
|
||||||
[bolt]
|
|
||||||
++ (with pkgs; [
|
|
||||||
xorg.libSM
|
|
||||||
xorg.libXxf86vm
|
|
||||||
xorg.libX11
|
|
||||||
glib
|
|
||||||
pango
|
|
||||||
cairo
|
|
||||||
gdk-pixbuf
|
|
||||||
gtk2-x11
|
|
||||||
libz
|
|
||||||
libcap
|
|
||||||
libsecret
|
|
||||||
openssl_1_1
|
|
||||||
SDL2
|
|
||||||
libGL
|
|
||||||
]);
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
|
||||||
mkdir -p $out/share/applications $out/share/icons
|
|
||||||
ln -s ${bolt}/share/applications/*.desktop \
|
|
||||||
$out/share/applications/
|
|
||||||
ln -s ${bolt}/share/icons/hicolor \
|
|
||||||
$out/share/icons/hicolor
|
|
||||||
'';
|
|
||||||
|
|
||||||
runScript = "${bolt.name}";
|
|
||||||
meta = {
|
|
||||||
homepage = "https://github.com/Adamcake/Bolt";
|
|
||||||
description = "An alternative launcher for RuneScape";
|
|
||||||
license = lib.licenses.agpl3Plus;
|
|
||||||
maintainers = with lib.maintainers; [nezia];
|
|
||||||
platforms = lib.platforms.linux;
|
|
||||||
mainProgram = "${bolt.name}";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
mcuxpresso = import ./mcuxpresso pkgs;
|
|
||||||
# this is unfortunately needed since bolt-launcher makes use of openssl-1.1.1w, and since it is not part of hosts, we have to add it this way
|
|
||||||
bolt-launcher =
|
|
||||||
(import inputs.nixpkgs {
|
|
||||||
inherit (pkgs) system;
|
|
||||||
config.permittedInsecurePackages = ["openssl-1.1.1w"];
|
|
||||||
})
|
|
||||||
.callPackage
|
|
||||||
./bolt-launcher.nix {};
|
|
||||||
}
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
{
|
|
||||||
eclipses,
|
|
||||||
stdenv,
|
|
||||||
requireFile,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
name = "mcuxpressotools";
|
|
||||||
version = "v16-1";
|
|
||||||
description = "MCUXpresso Config Tools";
|
|
||||||
filename = "mcuxpresso-config-tools-${version}_amd64.deb";
|
|
||||||
|
|
||||||
src = stdenv.mkDerivation {
|
|
||||||
inherit version description;
|
|
||||||
name = "${name}-src";
|
|
||||||
src = requireFile {
|
|
||||||
url = "https://www.nxp.com/design/software/development-software/mcuxpresso-config-tools-pins-clocks-and-peripherals:MCUXpresso-Config-Tools";
|
|
||||||
name = "${filename}.bin";
|
|
||||||
sha256 = "sha256-BbEwxm1urV2IrgUiTiMBEAPvonQGwdL4fpqFftGgRxI=";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildCommand = ''
|
|
||||||
# Unpack tarball.
|
|
||||||
mkdir -p deb
|
|
||||||
sh $src --target deb || true
|
|
||||||
ar -xv deb/${filename}
|
|
||||||
tar xfvz data.tar.gz -C .
|
|
||||||
|
|
||||||
mkdir -p ./final/eclipse
|
|
||||||
mv ./opt/nxp/MCUX_CFG_v13/bin/.* final/eclipse
|
|
||||||
mv ./usr final/
|
|
||||||
mv final/eclipse/tools final/eclipse/eclipse
|
|
||||||
mv final/eclipse/tools.ini final/eclipse/eclipse.ini
|
|
||||||
|
|
||||||
# Create custom .eclipseproduct file
|
|
||||||
echo "name=${name}
|
|
||||||
id=com.nxp.${name}
|
|
||||||
version=${version}
|
|
||||||
" > final/eclipse/.eclipseproduct
|
|
||||||
|
|
||||||
# Additional files
|
|
||||||
mkdir -p final/usr/share/mime
|
|
||||||
mv ./opt/nxp/MCUX_CFG_v13/mcu_data final/mcu_data
|
|
||||||
|
|
||||||
cd ./final
|
|
||||||
tar -czf $out ./
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
eclipses.buildEclipse {inherit description name src;}
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
pkgs: {
|
|
||||||
ide = pkgs.callPackage ./ide.nix {};
|
|
||||||
}
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
# https://github.com/KoviRobi/nixos-config/blob/3ab3f8372d1fd021a235de4d314ef7147846513e/overlays/mcuxpresso.nix
|
|
||||||
{pkgs, ...}: let
|
|
||||||
name = "mcuxpressoide";
|
|
||||||
version = "24.9.25";
|
|
||||||
description = "MCUXpresso IDE";
|
|
||||||
filename = "${name}-${version}.x86_64.deb";
|
|
||||||
mcuxpressoideSrc = pkgs.stdenv.mkDerivation {
|
|
||||||
inherit version description;
|
|
||||||
name = "${name}-src";
|
|
||||||
src = pkgs.requireFile {
|
|
||||||
url = "https://www.nxp.com/design/design-center/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-integrated-development-environment-ide:MCUXpresso-IDE";
|
|
||||||
name = "${filename}.bin";
|
|
||||||
hash = "sha256-e3g7rzZQ1WFLcUakkjaufpHMtw3qkw5lwxJuCKs6L+k=";
|
|
||||||
};
|
|
||||||
buildCommand = ''
|
|
||||||
# Unpack tarball.
|
|
||||||
mkdir -p deb
|
|
||||||
sh $src --target deb || true
|
|
||||||
ar -xv deb/${filename}
|
|
||||||
tar xfvz data.tar.gz -C .
|
|
||||||
mkdir -p ./final/eclipse
|
|
||||||
mv ./usr/local/${name}-${version}/ide/* ./usr/local/${name}-${version}/ide/.* final/eclipse
|
|
||||||
mv final/eclipse/mcuxpressoide final/eclipse/eclipse
|
|
||||||
mv final/eclipse/mcuxpressoide.ini final/eclipse/eclipse.ini
|
|
||||||
# Create custom .eclipseproduct file
|
|
||||||
rm final/eclipse/.eclipseproduct
|
|
||||||
echo "name=${name}
|
|
||||||
id=com.nxp.${name}
|
|
||||||
version=${version}
|
|
||||||
" > final/eclipse/.eclipseproduct
|
|
||||||
# Install udev rules
|
|
||||||
mkdir -p final/lib/udev/rules.d
|
|
||||||
mv ./lib/udev/rules.d/56-pemicro.rules ./lib/udev/rules.d/85-mcuxpresso.rules final/lib/udev/rules.d/
|
|
||||||
# Additional files
|
|
||||||
mv ./usr/local/${name}-${version}/mcu_data final/mcu_data
|
|
||||||
cd ./final
|
|
||||||
tar -czf $out ./
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
mcuxpressoide = pkgs.eclipses.buildEclipse {
|
|
||||||
name = "mcuxpresso-eclipse";
|
|
||||||
inherit description;
|
|
||||||
src = mcuxpressoideSrc;
|
|
||||||
};
|
|
||||||
|
|
||||||
# needed because of the integrated toolchain
|
|
||||||
mcuxpressoFhsEnv = pkgs.buildFHSEnv {
|
|
||||||
name = "mcuxpresso-env";
|
|
||||||
targetPkgs = pkgs: [
|
|
||||||
pkgs.stdenv.cc.cc.lib
|
|
||||||
pkgs.gcc
|
|
||||||
pkgs.libgcc
|
|
||||||
pkgs.libstdcxx5
|
|
||||||
pkgs.xorg.libXext
|
|
||||||
pkgs.xorg.libX11
|
|
||||||
pkgs.xorg.libXrender
|
|
||||||
pkgs.xorg.libXtst
|
|
||||||
pkgs.xorg.libXi
|
|
||||||
pkgs.freetype
|
|
||||||
pkgs.alsa-lib
|
|
||||||
pkgs.ncurses
|
|
||||||
pkgs.ncurses5
|
|
||||||
pkgs.libusb1
|
|
||||||
pkgs.readline
|
|
||||||
pkgs.libffi
|
|
||||||
pkgs.zlib
|
|
||||||
pkgs.tcl
|
|
||||||
pkgs.libxcrypt
|
|
||||||
pkgs.libxcrypt-legacy
|
|
||||||
pkgs.libusb-compat-0_1
|
|
||||||
];
|
|
||||||
|
|
||||||
runScript = "${mcuxpressoide}/bin/eclipse";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
# wrapper with desktop entry and udev rules
|
|
||||||
pkgs.stdenv.mkDerivation {
|
|
||||||
inherit name version description;
|
|
||||||
dontUnpack = true;
|
|
||||||
dontConfigure = true;
|
|
||||||
dontBuild = true;
|
|
||||||
nativeBuildInputs = [pkgs.copyDesktopItems];
|
|
||||||
desktopItems = [
|
|
||||||
(pkgs.makeDesktopItem {
|
|
||||||
inherit name;
|
|
||||||
type = "Application";
|
|
||||||
desktopName = "MCUXpresso IDE";
|
|
||||||
exec = "mcuxpresso";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
mkdir -p $out/bin $out/lib/udev/rules.d $out/eclipse $out/mcu_data
|
|
||||||
|
|
||||||
cp ${mcuxpressoide}/lib/udev/rules.d/85-mcuxpresso.rules ${mcuxpressoide}/lib/udev/rules.d/56-pemicro.rules $out/lib/udev/rules.d/
|
|
||||||
|
|
||||||
ln -s ${mcuxpressoFhsEnv}/bin/mcuxpresso-env $out/bin/mcuxpresso
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +0,0 @@
|
||||||
let
|
|
||||||
anastacia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEplguGeXCbdz++Ry5pwJylmtAMnwtf1+9JoJnCGfw3A root@anastacia";
|
|
||||||
in {
|
|
||||||
"searx-env-file.age".publicKeys = [anastacia];
|
|
||||||
}
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
./users.nix
|
./users.nix
|
||||||
./security.nix
|
./security.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
|
../nix
|
||||||
];
|
];
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
"audio"
|
"audio"
|
||||||
"video"
|
"video"
|
||||||
"wheel"
|
"wheel"
|
||||||
"plugdev"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./core
|
./core
|
||||||
./nix
|
|
||||||
|
|
||||||
./hardware/printing.nix
|
./hardware/printing.nix
|
||||||
./hardware/fwupd.nix
|
./hardware/fwupd.nix
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,15 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config.allowUnfree = true;
|
||||||
allowUnfree = true;
|
overlays = [
|
||||||
permittedInsecurePackages = [
|
(_: prev: {
|
||||||
"cinny-4.2.2"
|
lib =
|
||||||
"cinny-unwrapped-4.2.2"
|
prev.lib
|
||||||
"segger-jlink-qt4-796s"
|
// import ../../lib {
|
||||||
];
|
inherit (prev) lib pkgs;
|
||||||
segger-jlink.acceptLicense = true;
|
|
||||||
};
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
fonts = {
|
fonts = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
noto-fonts-extra
|
noto-fonts-extra
|
||||||
(nerdfonts.override {fonts = ["IntelOneMono"];})
|
(nerdfonts.override {fonts = ["IntelOneMono"];})
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
programs = {
|
programs = {
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,3 @@
|
||||||
{pkgs, ...}: {
|
{
|
||||||
imports = [
|
imports = [./docker.nix ./gnupg.nix ./pipewire.nix ./kmscon.nix];
|
||||||
./docker.nix
|
|
||||||
./gnupg.nix
|
|
||||||
./pipewire.nix
|
|
||||||
./kmscon.nix
|
|
||||||
];
|
|
||||||
services.udev.packages = [pkgs.segger-jlink];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
{pkgs, ...}: {
|
_: {
|
||||||
virtualisation.podman = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dockerCompat = true;
|
rootless = {
|
||||||
|
enable = true;
|
||||||
|
setSocketVariable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.distrobox];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
{
|
|
||||||
services.kanata = {
|
|
||||||
enable = true;
|
|
||||||
keyboards.default = {
|
|
||||||
extraDefCfg = "process-unmapped-keys yes";
|
|
||||||
config = ''
|
|
||||||
(defsrc
|
|
||||||
caps a s d f j k l ;
|
|
||||||
)
|
|
||||||
(defvar
|
|
||||||
tap-time 150
|
|
||||||
hold-time 200
|
|
||||||
)
|
|
||||||
|
|
||||||
(defalias
|
|
||||||
escctrl (tap-hold 100 100 esc lctl)
|
|
||||||
a (tap-hold $tap-time $hold-time a lmet)
|
|
||||||
s (tap-hold $tap-time $hold-time s lalt)
|
|
||||||
d (tap-hold $tap-time $hold-time d lsft)
|
|
||||||
f (tap-hold $tap-time $hold-time f lctl)
|
|
||||||
j (tap-hold $tap-time $hold-time j rctl)
|
|
||||||
k (tap-hold $tap-time $hold-time k rsft)
|
|
||||||
l (tap-hold $tap-time $hold-time l ralt)
|
|
||||||
; (tap-hold $tap-time $hold-time ; rmet)
|
|
||||||
)
|
|
||||||
|
|
||||||
(deflayer base
|
|
||||||
@escctrl @a @s @d @f @j @k @l @;
|
|
||||||
)
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
_: {
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
# rtkit is optional but recommended
|
# rtkit is optional but recommended
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.caddy.enable = true;
|
|
||||||
services.caddy.virtualHosts = {
|
|
||||||
"www.nezia.dev" = {
|
|
||||||
extraConfig = ''
|
|
||||||
redir https://nezia.dev{uri}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
"nezia.dev" = {
|
|
||||||
extraConfig = ''
|
|
||||||
root * ${inputs.portfolio.packages.${pkgs.system}.default}
|
|
||||||
file_server
|
|
||||||
encode gzip
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +1,8 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
age.secrets.searx-env-file.file = ../../secrets/searx-env-file.age;
|
|
||||||
services = {
|
services = {
|
||||||
searx = {
|
searx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.searxng;
|
package = pkgs.searxng;
|
||||||
environmentFile = config.age.secrets.searx-env-file.path;
|
|
||||||
settings = {
|
settings = {
|
||||||
search = {
|
search = {
|
||||||
safe_search = 1; # 0 = None, 1 = Moderate, 2 = Strict
|
safe_search = 1; # 0 = None, 1 = Moderate, 2 = Strict
|
||||||
|
|
@ -16,7 +10,7 @@
|
||||||
default_lang = "en";
|
default_lang = "en";
|
||||||
};
|
};
|
||||||
server = {
|
server = {
|
||||||
secret_key = "@SEARX_SECRET_KEY@";
|
secret_key = "TODO_USE_SOPS_INSTEAD";
|
||||||
port = 8888; # Internal port
|
port = 8888; # Internal port
|
||||||
bind_address = "localhost"; # Only listen locally
|
bind_address = "localhost"; # Only listen locally
|
||||||
base_url = "https://search.nezia.dev/";
|
base_url = "https://search.nezia.dev/";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue