Rename hosts folder

home-manager/games.nix

@@ -15,7 +15,7 @@
     inherit (pkgs) minetest;
     inherit (pkgs.wineWowPackages) staging;
     gw2 = pkgs.writeShellScriptBin "gw2" ''
-      cd /home/maralorn/GW2
+      cd /home/maralorn/volatile/GW2
 
       # Intel/AMD Mesa Specific Env_vars
       # export vblank_mode=0

home-manager/machines.nix

@@ -101,8 +101,8 @@ in {
     default = makeConfig "hera" [
       ./on-my-machine.nix
       ./headless.nix
-      ../hosts/hera/weechat
-      ../hosts/hera/secret
+      ..nixos/machineshera/weechat
+      ..nixos/machineshera/secret
       ./kassandra-server.nix
       ./headless-mpd.nix
       ./mail.nix

home-manager/mpd.nix

@@ -1,8 +1,26 @@
 { pkgs, config, ... }: {
+  home.file.".config/beets/config.yaml".text = builtins.toJSON {
+    directory = "~/media/audio";
+    library = "~/.config/beets/musiclibrary.db";
+    import = { move = true; };
+    paths = {
+      default = "$genre/%the{$albumartist}/$album%aunique{}/$track $title";
+      singleton = "$genre/%the{$artist}/singles/$title";
+      comp = "$genre/%the{$artist}/$album%aunique{}/$track $title";
+      "genre:soundtrack" = "Soundtrack/$album%aunique{}/$track $title";
+      "genre::classical" = "$genre/%the{$composer}/$album%aunique{}/$track $title";
+    };
+    plugins = "convert web mpdstats mpdupdate fromfilename the";
+    convert = {
+      auto = true;
+      format = "opus";
+      never_convert_lossy_files = true;
+    };
+  };
   services = {
     mpd = {
       enable = true;
-      network.listenAddress = "::1";
+      #network.listenAddress = "::1";
       musicDirectory = "${config.home.homeDirectory}/media/audio";
       extraConfig = ''
         audio_output {

nixos/machines/apollo/configuration.nix

@@ -5,8 +5,8 @@
 let
   inherit (config.m-0) hosts prefix private;
   inherit (private) me wireguard;
-  nixos-hardware = (import ../../nix/sources.nix).nixos-hardware;
-  inherit (import ../../common/common.nix { inherit pkgs; }) syncthing;
+  nixos-hardware = (import ../../../nix/sources.nix).nixos-hardware;
+  inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
 in {
 
   imports = [
@@ -14,11 +14,11 @@ in {
     "${nixos-hardware}/common/pc/ssd"
     "${(builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/nixdark")}"
     ./hardware-configuration.nix
-    ../../system
-    ../../system/fonts.nix
-    ../../system/boot-key.nix
-    ../../system/standalone
-    ../../system/use-cache.nix
+    ../../roles
+    ../../roles/fonts.nix
+    ../../roles/boot-key.nix
+    ../../roles/standalone
+    ../../roles/use-cache.nix
   ];
 
   networking = {
@@ -28,7 +28,7 @@ in {
       m0wire = {
         allowedIPsAsRoutes = false;
         ips = [ "${hosts.apollo-wg}/112" ];
-        privateKeyFile = "/etc/nixos/hosts/apollo/secret/wireguard-private";
+        privateKeyFile = "/etc/nixosnixos/machinesapollo/secret/wireguard-private";
         peers = [{
           publicKey = wireguard.pub.hera;
           allowedIPs = [ "::/0" ];
@@ -45,6 +45,12 @@ in {
   m-0 = { laptop.enable = true; };
 
   services = {
+    beesd.filesystems.root = {
+      spec = "LABEL=root";
+      hashTableSizeMB = 2048;
+      verbosity = "crit";
+      extraOptions = [ "--loadavg-target" "4.0" ];
+    };
     snapper = {
       configs.home = {
         subvolume = "/home";
@@ -71,8 +77,8 @@ in {
       openDefaultPorts = true;
       declarative = syncthing.declarativeWith [ "hera" ] "/home/maralorn/media"
         // {
-          cert = "/etc/nixos/hosts/apollo/secret/syncthing/cert.pem";
-          key = "/etc/nixos/hosts/apollo/secret/syncthing/key.pem";
+          cert = "/etc/nixosnixos/machinesapollo/secret/syncthing/cert.pem";
+          key = "/etc/nixosnixos/machinesapollo/secret/syncthing/key.pem";
         };
     };
     gnome3.chrome-gnome-shell.enable = true;

nixos/machines/apollo/hardware-configuration.nix

@@ -32,6 +32,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/ce5b0ac6-6eaf-45a6-b6c8-bd4958caf335";
       fsType = "btrfs";
+      options = ["compress=zstd" "autodefrag" "noatime"];
     };
     "/boot/EFI" = {
       device = "/dev/disk/by-uuid/C4A6-3DB5";

nixos/machines/hera/cloud.nix

@@ -20,7 +20,7 @@ let
     privateNetwork = true;
     hostBridge = "bridge";
     config = { pkgs, ... }: {
-      imports = [ ../../system ];
+      imports = [ ../../roles ];
 
       networking = {
         interfaces.eth0 = {

nixos/machines/hera/configuration.nix

@@ -1,29 +1,29 @@
 { config, pkgs, ... }:
 
 # You need pw-files for every configured user in ./secret/pw-useralias for login to work.
-# dropbearkey -t rsa -f /etc/nixos/hosts/<hostname>/secret/boot_rsa
+# dropbearkey -t rsa -f /etc/nixosnixos/machines<hostname>/secret/boot_rsa
 
 let
   inherit (config.m-0.private) me;
-  inherit (import ../../common/common.nix { inherit pkgs; }) syncthing;
+  inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
 in {
 
   imports = [
     ./hardware-configuration.nix
-    ../../system
-    ../../system/test-timer.nix
-    ../../system/standalone
-    ../../system/server
-    ../../system/git.nix
-    ../../system/riot.nix
-    ../../system/mathechor.de.nix
-    ../../system/monitoring
-    ../../system/blog.nix
-    ../../system/email2matrix.nix
-    ../../system/matrix-synapse.nix
-    ../../system/coturn.nix
-    ../../system/serve-store.nix
-    ../../system/go-neb.nix
+    ../../roles
+    ../../roles/test-timer.nix
+    ../../roles/standalone
+    ../../roles/server
+    ../../roles/git.nix
+    ../../roles/riot.nix
+    ../../roles/mathechor.de.nix
+    ../../roles/monitoring
+    ../../roles/blog.nix
+    ../../roles/email2matrix.nix
+    ../../roles/matrix-synapse.nix
+    ../../roles/coturn.nix
+    ../../roles/serve-store.nix
+    ../../roles/go-neb.nix
     ./web.nix
     ./mail.nix
     ./boot.nix
@@ -103,8 +103,8 @@ in {
       user = "maralorn";
       openDefaultPorts = true;
       declarative = syncthing.declarativeWith [ "apollo" ] "/media" // {
-        cert = "/etc/nixos/hosts/hera/secret/syncthing/cert.pem";
-        key = "/etc/nixos/hosts/hera/secret/syncthing/key.pem";
+        cert = "/etc/nixosnixos/machineshera/secret/syncthing/cert.pem";
+        key = "/etc/nixosnixos/machineshera/secret/syncthing/key.pem";
       };
     };
   };
@@ -117,7 +117,7 @@ in {
     isNormalUser = true;
     uid = 1001;
     extraGroups = [ "wheel" "systemd-journal" ];
-    passwordFile = "/etc/nixos/hosts/hera/secret/pw-choreutes";
+    passwordFile = "/etc/nixosnixos/machineshera/secret/pw-choreutes";
   };
 
   # This value determines the NixOS release with which your system is to be

nixos/machines/hera/mail.nix

@@ -25,7 +25,7 @@ in {
     autoStart = true;
     config = { pkgs, lib, ... }: {
       imports =
-        [ ../../system "${(import ../../nix/sources.nix).nixos-mailserver}" ];
+        [ ../../roles "${(import ../../../nix/sources.nix).nixos-mailserver}" ];
       services.prometheus.exporters = {
         node.port = 9101;
         postfix = {

nixos/machines/hera/network.nix

@@ -54,7 +54,7 @@ in {
     wireguard.interfaces = {
       m0wire = {
         ips = [ "${hosts.hera-wg}/112" ];
-        privateKeyFile = "/etc/nixos/hosts/hera/secret/wireguard-private";
+        privateKeyFile = "/etc/nixosnixos/machineshera/secret/wireguard-private";
         listenPort = wireguard.port;
         peers = [{
           publicKey = wireguard.pub.apollo;

nixos/roles/default.nix

@@ -2,7 +2,7 @@
 let me = config.m-0.private.me;
 in {
   imports = [
-    ../common
+    ../../common
     ./modules/laptop.nix
     ./modules/loginctl-linger.nix
   ];
@@ -10,7 +10,7 @@ in {
   i18n = { defaultLocale = "en_US.UTF-8"; };
 
   # For nixos-rebuild
-  nixpkgs.overlays = import ../overlays { inherit lib; };
+  nixpkgs.overlays = import ../../overlays { inherit lib; };
 
   time.timeZone = "Europe/Berlin";
 

nixos/roles/local-nix-cache.nix

@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ../lib) sources;
+let inherit (import ../../lib) sources;
   local-nix-cache = import sources.local-nix-cache { };
 in {
   imports = [ (local-nix-cache.path + "/module.nix") ];

nixos/roles/standalone/default.nix

@@ -29,7 +29,7 @@
   environment = {
     # Put these into an extra file so the essential packages can also be included on non selfadminstrated systems from home-manager
     systemPackages = builtins.attrValues ({
-      inherit (import ../../lib/update-system.nix {
+      inherit (import ../../../lib/update-system.nix {
         inherit pkgs;
         nixos-rebuild = config.system.build.nixos-rebuild;
       })

nixos/roles/test-timer.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 let
   user = "maralorn";
-  inherit (import ../lib/update-system.nix {
+  inherit (import ../../lib/update-system.nix {
     nixos-rebuild = config.system.build.nixos-rebuild;
     inherit pkgs;
   })

overlays/grafana-devel/package.nix

@@ -12,7 +12,7 @@ let
           providers = [{
             name = "Static dashboards";
             folder = "";
-            options.path = ../../system/monitoring/grafana-dashboards;
+            options.path = ../../nixos/roles/monitoring/grafana-dashboards;
             orgId = 1;
             type = "file";
             updateIntervalSeconds = 60;

overlays/pkgSets.nix

@@ -11,7 +11,7 @@ self: super: {
     inherit (self)
       git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
       tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
-      entr libargon2 mblaze niv;
+      entr libargon2 mblaze niv compsize;
   };
 
   my-home-pkgs = {

overlays/testing.nix

@@ -26,7 +26,7 @@ in {
     name = "test-system-config";
     inherit bins;
     inherit imports;
-  } (haskellBody "system" ''nix_build $ ["<nixpkgs/nixos>", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}/hosts/#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args'');
+  } (haskellBody "system" ''nix_build $ ["<nixpkgs/nixos>", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}nixos/machines#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args'');
 
   test-home-config = self.writeHaskellScript {
     name = "test-home-config";