mirror of
https://github.com/davegallant/nix-config
synced 2026-01-07 23:04:07 +00:00
Compare commits
30 Commits
8534a196a9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 260adf53e5 | |||
| 20fb65c259 | |||
|
|
075c429dee | ||
|
|
c4f1ea3e60 | ||
| 2bd46dd98f | |||
| b7e54a40c3 | |||
| 673b10ffb0 | |||
| 54dd7f3e93 | |||
| a6ff460dea | |||
| ff98be6206 | |||
| 865b5fd211 | |||
| 1614d714e8 | |||
| b330dcfafa | |||
| 5fad38af62 | |||
| ed76968e75 | |||
| 2412566952 | |||
| c6c152549c | |||
| 76f4837fce | |||
| ed1b643113 | |||
| f571aaf036 | |||
| 3cc3b82e26 | |||
| 29eb98ebe2 | |||
| 4ebf251722 | |||
| 74eee143be | |||
| 1361afedfd | |||
| 007016a7ca | |||
| fd6d3ec8ce | |||
| 5f456b75a1 | |||
| 8001c5b1e6 | |||
| ae2149261e |
19
README.md
19
README.md
@@ -64,3 +64,22 @@ To cleanup previous files, run nix garbage collection:
|
|||||||
```sh
|
```sh
|
||||||
just clean
|
just clean
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Restoring from a live USB
|
||||||
|
|
||||||
|
If the bootloader for some reason breaks (i.e. motherboard firmware upgrade), restore it from a live USB by running the following commands:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ sudo cryptsetup luksOpen /dev/nvme0n1p2 crypted-nixos
|
||||||
|
Enter passphrase for /dev/nvme0n1p2: ********
|
||||||
|
$ sudo mount /dev/vg/root /mnt
|
||||||
|
$ sudo mount /dev/nvme0n1p1 /mnt/boot/efi
|
||||||
|
$ sudo nixos-enter --root /mnt
|
||||||
|
$ hostname <hostname>
|
||||||
|
```
|
||||||
|
|
||||||
|
Navigate to the nix-config directory and run:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
just rebuild-boot
|
||||||
|
```
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
github-cli
|
github-cli
|
||||||
hadolint
|
hadolint
|
||||||
lazygit
|
lazygit
|
||||||
|
macchina
|
||||||
|
ncdu
|
||||||
progress
|
progress
|
||||||
ripgrep
|
ripgrep
|
||||||
shellcheck
|
shellcheck
|
||||||
@@ -85,7 +87,6 @@
|
|||||||
nvd
|
nvd
|
||||||
|
|
||||||
# python
|
# python
|
||||||
poetry
|
|
||||||
virtualenv
|
virtualenv
|
||||||
|
|
||||||
# media
|
# media
|
||||||
|
|||||||
102
flake.lock
generated
102
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765066094,
|
"lastModified": 1767634391,
|
||||||
"narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
|
"narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
|
"rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -30,12 +30,12 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765254444,
|
"lastModified": 1766549083,
|
||||||
"narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=",
|
"narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
|
||||||
"rev": "3ccc0297525e51ac3d7905509e0616c9c8350108",
|
"rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
|
||||||
"revCount": 316,
|
"revCount": 318,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.1/019b4e8a-dc22-75db-aef5-a447efbb1a13/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
@@ -45,37 +45,37 @@
|
|||||||
"determinate-nixd-aarch64-darwin": {
|
"determinate-nixd-aarch64-darwin": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=",
|
"narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"determinate-nixd-aarch64-linux": {
|
"determinate-nixd-aarch64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=",
|
"narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"determinate-nixd-x86_64-linux": {
|
"determinate-nixd-x86_64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=",
|
"narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
@@ -123,11 +123,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765495779,
|
"lastModified": 1765835352,
|
||||||
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
|
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
|
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -203,11 +203,11 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765859973,
|
"lastModified": 1767780135,
|
||||||
"narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
|
"narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
|
"rev": "c08430923ed417abc653884328a39e98496cfd0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -254,12 +254,12 @@
|
|||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765252170,
|
"lastModified": 1766546676,
|
||||||
"narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=",
|
"narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
|
||||||
"rev": "1ddd28880651054346c34009d7bb9de36f1db2c1",
|
"rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
|
||||||
"revCount": 23362,
|
"revCount": 24299,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.1/019b4e84-d036-75db-b6c6-6bc2e2035c53/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
@@ -298,11 +298,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765975662,
|
"lastModified": 1767786791,
|
||||||
"narHash": "sha256-tAy+/R6cqAhdlncSGor0EQVjh+51033eBkwQXLX2yyc=",
|
"narHash": "sha256-Eu0eZDABynDaCPRr5bce4UpVcmRHioxG8pJTpPPMrWE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0fc6414b45da07a3f57a64f4ce6426b1fd015c1f",
|
"rev": "c0fc386a2f5f7027de84c302659f16c93f8da151",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -330,11 +330,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765779637,
|
"lastModified": 1767640445,
|
||||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -346,12 +346,12 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764611609,
|
"lastModified": 1766314097,
|
||||||
"narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",
|
"narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
|
||||||
"rev": "8c29968b3a942f2903f90797f9623737c215737c",
|
"rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
|
||||||
"revCount": 905078,
|
"revCount": 914780,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.914780%2Brev-306ea70f9eb0fb4e040f8540e2deab32ed7e2055/019b49b8-ed0f-724e-bdaf-5fd90cc1c590/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
@@ -360,11 +360,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765311797,
|
"lastModified": 1767634882,
|
||||||
"narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
|
"narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
|
"rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -376,11 +376,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765838191,
|
"lastModified": 1767634882,
|
||||||
"narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
|
"narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
|
"rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -416,11 +416,11 @@
|
|||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765796859,
|
"lastModified": 1767448089,
|
||||||
"narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=",
|
"narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e",
|
"rev": "983751b66f255bbea1adc185364e9e7b73f82358",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -516,11 +516,11 @@
|
|||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764077616,
|
"lastModified": 1766183672,
|
||||||
"narHash": "sha256-5bhF1Pdrz5yq9mSMWzoPRKDx6fedRr55A8+v556MD/I=",
|
"narHash": "sha256-24+gJj4UsxwQmdxSS3Aqo2fl0Ep13sYrTDvcHY24mwA=",
|
||||||
"owner": "davegallant",
|
"owner": "davegallant",
|
||||||
"repo": "vpngate",
|
"repo": "vpngate",
|
||||||
"rev": "eda46dcce93b9246784e684e9cb7e8b96d53ee1d",
|
"rev": "a668484da6b969d29dd2f74d5a4f2323fb48beef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
10
home.nix
10
home.nix
@@ -138,12 +138,14 @@ in
|
|||||||
set -x PATH $PATH $GOBIN
|
set -x PATH $PATH $GOBIN
|
||||||
|
|
||||||
source $HOME/work.fish
|
source $HOME/work.fish
|
||||||
|
|
||||||
atuin init fish | source
|
|
||||||
helm completion fish | source
|
|
||||||
kubectl completion fish | source
|
|
||||||
# '';
|
# '';
|
||||||
|
|
||||||
|
shellInit = ''
|
||||||
|
atuin init fish | source
|
||||||
|
helm completion fish | source
|
||||||
|
kubectl completion fish | source
|
||||||
|
'';
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
g = "git";
|
g = "git";
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
@@ -54,7 +55,7 @@
|
|||||||
];
|
];
|
||||||
luks.devices."root" = {
|
luks.devices."root" = {
|
||||||
allowDiscards = true;
|
allowDiscards = true;
|
||||||
device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
|
device = "/dev/disk/by-uuid/89a14ac5-7723-4a0a-bb95-fb2fb2e92160";
|
||||||
preLVM = true;
|
preLVM = true;
|
||||||
keyFile = "./keyfile0.bin";
|
keyFile = "./keyfile0.bin";
|
||||||
};
|
};
|
||||||
@@ -69,7 +70,7 @@
|
|||||||
[
|
[
|
||||||
bleachbit
|
bleachbit
|
||||||
calibre
|
calibre
|
||||||
chromium
|
clamtk
|
||||||
cryptsetup
|
cryptsetup
|
||||||
dbeaver-bin
|
dbeaver-bin
|
||||||
discord
|
discord
|
||||||
@@ -78,8 +79,10 @@
|
|||||||
google-chrome
|
google-chrome
|
||||||
hardinfo2
|
hardinfo2
|
||||||
httpie-desktop
|
httpie-desktop
|
||||||
|
heroic
|
||||||
iputils
|
iputils
|
||||||
kdePackages.bluedevil
|
kdePackages.bluedevil
|
||||||
|
kdePackages.kcalc
|
||||||
kdePackages.kcharselect
|
kdePackages.kcharselect
|
||||||
kdePackages.kclock
|
kdePackages.kclock
|
||||||
kdePackages.kcolorchooser
|
kdePackages.kcolorchooser
|
||||||
@@ -96,12 +99,13 @@
|
|||||||
pika-backup
|
pika-backup
|
||||||
pinentry-curses
|
pinentry-curses
|
||||||
pinta
|
pinta
|
||||||
protonvpn-gui
|
protonup-qt
|
||||||
qalculate-qt
|
qbittorrent
|
||||||
qemu
|
qemu
|
||||||
traceroute
|
traceroute
|
||||||
unrar
|
unrar
|
||||||
unstable.beszel
|
unstable.beszel
|
||||||
|
unstable.ktailctl
|
||||||
unstable.mcpelauncher-ui-qt
|
unstable.mcpelauncher-ui-qt
|
||||||
unstable.obsidian
|
unstable.obsidian
|
||||||
unstable.podman
|
unstable.podman
|
||||||
@@ -124,15 +128,11 @@
|
|||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
|
device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
"/home" = {
|
|
||||||
device = "/dev/disk/by-uuid/e3ab2e1a-bddf-4ae0-b00a-bf954c6c182b";
|
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
"/boot/efi" = {
|
"/boot/efi" = {
|
||||||
device = "/dev/disk/by-uuid/3CFD-D749";
|
device = "/dev/disk/by-uuid/F1BD-5227";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
"/mnt/synology-2b/media" = {
|
"/mnt/synology-2b/media" = {
|
||||||
@@ -149,7 +149,6 @@
|
|||||||
dejavu_fonts
|
dejavu_fonts
|
||||||
fira-mono
|
fira-mono
|
||||||
font-awesome
|
font-awesome
|
||||||
google-fonts
|
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
nerd-fonts.droid-sans-mono
|
nerd-fonts.droid-sans-mono
|
||||||
nerd-fonts.fira-code
|
nerd-fonts.fira-code
|
||||||
@@ -224,6 +223,13 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services = {
|
||||||
|
mullvad-vpn = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.mullvad-vpn;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
autoUpgrade.enable = true;
|
autoUpgrade.enable = true;
|
||||||
stateVersion = "25.11";
|
stateVersion = "25.11";
|
||||||
@@ -242,6 +248,7 @@
|
|||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
extraOptions = "experimental-features = nix-command flakes";
|
extraOptions = "experimental-features = nix-command flakes";
|
||||||
|
settings.trusted-users = [ "root" "@wheel" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.dave = {
|
users.users.dave = {
|
||||||
@@ -249,7 +256,6 @@
|
|||||||
extraGroups = [
|
extraGroups = [
|
||||||
"wheel"
|
"wheel"
|
||||||
"libvirtd"
|
"libvirtd"
|
||||||
"corectrl"
|
|
||||||
];
|
];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
};
|
};
|
||||||
@@ -319,6 +325,9 @@
|
|||||||
package = unstable.tailscale;
|
package = unstable.tailscale;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.clamav.daemon.enable = true;
|
||||||
|
services.clamav.updater.enable = true;
|
||||||
|
|
||||||
services.opensnitch = {
|
services.opensnitch = {
|
||||||
enable = true;
|
enable = true;
|
||||||
rules = {
|
rules = {
|
||||||
|
|||||||
@@ -112,7 +112,7 @@
|
|||||||
"stats"
|
"stats"
|
||||||
"steam"
|
"steam"
|
||||||
"taskexplorer"
|
"taskexplorer"
|
||||||
"tailscale"
|
"tailscale-app"
|
||||||
"vlc"
|
"vlc"
|
||||||
"whisky"
|
"whisky"
|
||||||
"zed"
|
"zed"
|
||||||
|
|||||||
7
justfile
7
justfile
@@ -5,10 +5,13 @@ alias r := rebuild
|
|||||||
|
|
||||||
arch := `uname -s`
|
arch := `uname -s`
|
||||||
|
|
||||||
cmd := if arch == "Linux" { "nixos-rebuild --sudo" } else { "darwin-rebuild" }
|
cmd := if arch == "Linux" { "nixos-rebuild --sudo" } else { "sudo darwin-rebuild" }
|
||||||
|
|
||||||
rebuild:
|
rebuild:
|
||||||
sudo $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix" --show-trace
|
$cmd switch --flake .
|
||||||
|
|
||||||
|
rebuild-boot:
|
||||||
|
$cmd boot --flake . --install-bootloader
|
||||||
|
|
||||||
rollback:
|
rollback:
|
||||||
sudo $cmd switch --rollback --flake .
|
sudo $cmd switch --rollback --flake .
|
||||||
|
|||||||
Reference in New Issue
Block a user