From a7736ba814185a057a893df648f2cf2956e16488 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 31 Mar 2024 21:49:36 -0400 Subject: [PATCH] add gammastep,zerotier,nerdfonts,polkit,pipewire Signed-off-by: ahuston-0 --- users/alice/home.nix | 1 + users/alice/home/gammastep.nix | 20 ++++++++++++ .../systems/artemision/configuration.nix | 5 +++ users/alice/systems/artemision/desktop.nix | 27 ++++++++++------ users/alice/systems/artemision/fonts.nix | 8 +++++ users/alice/systems/artemision/pipewire.nix | 32 +++++++++++++++++++ users/alice/systems/artemision/polkit.nix | 27 ++++++++++++++++ users/alice/systems/artemision/programs.nix | 2 +- users/alice/systems/artemision/secrets.yaml | 6 ++-- users/alice/systems/artemision/wifi.nix | 5 ++- users/alice/systems/artemision/zerotier.nix | 7 ++++ users/alice/systems/programs.nix | 1 + 12 files changed, 126 insertions(+), 15 deletions(-) create mode 100644 users/alice/home/gammastep.nix create mode 100644 users/alice/systems/artemision/fonts.nix create mode 100644 users/alice/systems/artemision/pipewire.nix create mode 100644 users/alice/systems/artemision/polkit.nix create mode 100644 users/alice/systems/artemision/zerotier.nix diff --git a/users/alice/home.nix b/users/alice/home.nix index 0dacebc..cc8d87c 100644 --- a/users/alice/home.nix +++ b/users/alice/home.nix @@ -4,6 +4,7 @@ imports = [ ./home/zsh.nix ./home/doom + ./home/gammastep.nix ]; home = { diff --git a/users/alice/home/gammastep.nix b/users/alice/home/gammastep.nix new file mode 100644 index 0000000..92b8801 --- /dev/null +++ b/users/alice/home/gammastep.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + services.gammastep = { + enable = true; + provider = "manual"; + latitude = 40.73; + longitude = -73.93; + temperature.day = 5700; + temperature.night = 3500; + settings = { + general = { + fade = 1; + elevation-high = 3; + elevation-low = -6; + brightness-day = 1.0; + brightness-low = 0.8; + }; + }; + }; +} diff --git a/users/alice/systems/artemision/configuration.nix b/users/alice/systems/artemision/configuration.nix index c72f321..4178afd 100644 --- a/users/alice/systems/artemision/configuration.nix +++ b/users/alice/systems/artemision/configuration.nix @@ -6,6 +6,10 @@ ./programs.nix ./desktop.nix ./wifi.nix + ./zerotier.nix + ./fonts.nix + ./polkit.nix + ./pipewire.nix ]; time.timeZone = "America/New_York"; @@ -62,6 +66,7 @@ global = { username = "snowinginwonderland@gmail.com"; password_cmd = "cat ${config.sops.secrets."apps/spotify".path}"; + use_mpris = false; }; }; #systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd. diff --git a/users/alice/systems/artemision/desktop.nix b/users/alice/systems/artemision/desktop.nix index bae0209..085cf03 100644 --- a/users/alice/systems/artemision/desktop.nix +++ b/users/alice/systems/artemision/desktop.nix @@ -6,6 +6,8 @@ }: { + # installs hyprland, and its dependencies + programs.hyprland = { enable = true; xwayland.enable = true; @@ -26,15 +28,20 @@ enable = true; #pinentryPackage = pkgs.pinentry-rofi; pinentryPackage = pkgs.pinentry-gnome3; - settings = { - keyserver-options = "auto-key-retrieve"; - auto-key-locate = "hkps://keys.openpgp.org"; - keyserver = "hkps://keys.openpgp.org"; - #keyserver = "hkp://pgp.mit.edu"; - # "na.pool.sks-keyservers.net" - # "ipv4.pool.sks-keyservers.net" - # "p80.pool.sks-keyservers.net" - # ]; - }; + #settings = { + # keyserver-options = "auto-key-retrieve"; + # auto-key-locate = "hkps://keys.openpgp.org"; + # keyserver = "hkps://keys.openpgp.org"; + #keyserver = "hkp://pgp.mit.edu"; + # "na.pool.sks-keyservers.net" + # "ipv4.pool.sks-keyservers.net" + # "p80.pool.sks-keyservers.net" + # ]; + #}; }; + + environment.systemPackages = with pkgs; [ + libsForQt5.qt5.qtwayland + qt6.qtwayland + ]; } diff --git a/users/alice/systems/artemision/fonts.nix b/users/alice/systems/artemision/fonts.nix new file mode 100644 index 0000000..e9756e6 --- /dev/null +++ b/users/alice/systems/artemision/fonts.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + fonts = { + fontconfig.enable = true; + enableDefaultPackages = true; + packages = with pkgs; [ nerdfonts ]; + }; +} diff --git a/users/alice/systems/artemision/pipewire.nix b/users/alice/systems/artemision/pipewire.nix new file mode 100644 index 0000000..223abb2 --- /dev/null +++ b/users/alice/systems/artemision/pipewire.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + # rtkit is optional but recommended + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + }; + + services.pipewire.wireplumber.configPackages = [ + (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + '') + ]; + + environment.systemPackages = with pkgs; [ pavucontrol ]; +} diff --git a/users/alice/systems/artemision/polkit.nix b/users/alice/systems/artemision/polkit.nix new file mode 100644 index 0000000..2655902 --- /dev/null +++ b/users/alice/systems/artemision/polkit.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + security.polkit.enable = true; + environment.systemPackages = with pkgs; [ polkit_gnome ]; + + systemd = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; +} diff --git a/users/alice/systems/artemision/programs.nix b/users/alice/systems/artemision/programs.nix index a44a89c..d6be284 100644 --- a/users/alice/systems/artemision/programs.nix +++ b/users/alice/systems/artemision/programs.nix @@ -17,7 +17,6 @@ lsof lynis ncdu - nerdfonts neofetch nix-init nix-output-monitor @@ -36,6 +35,7 @@ tokei tree unzip + uutils-coreutils-noprefix ventoy wget zoxide diff --git a/users/alice/systems/artemision/secrets.yaml b/users/alice/systems/artemision/secrets.yaml index 51e6c94..270eb33 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:NjJEfc0DwJf+tln/11VNuRFs0qQDU6PHWIGF8dCnwP90U+J38mfID3ymtw9wLZ6iR+i56thi2VlpqopT8AoKZLJSPAudKDWjXj3gn0vKuWDKbYY3sKNlKMYVtQxCDE+zishdP0KQ1Dk=,iv:HLajPDs+nJbtOpMVs40iFp41J2MsRjrvHWe8zwH+kJQ=,tag:tQRjy7vMGIr/ZH2lGsICVw==,type:str] +wifi-env: ENC[AES256_GCM,data:B0uD10unz8QC5FiWFyqh1bNiUOkxvVL9dI+TzAs88i6h8uqp0fXPVI1mUy5A75X2VhGhYBnPBXLWLTbEq5RHKkGo89P2/kM5eNrimNPfKWM0PoKWu2gwQXctfWUzQmjc+f6NmfT7dDG3ANWEr+A2HAAItHtGJr8SqoffEypEChKxVE3PHSA=,iv:Xk+DSZ40uqS7ZixCGp+aRJX1WOyYa5PwLL6jMtvEOp0=,tag:l5pJ4BRJACswmbYUN0NfwQ==,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-30T01:01:22Z" - mac: ENC[AES256_GCM,data:/yIid7ng6G10gFfhxgMW8znWlt/WMw++qw1h55RkMxgHdz0UIFvqmn9akWker9BUTM/Q9RCP9Dz0N4CHaBqWVYJe1hzF92Hm7nMfxEZ+QSk8hjREN7qz0UDXdhA+hL9837rswQdjFwroX801RHUBYsGpfb4BV4pv7yPf84hMk90=,iv:5roKs0TuMDtZ7lcwE0w3YvP55yTWzhxqbDqJNPeHmts=,tag:jCmtIe04Omrlf9BChNNpgA==,type:str] + lastmodified: "2024-03-30T20:46:58Z" + mac: ENC[AES256_GCM,data:vQqivKr2s2rEs2F3E/7t37kczCvrNiH5/X++WQfBHmsIYS66EuJiHml3ec/j6Bgm9voEVWtfl7BjnKxcxQdXzzM2PIbn9TBI6wP3JYNsvUTLoAZQ6psKIo90uub3idFcfCUGLiEL/OtCScLCSCPUYIvK5WAoQ0BQ4JqfsAvRuz8=,iv:ffcpayEibCv3kj0YxDOjWpSmale7PbyoEAH5WKyWi7s=,tag:CzXCuYoXnMosrceStJ0qTQ==,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 587e229..b3379de 100644 --- a/users/alice/systems/artemision/wifi.nix +++ b/users/alice/systems/artemision/wifi.nix @@ -7,6 +7,10 @@ "taetaethegae-2.0".psk = "@PASS_taetaethegae_20@"; "k".psk = "@PASS_k@"; "Bloomfield".psk = "@PASS_bloomfield@"; + "9872441500".psk = "@PASS_longboat_home@"; + "9872441561".psk = "@PASS_longboat_home@"; + "5HuFios".psk = "@PASS_longboat_home@"; + "24HuFios".psk = "@PASS_longboat_home@"; }; }; @@ -15,7 +19,6 @@ "9.9.9.9" ]; - #pinentryPackage = pkgs.pinentry-rofi; services.resolved = { enable = true; dnssec = "true"; diff --git a/users/alice/systems/artemision/zerotier.nix b/users/alice/systems/artemision/zerotier.nix new file mode 100644 index 0000000..6bd43fd --- /dev/null +++ b/users/alice/systems/artemision/zerotier.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + services.zerotierone = { + enable = true; + joinNetworks = [ "52b337794f23c1d4" ]; + }; +} diff --git a/users/alice/systems/programs.nix b/users/alice/systems/programs.nix index ea865e1..6c63492 100644 --- a/users/alice/systems/programs.nix +++ b/users/alice/systems/programs.nix @@ -24,6 +24,7 @@ ipmiview ipscan kitty + libtool masterpdfeditor4 mons # nbt explorer?