diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 68637ea..d553449 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -133,20 +133,69 @@ in openFirewall = lib.mkDefault true; }; - borgbackup.jobs.home-matt = { - encryption.mode = "repokey"; - encryption.passCommand = "cat /root/borg"; - environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; - repo = "/media/nas/backup/desktop-nix/borg/home"; - compression = "auto,zstd"; - inhibitsSleep = true; - paths = "/home/matt"; - exclude = [ - "/home/matt/Games" - "/home/matt/1TB" - ]; + restic.backups = { + jallen-nas = { + initialize = true; + createWrapper = true; + inhibitsSleep = true; + environmentFile = config.sops.templates."restic.env".path; + passwordFile = config.sops.secrets."desktop/restic/password".path; + repository = "rest:http://admin:BogieDudie1@10.0.1.18:8008"; + paths = [ + "/home/matt" + ]; + exclude = [ + "/home/matt/Games" + "/home/matt/1TB" + "/home/matt/Downloads" + "/home/matt/Nextcloud" + "/home/matt/.cache" + "/home/matt/.local/share/Steam" + "/home/matt/.var/app/com.valvesoftware.Steam" + "/home/matt/.tmp" + "/home/matt/.thumbnails" + "/home/matt/.compose-cache" + ]; + }; + proton-drive = { + initialize = true; + createWrapper = true; + inhibitsSleep = true; + passwordFile = config.sops.secrets."desktop/restic/password".path; + rcloneConfigFile = "/home/matt/.config/rclone/rclone.conf"; + repository = "rclone:proton-drive:backup-nix"; + paths = [ + "/home/matt" + ]; + exclude = [ + "/home/matt/Games" + "/home/matt/1TB" + "/home/matt/Downloads" + "/home/matt/Nextcloud" + "/home/matt/.cache" + "/home/matt/.local/share/Steam" + "/home/matt/.var/app/com.valvesoftware.Steam" + "/home/matt/.tmp" + "/home/matt/.thumbnails" + "/home/matt/.compose-cache" + ]; + }; }; + # borgbackup.jobs.home-matt = { + # encryption.mode = "repokey"; + # encryption.passCommand = "cat /root/borg"; + # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; + # repo = "/media/nas/backup/desktop-nix/borg/home"; + # compression = "auto,zstd"; + # inhibitsSleep = true; + # paths = "/home/matt"; + # exclude = [ + # "/home/matt/Games" + # "/home/matt/1TB" + # ]; + # }; + btrfs = { autoScrub.enable = lib.mkDefault true; autoScrub.fileSystems = lib.mkDefault [ @@ -192,7 +241,7 @@ in user.services = { rclone-home-proton = { - enable = lib.mkDefault true; + enable = lib.mkDefault false; path = [ pkgs.bash pkgs.rclone @@ -203,7 +252,7 @@ in }; rsync-home = { - enable = lib.mkDefault true; + enable = lib.mkDefault false; path = [ pkgs.bash pkgs.rsync @@ -277,6 +326,9 @@ in stable.qemu_full rclone rclone-browser + restic + restic-browser + restic-integrity rsync sane-frontends sbctl @@ -323,6 +375,11 @@ in voltage_offset: 0 power_states: {} ''; + + variables = { + STEAM_FORCE_DESKTOPUI_SCALING = "1.0"; + GDK_SCALE = "1"; + }; }; # Configure nixpkgs diff --git a/hosts/desktop/sops.nix b/hosts/desktop/sops.nix index 07f70cd..9ec11e7 100644 --- a/hosts/desktop/sops.nix +++ b/hosts/desktop/sops.nix @@ -1,4 +1,4 @@ -{ ... }: +{ config, ... }: { sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; @@ -9,5 +9,12 @@ sops.secrets."desktop/hass_token" = { }; sops.secrets."desktop/hass_token".mode = "0777"; + sops.secrets."desktop/restic/user" = { }; + sops.secrets."desktop/restic/password" = { }; + sops.templates."restic.env".content = '' + RESTIC_REST_USER=${config.sops.placeholder."desktop/restic/user"} + RESTIC_REST_PASSWORD=${config.sops.placeholder."desktop/restic/password"} + ''; + sops.secrets."wifi" = { }; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 122c73b..1743703 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -34,6 +34,9 @@ jallen-nas: desktop: matt_password: ENC[AES256_GCM,data:z/Jjzr+/PREpNEQsAVl4soeKAwW3sdteIqjhZT2txQDiR0FvGvEBoE/aYCM9NS7XSCgTeTuOqgBGfq4xDLc5/ZBAl7KoGHmKIQ==,iv:qVONkw8PDI2ydqybqGIU2XFq4+qC1BeXnfwxbxbWBww=,tag:eYOD2EoBn9XMiYOaBDFlRw==,type:str] hass_token: ENC[AES256_GCM,data:un4uyUPcr6g8IIWlXvTCpQ5hXms9FZxaVQz+fk1HMNRdfToTI7OLv8XyYOZ4NOZk5OJcLUUcu2S6zDKL0nc6PUqKD/8X8Rc4wVxEPoAZHiH3EBwuj3LSQac9m2Qlgs17vdfRGkpCt52h5ayPwItop1eb222MXHnQWPsslWT7RIN+kuzQ8prj7MU3ag6lqH8dDZjYQutskF1VkXWolQZkAG8gGZPK+C0BXB5Kxlpx4nYD/pQs2eKr,iv:qR5Jn4QcDISEcLzwmPa7hj9+u5JcQuzdB0qLxlYeK8s=,tag:tSN0CaQz6WsFSw+0fVrDYA==,type:str] + restic: + user: ENC[AES256_GCM,data:ccJZWRM=,iv:fExPV4GW2aIDfJ12OCOmDYGAzRGhOu+mcRcKXSfqQME=,tag:MVRsGgbfW4tmnAmQP4e1Dw==,type:str] + password: ENC[AES256_GCM,data:CjEpTwCAOoIdlb8=,iv:loIX/SmckPIhn9tcIs/eRAbHrbrDe42GeltgwOCo5YE=,tag:F672YtNS1z+9DOewM/7pHQ==,type:str] sops: kms: [] gcp_kms: [] @@ -67,8 +70,8 @@ sops: UGhsN2N0Mjl3UEJvUVlGRlJiN05WaUkKW37lU4G4CLTo6JoHC2OyhKsG/FuO+BiN pzlVJwzRnmAqwklRbc6RMbQLl2EQrp6KQcgYsUxCMH9OQ/9WJ98dxQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-25T19:42:11Z" - mac: ENC[AES256_GCM,data:dzOyTwO0bPCPVqus25r6oEXjjpNjfefkeqk16jW7DXugEcizCmS58nPMCGaHb4KrDyxjkzaMRHm7/tDqfRTtKh/nf14R+geWSk/J+c91cV5xCptfAphP53w5YeJkiOjCF3A08iSwEORvrzFY/xiomhO9xkew0bYzUV38Spe9Vfc=,iv:64NbSqYbO/YwqwlMh3WJgdkPNbNPd6lln2cRIlkmO5I=,tag:1ESax9tQ9ygghVLeHOkfJw==,type:str] + lastmodified: "2025-02-05T01:01:46Z" + mac: ENC[AES256_GCM,data:DPmraPr+E93doWaOVPtX57dBDYQ3NZgLSfzfzZcgsOIYvtB33RhOZjK+hv5KfyGULAByL/1UUoHhMwrM47cvo3aMOZqF4dGlJny8wHWvSlexLIcrZNnfRy9RtHb4Fiqot4SoeHRDHsLWz/aVVS/30hPmi0QdefSbS/Qb+Igt+ww=,iv:tKQ899Rm4LndWGdEiabhFl9WBZ4j8ym1z0rIcQJCEJc=,tag:mu38RclV+Fm73FyGoD+XTQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.3 + version: 3.9.4 diff --git a/share/amd/default.nix b/share/amd/default.nix index 284b19c..384f114 100644 --- a/share/amd/default.nix +++ b/share/amd/default.nix @@ -19,7 +19,11 @@ in # Configure environment environment = { # Force radv - variables.AMD_VULKAN_ICD = "RADV"; + variables = { + AMD_VULKAN_ICD = "RADV"; + STEAM_FORCE_DESKTOPUI_SCALING = "1.0"; + GDK_SCALE = "1"; + }; }; # Hardware configs @@ -66,7 +70,6 @@ in # Configure environment environment = { systemPackages = lib.mkIf cfg.lact.enable [ pkgs.lact ]; - sessionVariables = lib.mkDefault { STEAM_FORCE_DESKTOPUI_SCALING = "1"; }; }; }; }