aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2023-10-05 22:26:54 +0200
committerKarel Kočí <cynerd@email.cz>2023-10-05 22:26:54 +0200
commit582e5d9959733b2849e3750a41b6aa2547e949e0 (patch)
tree3f41db4a5e35cfba39a42c2d73605d790bfd8945 /nixos/modules
parent8553b18626590e45dbb3a51210e919917632854a (diff)
downloadnixos-personal-582e5d9959733b2849e3750a41b6aa2547e949e0.tar.gz
nixos-personal-582e5d9959733b2849e3750a41b6aa2547e949e0.tar.bz2
nixos-personal-582e5d9959733b2849e3750a41b6aa2547e949e0.zip
Cleanup a bit
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/desktop.nix7
-rw-r--r--nixos/modules/develop.nix5
-rw-r--r--nixos/modules/generic.nix6
-rw-r--r--nixos/modules/home-assistant.nix2
4 files changed, 9 insertions, 11 deletions
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 934eaf9..093a9c2 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -147,7 +147,7 @@ in {
# CAD
freecad
- kicad-with-packages3d
+ kicad
sweethome3d.application
qelectrotech
]
@@ -248,10 +248,7 @@ in {
};
documentation = {
- man = {
- enable = true;
- generateCaches = true;
- };
+ man.enable = true;
info.enable = true;
};
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 96900d2..6cd7645 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -27,6 +27,7 @@ with lib; {
cloc
openssl
sterm
+ tio
parted
vim-vint
nodePackages.vim-language-server
@@ -41,8 +42,7 @@ with lib; {
nixd
alejandra
statix
- nixfmt
- nixpkgs-fmt
+ deadnix
agenix
# Shell
@@ -119,6 +119,7 @@ with lib; {
# SHV
shvspy
flatline
+ shvcli
# Images
imagemagick
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index d88618d..8688732 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -8,7 +8,7 @@ with lib; let
isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform;
in {
config = {
- system.stateVersion = "22.05";
+ system.stateVersion = "23.11";
nix = {
extraOptions = "experimental-features = nix-command flakes";
@@ -111,7 +111,7 @@ in {
users.groups.cynerd.gid = 1000;
users.users = {
root = {
- passwordFile = "/run/secrets/root.pass";
+ hashedPasswordFile = "/run/secrets/root.pass";
};
cynerd = {
group = "cynerd";
@@ -135,7 +135,7 @@ in {
if isNative
then pkgs.zsh.out
else pkgs.bash.out;
- passwordFile = "/run/secrets/cynerd.pass";
+ hashedPasswordFile = "/run/secrets/cynerd.pass";
openssh.authorizedKeys.keyFiles = [
(config.personal-secrets + "/unencrypted/git-private.pub")
];
diff --git a/nixos/modules/home-assistant.nix b/nixos/modules/home-assistant.nix
index 813b41b..abe8c1a 100644
--- a/nixos/modules/home-assistant.nix
+++ b/nixos/modules/home-assistant.nix
@@ -73,7 +73,7 @@ in {
services.telegraf.extraConfig = {
outputs.influxdb_v2 = [
{
- urls = ["http://errol:8086"];
+ urls = ["http://cynerd.cz:8086"];
token = "$INFLUX_TOKEN";
organization = "personal";
bucket = "bigclown";