From c32e3f902339bebea06b1ff05a8637688348be5d Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 29 Mar 2024 21:57:21 -0400 Subject: [PATCH] more wifi, more git, and more formatting --- users/alice/systems/artemision/default.nix | 12 ++++++------ users/alice/systems/artemision/non-server.nix | 8 -------- users/alice/systems/artemision/programs.nix | 2 +- users/alice/systems/artemision/secrets.yaml | 6 +++--- users/alice/systems/artemision/wifi.nix | 2 ++ users/alice/systems/non-server.nix | 10 ++++------ users/alice/systems/programs.nix | 1 + 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/users/alice/systems/artemision/default.nix b/users/alice/systems/artemision/default.nix index 93e044d..9b7e617 100644 --- a/users/alice/systems/artemision/default.nix +++ b/users/alice/systems/artemision/default.nix @@ -5,12 +5,12 @@ sops = true; modules = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd - #({ pkgs, ... }: { - # nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; - # environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { - # extensions = [ "rust-src" "miri" "rust-analyzer" ]; - # }) ]; - #}) + #({ pkgs, ... }: { + # nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; + # environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { + # extensions = [ "rust-src" "miri" "rust-analyzer" ]; + # }) ]; + #}) { environment.systemPackages = [ inputs.wired-notify.packages.x86_64-linux.default ]; } ]; } diff --git a/users/alice/systems/artemision/non-server.nix b/users/alice/systems/artemision/non-server.nix index 875496d..b223b4d 100644 --- a/users/alice/systems/artemision/non-server.nix +++ b/users/alice/systems/artemision/non-server.nix @@ -36,14 +36,6 @@ }; }; - services = { - autopull = { - enable = true; - ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; - path = /root/dotfiles; - }; - }; - # programs = { # zsh = { # enable = true; diff --git a/users/alice/systems/artemision/programs.nix b/users/alice/systems/artemision/programs.nix index 2a4fe82..a44a89c 100644 --- a/users/alice/systems/artemision/programs.nix +++ b/users/alice/systems/artemision/programs.nix @@ -40,5 +40,5 @@ wget zoxide zsh-nix-shell - ]; + ]; } diff --git a/users/alice/systems/artemision/secrets.yaml b/users/alice/systems/artemision/secrets.yaml index b5ed7e9..51e6c94 100644 --- a/users/alice/systems/artemision/secrets.yaml +++ b/users/alice/systems/artemision/secrets.yaml @@ -10,7 +10,7 @@ example_booleans: - ENC[AES256_GCM,data:gEvfi+Q=,iv:0DrXoZk8OkdUShc7WAKOL8xG26RFZp3M3qYFAb1hDAs=,tag:uemBrdF87nrfLpfnQ8bD8g==,type:bool] apps: spotify: ENC[AES256_GCM,data:bp1pdOfS+VGWLtepUjg7KFWw8Fk=,iv:twGO3CjzRxAU81C93mX8qIEZ/FYIQRJnMd2HIuvP9q8=,tag:AJgs0QGFH30E8+ZpaB02TQ==,type:str] -wifi-env: ENC[AES256_GCM,data:rMGgemyp/zspbZGsSUbjTHfjaMtypo50GH1yMxhMOcaGVA==,iv:diJY8gsdLcqpO6kg0QjHEpGI1/k7pxbXg64Y5ZFlK0A=,tag:WdSrvybUkyXNkV4YqggNsQ==,type:str] +wifi-env: ENC[AES256_GCM,data:NjJEfc0DwJf+tln/11VNuRFs0qQDU6PHWIGF8dCnwP90U+J38mfID3ymtw9wLZ6iR+i56thi2VlpqopT8AoKZLJSPAudKDWjXj3gn0vKuWDKbYY3sKNlKMYVtQxCDE+zishdP0KQ1Dk=,iv:HLajPDs+nJbtOpMVs40iFp41J2MsRjrvHWe8zwH+kJQ=,tag:tQRjy7vMGIr/ZH2lGsICVw==,type:str] #ENC[AES256_GCM,data:pC2Kdy7wNc0=,iv:J7Ggfv6K3dCzL42j5MGd+BjQGseoAoYs4k6+yc3FSiA=,tag:9MriduP9SEIi+c1q4tfzlQ==,type:comment] sops: kms: [] @@ -27,8 +27,8 @@ sops: UlhhNzNjTHdVaXlPOFJhc0EyZGh3RDQK1c7nctmrorze4Kr0Grmcmx3N/UYXPwJc FfClOoGxO+4ZDtxG61SDU1UdYae4loQ8roM8jDIPFMfoEum2bT8oXw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-28T05:38:52Z" - mac: ENC[AES256_GCM,data:cVxaW4uW9FoOvIDdq4V+ugvm5H/jrplduIuULeFaMbH3EReYNKCq2PRv/BB0i7+eoCSSlzok/Ifb3YuLZCuSust0t6+fD2QP94rJsW/3On/QJI7YniHKlDBihqBmNNaOJz8ybo0rNIOCJfIoN5Pcsrk+S7GiELVEBwPrKcSY/mA=,iv:zE2AhXNZllW5+JwcTe31B84cZrRkNvmctsbV38GDkTk=,tag:jKFyMT/GGIY6boUUy2eQuw==,type:str] + lastmodified: "2024-03-30T01:01:22Z" + mac: ENC[AES256_GCM,data:/yIid7ng6G10gFfhxgMW8znWlt/WMw++qw1h55RkMxgHdz0UIFvqmn9akWker9BUTM/Q9RCP9Dz0N4CHaBqWVYJe1hzF92Hm7nMfxEZ+QSk8hjREN7qz0UDXdhA+hL9837rswQdjFwroX801RHUBYsGpfb4BV4pv7yPf84hMk90=,iv:5roKs0TuMDtZ7lcwE0w3YvP55yTWzhxqbDqJNPeHmts=,tag:jCmtIe04Omrlf9BChNNpgA==,type:str] pgp: - created_at: "2024-03-23T05:46:35Z" enc: |- diff --git a/users/alice/systems/artemision/wifi.nix b/users/alice/systems/artemision/wifi.nix index eabe3f0..587e229 100644 --- a/users/alice/systems/artemision/wifi.nix +++ b/users/alice/systems/artemision/wifi.nix @@ -5,6 +5,8 @@ environmentFile = config.sops.secrets."wifi-env".path; networks = { "taetaethegae-2.0".psk = "@PASS_taetaethegae_20@"; + "k".psk = "@PASS_k@"; + "Bloomfield".psk = "@PASS_bloomfield@"; }; }; diff --git a/users/alice/systems/non-server.nix b/users/alice/systems/non-server.nix index e10f8e3..221c774 100644 --- a/users/alice/systems/non-server.nix +++ b/users/alice/systems/non-server.nix @@ -36,12 +36,10 @@ }; }; - services = { - autopull = { - enable = true; - ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; - path = /root/dotfiles; - }; + services.autopull = { + enable = false; + ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; + path = /root/dotfiles; }; programs.zsh = { diff --git a/users/alice/systems/programs.nix b/users/alice/systems/programs.nix index 262d6f2..ea865e1 100644 --- a/users/alice/systems/programs.nix +++ b/users/alice/systems/programs.nix @@ -18,6 +18,7 @@ ferium firefox # gestures replacement + git gpu-viewer headsetcontrol ipmiview