diff --git a/.gitignore b/.gitignore index 7ab9c97..55f30a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +secrets/ modules/services/matrix/default.nix result diff --git a/.sops.yaml b/.sops.yaml deleted file mode 100644 index 69afeda..0000000 --- a/.sops.yaml +++ /dev/null @@ -1,9 +0,0 @@ -keys: - - &sakura age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w - - &violet age1zegau3chyn53tqvkwud6tuyggpkazc88pdkqv8cknavaudu49enqm2f0h3 -creation_rules: - - path_regex: secrets/secrets.yaml - key_groups: - - age: - - *sakura - - *violet diff --git a/flake.lock b/flake.lock index c6d5cbf..a412133 100644 --- a/flake.lock +++ b/flake.lock @@ -1,10 +1,52 @@ { "nodes": { + "Hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1752663231, + "narHash": "sha256-rTItuAWpzICMREF8Ww8cK4hYgNMRXJ4wjkN0akLlaWE=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "0a82e3724f929de8ad8fb04d2b7fa128493f24f7", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "alejandra": { "inputs": { "fenix": "fenix", "flakeCompat": "flakeCompat", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1660592437, @@ -54,6 +96,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -155,7 +219,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -210,6 +274,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -231,7 +316,7 @@ }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1753252360, @@ -319,7 +404,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -518,8 +603,8 @@ "inputs": { "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" }, "locked": { "lastModified": 1750371999, @@ -541,8 +626,8 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_3", - "nixpkgs": "nixpkgs_4", - "systems": "systems_3" + "nixpkgs": "nixpkgs_5", + "systems": "systems_5" }, "locked": { "lastModified": 1753378338, @@ -755,16 +840,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657425264, - "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=", - "owner": "nixos", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -786,27 +871,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", - "owner": "NixOS", + "lastModified": 1657425264, + "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -833,6 +918,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1753429684, "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", @@ -848,7 +949,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1743315132, "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", @@ -864,7 +965,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1742800061, "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", @@ -880,7 +981,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1753429684, "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", @@ -896,26 +997,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim_2" }, "locked": { @@ -935,7 +1020,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -955,7 +1040,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1753530457, @@ -1020,17 +1105,18 @@ }, "root": { "inputs": { + "Hyprspace": "Hyprspace", + "agenix": "agenix", "alejandra": "alejandra", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpicker": "hyprpicker", "hyprsunset": "hyprsunset", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", - "nur": "nur", - "sops-nix": "sops-nix" + "nur": "nur" } }, "rust-analyzer-src": { @@ -1050,24 +1136,6 @@ "type": "github" } }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -1085,16 +1153,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1114,6 +1182,36 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 93bb76a..34b2afc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,26 +2,35 @@ description = "liv's NixOS configuration"; inputs = { + agenix.url = "github:ryantm/agenix"; alejandra.url = "github:kamadorueda/alejandra/3.0.0"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + hyprland = { + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; hyprsunset.url = "github:hyprwm/hyprsunset"; + Hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync. + }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; nixos-hardware.url = "github:nixos/nixos-hardware"; nixvim.url = "github:ahwxorg/nixvim-config"; - sops-nix.url = "github:Mic92/sops-nix"; }; outputs = { self, nixpkgs, - sops-nix, + agenix, ... }@inputs: let @@ -40,7 +49,7 @@ inherit system; modules = [ (import ./hosts/sakura) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "sakura"; @@ -51,7 +60,7 @@ inherit system; modules = [ (import ./hosts/yoshino) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "yoshino"; @@ -62,7 +71,7 @@ inherit system; modules = [ (import ./hosts/ichiyo) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "ichiyo"; @@ -73,7 +82,7 @@ inherit system; modules = [ (import ./hosts/violet) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "violet"; @@ -84,7 +93,7 @@ inherit system; modules = [ (import ./hosts/dandelion) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "dandelion"; @@ -95,7 +104,7 @@ inherit system; modules = [ (import ./hosts/lily) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "lily"; @@ -106,7 +115,7 @@ inherit system; modules = [ (import ./hosts/zinnia) - # sops-nix.nixosModules.sops + agenix.nixosModules.default ]; specialArgs = { host = "zinnia"; diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index dff5d04..f44da1b 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -12,7 +12,6 @@ ./../../modules/core/virtualization.nix ./../../modules/services/tailscale.nix ./../../modules/services/mpd.nix - ./../../modules/services/smart-monitoring.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; diff --git a/modules/core/agenix.nix b/modules/core/agenix.nix new file mode 100644 index 0000000..7a13dbd --- /dev/null +++ b/modules/core/agenix.nix @@ -0,0 +1,13 @@ +{ + config, + system, + pkgs, + lib, + inputs, + ... +}: +{ + environment.systemPackages = [ + inputs.agenix.packages."${system}".default + ]; +} diff --git a/modules/core/network.nix b/modules/core/network.nix index dd950fc..919bb45 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -1,10 +1,7 @@ { pkgs, ... }: { networking = { - networkmanager = { - enable = true; - wifi.macAddress = "stable-ssid"; - }; + networkmanager.enable = true; nameservers = [ "9.9.9.9" ]; firewall = { enable = true; diff --git a/modules/core/program.nix b/modules/core/program.nix index 5def924..2e7a9e7 100644 --- a/modules/core/program.nix +++ b/modules/core/program.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, agenix, ... }: { programs = { dconf.enable = true; @@ -15,5 +15,6 @@ git dig traceroute + # agenix.packages.x86_64-linux.default ]; } diff --git a/modules/core/security.nix b/modules/core/security.nix index a7c557e..f95be92 100644 --- a/modules/core/security.nix +++ b/modules/core/security.nix @@ -8,17 +8,9 @@ security = { rtkit.enable = true; pam.services.swaylock = { }; - auditd.enable = true; - audit = { - enable = true; - rules = [ - "-a exit,always -F arch=b64 -S execve" - ]; - }; sudo = { enable = true; - execWheelOnly = true; extraRules = [ { groups = [ "wheel" ]; @@ -28,7 +20,7 @@ options = [ "NOPASSWD" ]; } { - command = "/run/current-system/sw/bin/framework_tool --privacy"; + command = "/home/liv/.local/src/framework-system/target/debug/framework_tool"; options = [ "NOPASSWD" ]; } ]; diff --git a/modules/core/sops.nix b/modules/core/sops.nix deleted file mode 100644 index d57f4d9..0000000 --- a/modules/core/sops.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - pkgs, - inputs, - username, - ... -}: -{ - imports = [ inputs.sops-nix.nixosModules.sops ]; - - sops = { - defaultSopsFile = ../../secrets/secrets.yaml; - defaultSopsFormat = "yaml"; - age.keyFile = "/home/${username}/.config/sops/age/keys.txt"; - secrets = { - "systemMailerPassword" = { }; - }; - }; - - environment.systemPackages = with pkgs; [ - sops - ]; -} diff --git a/modules/core/system.nix b/modules/core/system.nix index cc2ab7c..3fff33f 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -8,12 +8,13 @@ { nix = { settings = { - allowed-users = [ "@wheel" ]; auto-optimise-store = true; experimental-features = [ "nix-command" "flakes" ]; + # substituters = [ "" ]; + # trusted-public-keys = [ "" ]; }; gc = { automatic = true; diff --git a/modules/core/user.nix b/modules/core/user.nix index 756878a..a6b72b9 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -10,7 +10,6 @@ imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles/default.nix ] - ++ [ ./sops.nix ] ++ [ ./../../variables.nix ]; home-manager = { useUserPackages = true; @@ -39,6 +38,8 @@ fonts.fontconfig.antialias = false; + users.groups.gay = { }; + users.users.${username} = { isNormalUser = true; description = "${username}"; @@ -47,8 +48,8 @@ "wheel" "docker" "input" + "gay" "dialout" - "wheel" ]; shell = pkgs.zsh; }; diff --git a/modules/home/scripts/scripts/unfuck.sh b/modules/home/scripts/scripts/unfuck.sh index 4e7dbb6..d49273e 100644 --- a/modules/home/scripts/scripts/unfuck.sh +++ b/modules/home/scripts/scripts/unfuck.sh @@ -26,9 +26,7 @@ unfuck_wallpaper() { } unfuck_fingerprint() { - notify-send "Touch sensor or use YubiKey." "Sleeping for 10 seconds." - sleep 10 - sudo systemctl restart fprintd.service + systemctl restart fprintd.service } unfuck_bar() { @@ -39,8 +37,6 @@ unfuck_bar() { unfuck_networkmanager() { # sudo modprobe -r iwlwifi # sudo modprobe iwlwifi - notify-send "Touch sensor or use YubiKey." "Sleeping for 10 seconds." - sleep 10 sudo systemctl restart NetworkManager } diff --git a/modules/home/waybar/scripts.nix b/modules/home/waybar/scripts.nix index a4a7bb7..c24b8d3 100644 --- a/modules/home/waybar/scripts.nix +++ b/modules/home/waybar/scripts.nix @@ -187,8 +187,8 @@ LTEXT="󰛧 " fi - MICROPHONE_STATE="$(sudo framework_tool --privacy | tail -n2 | head -n1)" - CAMERA_STATE="$(sudo framework_tool --privacy | tail -n1)" + MICROPHONE_STATE="$(sudo /home/liv/.local/src/framework-system/target/debug/framework_tool --privacy | tail -n2 | head -n1)" + CAMERA_STATE="$(sudo /home/liv/.local/src/framework-system/target/debug/framework_tool --privacy | tail -n1)" if [[ "$(echo $MICROPHONE_STATE | grep 'Microphone: Connected')" ]]; then MIC=1 diff --git a/modules/services/email.nix b/modules/services/email.nix deleted file mode 100644 index 5876fa9..0000000 --- a/modules/services/email.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - config, - ... -}: -{ - programs.msmtp = { - enable = true; - accounts.default = { - auth = true; - tls = true; - port = 465; - host = "smtp.migadu.com"; - from = config.liv.variables.senderEmail; - user = config.liv.variables.senderEmail; - passwordeval = "${pkgs.coreutils}/bin/cat ${config.sops.secrets.systemMailerPassword.path}"; - }; - }; -} diff --git a/modules/services/smart-monitoring.nix b/modules/services/smart-monitoring.nix index 055b0ae..0b4e63c 100644 --- a/modules/services/smart-monitoring.nix +++ b/modules/services/smart-monitoring.nix @@ -1,15 +1,7 @@ -{ config, host, ... }: +{ config, ... }: { - imports = [ ./email.nix ]; services.scrutiny = { - # Enable based on name of host - enable = - if (host == "dandelion") then - true - else if (host == "lily") then - true - else - false; + enable = true; collector.enable = true; settings.web.listen.port = 8181; settings.notify.urls = [ @@ -18,20 +10,18 @@ ]; }; - services.smartd = { - enable = true; - autodetect = true; - notifications = { - wall = { - enable = true; - }; - mail = { - enable = true; - sender = config.liv.variables.senderEmail; - recipient = config.liv.variables.email; - }; - }; - }; + # services.smartd = { + # enable = true; + # autodetect = true; + # notifications = { + # mail = { + # enable = true; + # # mailer = "/path/to/mailer/binary"; # Need to get system emails working first + # sender = "${config.liv.variables.fromEmail}"; + # recipient = "${config.liv.variables.toEmail}"; + # }; + # }; + # }; # services.nginx.virtualHosts."" = { # locations."/" = { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml deleted file mode 100644 index 0dab49b..0000000 --- a/secrets/secrets.yaml +++ /dev/null @@ -1,30 +0,0 @@ -systemMailerPassword: ENC[AES256_GCM,data:fdCLxxQOPw00kSGrddcr/ZsYWJ9xYPkfxUeS52jA+MNM4dNNfeQ2rhvWKLYpH/6D3/J7CND0UNUVuRLtPdEnU8ct8jkAmYX5nGDm9HAnVScDvbn5dMvaNxg+0o34Fz7E0XbmRM3B6zpzL4T6Odmmd2iRh/cRiz7WBwmKUpcCV3Q=,iv:ddPxnK6f1wEH+xxQLLADO5SdG8YZkbSVlNfan+AA4vs=,tag:WLrQzVsok6dtxSSQH3HHsw==,type:str] -# -# -# -#ENC[AES256_GCM,data:WflW57V0HPZBinBmThQZxDjILXgY62hOrQLKjp2mElmaHt09pd0SS/qZvYZEyLQ=,iv:1GF427GJB8sZbD4cPYiX6vWXW+g7ITAyXz8dWPqpcvM=,tag:SewPaiwvOXfuYu1boXbEkg==,type:comment] -hello: ENC[AES256_GCM,data:ayluRTSd1xDWGf1K+rMibtj+9fCDy5GMwv0wTDdf1C2hIQeColi6gUdpYTwwZw==,iv:DfG10vFe0HAaCnN8e6ik3QixjhTj2KsDGiwg6XufpBQ=,tag:Y1q3uREa3CXSFZBJMYc6cQ==,type:str] -example_key: ENC[AES256_GCM,data:YdS40bL6x1LmRwg76Q==,iv:5FdtHG3iE50vktShWVdkv9oBrUQoqUesGSvPoaD0j2U=,tag:DDaJXIyozB6N2Cj6Bxk1nA==,type:str] -#ENC[AES256_GCM,data:VMGPI7MXiCSTO9QDlT5DUg==,iv:qkKFWGJKQswSdvetMrn3oD1o3c5nzk1UUDpjlbNnRgY=,tag:ZdP7az9j92eYzfQSqFF5gQ==,type:comment] -example_array: - - ENC[AES256_GCM,data:afMceLch3kcnHzf73Ic=,iv:CQbLPVQVo4QB696Z6J5tgF+1/ZL+9/rKOuGsY8xV1XI=,tag:8yG6JXG9C4KXhiA+AyeSGg==,type:str] - - ENC[AES256_GCM,data:QIa8LkkS1c3AW3T3hbs=,iv:8v20+UPaPnddw8WPJo1tTpf/o7Xi+3cFnwjNOM0UaqQ=,tag:FbWSFLwTcDwBtd+gGeONNg==,type:str] -example_number: ENC[AES256_GCM,data:7ok2x8uHYpAFoQ==,iv:S16WiwAx0OWtuDeuLINJH8xllMGWxzt/3+K5/RNlY5U=,tag:6ytIj66O8rRtTObpmIB/UQ==,type:float] -example_booleans: - - ENC[AES256_GCM,data:Npqj1Q==,iv:uPFu6d24WJVz4N0eOKRSgDgiHYxQoAhPqNRY0dk9rVQ=,tag:V9FEUgx8W707N+q+K63yoA==,type:bool] - - ENC[AES256_GCM,data:J1LcbM8=,iv:TLFH/WyteSCphbR4IlzUr12sUfmCj3mpIeBbBqfNnb4=,tag:YDEJvQB8c8xEeXOupNrYmQ==,type:bool] -sops: - age: - - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3cFNzYWRSTTdwMXY1K3hK - MEJ6TEN1YS9XdkJOclhmWVVBWmxJcEsrdWxjCld4NThJdmoyMGRKbFNVZWdWQ1FQ - MmpQMm1TOTZhQlllWlV4Y0tiUGxDNkkKLS0tIFVBcEgzNlBVaHozOTViZG1FcXIx - bjBJd2RtdDhkSFlaUzVRTkQyTVpVSDgKoZ7S/izFqmPw3qHT37ws8m2Cmmb8prC/ - JaVn8U57G4aRgp1BqXQvpnKA98HT3BwEsMce5LeNvX7kAtdqkU5eRQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-07-27T23:20:55Z" - mac: ENC[AES256_GCM,data:hKxGeDETPmOxbyXm2zd/wNKY8nmlUGjbBQorV2pmUgFSNGXxkZifwzT5b0E4ZWaxWyO0bqqEH/jRkIwrU46SDN+RAqZBm5iDwFfmV9QPOlUOgfPDFi2Ho8yDlouvjB6FkwJwooGF3uvGs1bM2in9WMCcI+GFiEi5+VOHBmKtx8U=,iv:1gKoMdKhujmvMyAi4cU4av5tkSPY2ykJShMTtK+2Dnk=,tag:AhuWcD9+Gi9UsQXJm/6qEQ==,type:str] - unencrypted_suffix: _unencrypted - version: 3.10.2 diff --git a/variables.nix b/variables.nix index 9d61168..95798b8 100644 --- a/variables.nix +++ b/variables.nix @@ -29,11 +29,5 @@ in readOnly = true; description = "My primary email"; }; - senderEmail = mkOption { - default = "notifications@liv.town"; - type = types.str; - readOnly = true; - description = "Emailaddress used to send mails from the system"; - }; }; }