diff --git a/flake.nix b/flake.nix index 7a5e203..2f42694 100644 --- a/flake.nix +++ b/flake.nix @@ -133,6 +133,7 @@ home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin ./home-manager/shared + sops-nix.homeManagerModules.sops ]; } ]; diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index d4369b7..a6f382d 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -32,32 +32,32 @@ # patches = [ ./change-hello-to-hi.patch ]; # }); # }) - (final: prev: { - catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { - accent = "mauve"; - boldKeywords = true; - italicComments = true; - italicKeywords = true; - extraBordersEnabled = false; - workbenchMode = "default"; - bracketMode = "rainbow"; - colorOverrides = {}; - customUIColors = {}; - }); - }) - (final: prev: { - catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { - accent = "mauve"; - boldKeywords = true; - italicComments = true; - italicKeywords = true; - extraBordersEnabled = false; - workbenchMode = "default"; - bracketMode = "rainbow"; - colorOverrides = {}; - customUIColors = {}; - }); - }) + # (final: prev: { + # catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + # accent = "mauve"; + # boldKeywords = true; + # italicComments = true; + # italicKeywords = true; + # extraBordersEnabled = false; + # workbenchMode = "default"; + # bracketMode = "rainbow"; + # colorOverrides = {}; + # customUIColors = {}; + # }); + # }) + # (final: prev: { + # catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + # accent = "mauve"; + # boldKeywords = true; + # italicComments = true; + # italicKeywords = true; + # extraBordersEnabled = false; + # workbenchMode = "default"; + # bracketMode = "rainbow"; + # colorOverrides = {}; + # customUIColors = {}; + # }); + # }) ]; config = { permittedInsecurePackages = ["cinny-4.2.3" "cinny-unwrapped-4.2.3" "cinny-4.2.2" "cinny-unwrapped-4.2.2"]; @@ -67,30 +67,67 @@ allowUnfree = true; }; }; + systemd.user = { + services."nextcloud-autosync@" = { + Unit = { + Description = "Auto sync Nextcloud"; + After = "network-online.target"; + }; + Service = { + Type = "simple"; + ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /%i /home/lillian/%i https://nextcloud.gladtherescake.eu"; + TimeoutStopSec = "180"; + KillMode = "process"; + KillSignal = "SIGINT"; + }; + Install.WantedBy = ["multi-user.target"]; + }; + services.nextcloud-autosyncs = { + Unit = { + Description = "workers"; + Requires = ["nextcloud-autosync@Music" "nextcloud-autosync@Pictures" "nextcloud-autosync@Scripts" "nextcloud-autosync@Videos" "nextcloud-autosync@Documents"]; + PartOf = "nextcloud-autosyncs.target"; + }; + }; + timers.nextcloud-autosyncs = { + Unit.Description = "Automatic sync files with Nextcloud when booted up after 5 minutes then rerun every 60 minutes"; + Timer.OnBootSec = "5min"; + Timer.OnUnitActiveSec = "60min"; + Install.WantedBy = ["multi-user.target" "timers.target"]; + }; + + # Nicely reload system units when changing configs + startServices = true; + }; + home = { username = "lillian"; homeDirectory = "/home/lillian"; file = { - Music = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Music"; - target = "Music"; - }; - Pictures = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Pictures"; - target = "Pictures"; - }; - Scripts = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Scripts"; - target = "Scripts"; - }; - Videos = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Videos"; - target = "Videos"; - }; - Documents = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Documents"; - target = "Documents"; + # Music = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Music"; + # target = "Music"; + # }; + # Pictures = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Pictures"; + # target = "Pictures"; + # }; + # Scripts = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Scripts"; + # target = "Scripts"; + # }; + # Videos = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Videos"; + # target = "Videos"; + # }; + # Documents = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Documents"; + # target = "Documents"; + # }; + floorp = { + source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; + target = ".floorp"; }; }; @@ -225,7 +262,4 @@ kdeconnect.package = pkgs.kdePackages.kdeconnect-kde; kdeconnect.enable = true; }; - - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; } diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 4b6023e..6985482 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -16,7 +16,6 @@ ]; home.packages = with pkgs; [ - # heroic r2modman ryujinx lutris diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 5d00235..4c54db9 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -93,6 +93,14 @@ # list of latest packages from nixpkgs master # Can be used to install latest version of some packages ]); + sops = { + secrets."nextcloud-password" = { + mode = "0600"; + owner = config.users.users.lillian.name; + path = "/home/lillian/.netrc"; + }; + }; + programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; diff --git a/nixos/hosts/EDI/secrets/sops.yaml b/nixos/hosts/EDI/secrets/sops.yaml index 0d21f88..00adacd 100644 --- a/nixos/hosts/EDI/secrets/sops.yaml +++ b/nixos/hosts/EDI/secrets/sops.yaml @@ -1,5 +1,6 @@ lillian-password: ENC[AES256_GCM,data:0mwqnvA+xrDD/m6uQtPbo9MpcFsOoqHE+Cg2gF6xZzNsqM3i/OmvAe7syp+mGBacZ3avoIHowLSWgXUkMcuFPeYa6XRkrX4LhA==,iv:f1kB54k6ZYWKlZ0Zowu8fOD0cf2WvNlX3GSpy1sUMdA=,tag:dsusc45E1BmYsNmiPzNccg==,type:str] wg-private-key: ENC[AES256_GCM,data:CqXlIN0gKzMrZRJycAf96LUVNw9yCZpHtE8XP+JwV2Ftip46iUksg1uExxQ=,iv:LdcopSz8Hx5hO1M00B8r+C7XViwpjGOpvmoXUHIkFtc=,tag:rbskx98YjcYV1lB8OO2VxQ==,type:str] +nextcloud-password: ENC[AES256_GCM,data:h93FmVY3XZdRZECEzz5ArBPnuRYyp0kJ6UUoxKmWVuVeFVkOzxQ5dGra6R/jZg8ofjhu+WosoDso3S/i,iv:J1K2NMAjv7Y26q91V/f11gNs82/UD6jbrMy0hVh81pw=,tag:/mQFulslQ3Mqabnc0mb1lQ==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +16,8 @@ sops: eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-06T18:01:20Z" - mac: ENC[AES256_GCM,data:UTzeVEUolw6oBrRL8NMEcb5WmJYUdKnnxKYTrV0AowX6B5Jk8e6hSHqMiEmY9yPdS0HGA0i+DirGvrW3TmsOk2XehsiNO9puXb0/6KiaTge4y3/ueVASAPs/qB9RR6EAdBiE1ZUKVy2vpL+x9xp5XY2F8aHIp22DmJ5Xg5oyWJc=,iv:1/Fj2xAKHUebsj1FLmmGAmvHXNYsLXIfP6F7PJ7EH9M=,tag:XvFBu2vCNj7UMbWVPgo94Q==,type:str] + lastmodified: "2025-01-01T15:48:31Z" + mac: ENC[AES256_GCM,data:XebJPNyx+nQ3nUlxVTwibWyEWue67Um2NEdsvvwHH7mcg/0MYXuiwtqZaZCzKsmwHPR2gznO+wRIs5BVeriFZJofnEblSLDSmgzHOQxA2r+YqUVajA7apWWnAMqF4IHpXO/yCdlbwVVwR4uhWuFZvn+xnR7+9I9t15suRteOSd8=,iv:i47H/TT0vpVDTxSPICuBdUxUb00YTOXMjCMBG5gXgQE=,tag:lpHfpDm7i9yIX6HUN7f7JA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.1 + version: 3.9.2 diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 89bde8c..8f9d921 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -21,7 +21,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - # ../../desktop + ../../desktop ../../../disko/GLaDOS diff --git a/nixos/hosts/GLaDOS/secrets/sops.yaml b/nixos/hosts/GLaDOS/secrets/sops.yaml index def2177..d2521b7 100644 --- a/nixos/hosts/GLaDOS/secrets/sops.yaml +++ b/nixos/hosts/GLaDOS/secrets/sops.yaml @@ -1,6 +1,7 @@ lillian-password: ENC[AES256_GCM,data:aHJCYmnpGIWJMsNZ8aw51Rquuv4F7kgGvfIxHMELuDlEqgjkg+SAhh+UQEpv16F0WVxrYZ/EwxKFMBpfPv9M2NLZC98bav0D9g==,iv:uzYLfmxG46ubmgeFsfW7aqXZbcL+TQw0VdDcklV0/ZI=,tag:Ozcf5qXC7xh0VcsBzhyo2g==,type:str] wg-private-key: ENC[AES256_GCM,data:em6sci3eefw5TJHpzgTaGGuQp8UuvOmkHRsQltg0TKpMb1Lrcxicb23cQxo=,iv:VEeGmzncHyAgP5toTOwDK6qw0OT4/6Etxh8Zr4uYQD4=,tag:nvse11zMhzukzClx5ub4dw==,type:str] ssh-private-key: ENC[AES256_GCM,data:YM8GTH6EEXLt1ZC1ZdyLWVJyGUykS0DulTL0QgOFCTztRA+5JoA6Af42MIEMm4sMSatOt9pbGE9BXh5T53uNkx87cS8pfb714N8EKrMTYmtWi2M2TatEM6+qMRpP777GalB3v2HnfTfwhx+TfQ+iSCEo45Unsumzr+/9uZ/b4vYBxbd82UKO1tmlTw3R7aEpesJuJe/I3sAg0ZXTWti0e2MYfFawlSXtgQo382bFnV/mi9JkNx62AUFI6Q0a09V2C3FU4e4qP9jeP+COfCuCjRuaf8eu0VYczy4vVkN5NNBhkuLCZl0xANfqM5tDt8q+meYHmYWq1ceyeZ9OdZhKA7lMJi2K1DgTmgbD356itEtjXb7KF7VWIVnR0Gm+vVHx90Bv6eQp4n2I5mWbCVy8wqiIlacxuH8PO6jAPUM1Q8E+SVJb2HcLPdlURHyyK0fLVWaFhtFH4rwyKAv/2yEO2iNfZd9zFqvX5/JdyUPRCpMKkjxQgZN+raVHok0SwvPfXA9wvRpQyYSD4SUqCYsRcs6JugW8a14bZrvg,iv:L9ACOUFtAxkWsXW+tDKGwKn1ZHYNv7WmBty5krayVu8=,tag:hbrgscOczukqLBU/Y+6aLA==,type:str] +nextcloud-password: ENC[AES256_GCM,data:ClQk7M7BTeIhgWTWsgjTFb0Um8qZ901530dI9xnbs63ZGIni4+bWjLPetOmM3+PPsg33vF6r0xiwu0Ff,iv:jDy8miUoPcua3sraRQWOHWrhNacKEgf6nGsi8PVTYaY=,tag:ldGta+DdUmoajtAE6HLtkw==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +17,8 @@ sops: MUZWTVh0dVdMZlRzelJ4WlROUlIyNmcKphNuMN9Wh8h/gvmtUxQWjPKtgjWriLRD +DpEEVGrmu0RJ8/wUqjxGoL4GzLAlZm4EnKlyUyA0tw8sbLZ2Lnl/w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:09:35Z" - mac: ENC[AES256_GCM,data:yjUFBgTLQI9Nh2tjiNNV2bsPJsDRQChPEptO8Gmt2vLEK/Kuwl0bZ9J+OmOTe4NOpwq5b/lYt0Lj7itEeOWWW5nnz2Jq0/dLMEu0mSxoWv1rOKylhoeG8oIEx0ui7VKfst72UW/jqqm9TUkDzuskVND1pd4DV3/GQRmy16WPkyo=,iv:the5XkB13jRuNP8Kj9Jmn4csIaDPt1NnScXbxPt7Dk4=,tag:aY4hU9v66/AwrtvcLAT/mA==,type:str] + lastmodified: "2025-01-01T15:48:15Z" + mac: ENC[AES256_GCM,data:64DmkqcYlLtzL+9WcgvnSOjF25MiZFkbEsgKP/xLrBBvhqqqm4ev9tk8QGoA5NJPHen+GItX7D3lJgfTyjX6LXn6vLFQWemrEP2+A9hZxnwvtdBjSD5dEl6wHGgY4mvqTJupmpv6Gg8zXP1kh5vsO82Un03TcfyPHVVgmfagpOw=,iv:j/6jJjRoiTUfTW2SJ0Ui6dAVQO9Ij8zN2mrKEhIt7fY=,tag:6r/GNnG/lw42KbWgIBoIzQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.2