A bit more cleanup

Changes

3 changed files (+22/-28)

• ThinkPad-X1-Yoga-Gen-6/default.nix
  • @@ -125,8 +125,10 @@
    i18n.inputMethod = { enable = true; type = "fcitx5"; - fcitx5.addons = with pkgs; [ fcitx5-chinese-addons ]; - fcitx5.waylandFrontend = true; + fcitx5 = { + addons = with pkgs; [ fcitx5-chinese-addons ]; + waylandFrontend = true; + }; }; # KDE! YAY!
  • @@ -161,22 +163,18 @@
    }; # Back up /home and unnamed.website using btrfs snapshots and btrbk - services.btrbk.instances.btrbk = { - settings = { - volume = { - "/".subvolume = "/home"; - "ssh://unnamed.website/" = { - ssh_user = "btrbk"; - subvolume = "srv"; - snapshot_dir = "/.snapshots"; - snapshot_preserve_min = "all"; - snapshot_create = "no"; - target = "/.snapshots"; - target_preserve = "3d 3w 3m *y"; - target_preserve_min = "latest"; - send_compressed_data = "yes"; - }; - }; + services.btrbk.instances.btrbk.settings.volume = { + "/".subvolume = "/home"; + "ssh://unnamed.website/" = { + ssh_user = "btrbk"; + subvolume = "srv"; + snapshot_dir = "/.snapshots"; + snapshot_preserve_min = "all"; + snapshot_create = "no"; + target = "/.snapshots"; + target_preserve = "3d 3w 3m *y"; + target_preserve_min = "latest"; + send_compressed_data = "yes"; }; }; systemd.services.btrbk-btrbk.serviceConfig = {
• configuration.nix
  • @@ -89,13 +89,11 @@
    }; # THE ONLY CORRECT BACKUP METHOD - services.btrbk.instances.btrbk = { - settings = { - timestamp_format = "short"; - snapshot_dir = "/.snapshots"; - snapshot_preserve = "3d 3w 3m *y"; - snapshot_preserve_min = "latest"; - }; + services.btrbk.instances.btrbk.settings = { + timestamp_format = "short"; + snapshot_dir = "/.snapshots"; + snapshot_preserve = "3d 3w 3m *y"; + snapshot_preserve_min = "latest"; }; # This option defines the first version of NixOS you have installed on this particular machine,
• flake.nix
  • @@ -63,9 +63,7 @@
    fastConnection = true; }; }; - packages.${system} = { - image = self.nixosConfigurations.Unnamed-Server.config.system.build.diskoImages; - }; + packages.${system}.image = self.nixosConfigurations.Unnamed-Server.config.system.build.diskoImages; # I love autoformatters formatter.${system} = pkgs.nixfmt-tree; };