diff --git a/dotfiles/lib/functions/set_volume b/dotfiles/lib/functions/set_volume index 7639c16f..bae90b12 100755 --- a/dotfiles/lib/functions/set_volume +++ b/dotfiles/lib/functions/set_volume @@ -1,10 +1,6 @@ #!/usr/bin/env sh function set_volume { - current_default=$(pahelper list | grep '*' | all_after_char ":" | xargs) - environment_variable_exists USE_ONLY_O_PASINK && pahelper "$current_default" - - # XXX: this does not prevent volumes higher than 100 pulsemixer "$@" pashowvolume } diff --git a/dotfiles/synergy.conf b/dotfiles/synergy.conf index 8734b9fa..1eb184d2 100644 --- a/dotfiles/synergy.conf +++ b/dotfiles/synergy.conf @@ -13,7 +13,7 @@ section: aliases tv: imalison-arch imalison-desktop - imalison-home + imalison-home justin-bieber-creek controlling: uber-loaner imalison-mpb-arch @@ -22,4 +22,5 @@ section: aliases kat-uber-loaner Dean-PC imalison-mbp + strixi-minaj end diff --git a/nixos/base.nix b/nixos/base.nix index a4d10897..afab3682 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -40,7 +40,12 @@ makeEnable config "myModules.base" true { # Audio hardware.pulseaudio.enable = false; - services.pipewire.audio.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; # Bluetooth hardware.bluetooth.enable = true; diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 3a9300c3..678123cd 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -88,6 +88,7 @@ makeEnable config "myModules.desktop" true { # Audio picard + pavucontrol playerctl pulsemixer espeak diff --git a/nixos/overlay.nix b/nixos/overlay.nix index 8ddbae62..b761c400 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -79,7 +79,7 @@ final: prev: rev = "509628a9be2cf61116b6d0475e19c0b92a855e0b"; hash = "sha256-ewSxVv+8r2VGYNOoj8jiMogXtp1GPApcRc2BH3Q+8W8="; }; - build-system = with final.python3.pkgs; [ poetry-core ]; + build-system = with final.python3.pkgs; [ poetry-core setuptools ]; pythonImportsCheck = [ "wyoming_satellite" ]; diff --git a/nixos/plasma.nix b/nixos/plasma.nix index 1ec32fd9..4b37c370 100644 --- a/nixos/plasma.nix +++ b/nixos/plasma.nix @@ -1,6 +1,11 @@ -{ config, makeEnable, ... }: +{ pkgs, config, makeEnable, ... }: makeEnable config "myModules.plasma" true { - services.displayManager.sddm.enable = true; + services.displayManager.sddm = { + enable = true; + extraPackages = with pkgs; [ + # sddm-astronaut + ]; + }; services.xserver = { desktopManager.plasma5.enable = true; }; diff --git a/nixos/secrets/1896Folsom-k3s-token.age b/nixos/secrets/1896Folsom-k3s-token.age index 15947dda..cf70b0c7 100644 Binary files a/nixos/secrets/1896Folsom-k3s-token.age and b/nixos/secrets/1896Folsom-k3s-token.age differ diff --git a/nixos/secrets/api_service_account_key.json.age b/nixos/secrets/api_service_account_key.json.age index 079dc1e5..c80a253f 100644 Binary files a/nixos/secrets/api_service_account_key.json.age and b/nixos/secrets/api_service_account_key.json.age differ diff --git a/nixos/secrets/cache-priv-key.pem.age b/nixos/secrets/cache-priv-key.pem.age index 81dc722b..8bbdc290 100644 --- a/nixos/secrets/cache-priv-key.pem.age +++ b/nixos/secrets/cache-priv-key.pem.age @@ -1,52 +1,56 @@ age-encryption.org/v1 --> ssh-ed25519 ZgrTqA 7agMrtnFMA8aTh6UjWV742qSjUcfA70O2m7raOPpZgk -R/I8yO/GmhyrmaCSOhYMLgU1BxRGSX+G0HmA4px+dKA --> ssh-ed25519 ZaBdSg n0FhE6z0Ienu2BkXM+6F4BLVGLfd7wGxaZtFaz9Z5wc -HzbQAP/qTCXVs3qreBaSwNt4I6hPZsWgMZmJM5dkoBQ --> ssh-ed25519 MHZylw Iy6GlN9INu0gV71Ja1pdkSy4eN5k3+UMUIff40RJMDk -hvK64Q9lpCht5L03o2tzL4OUQc2t9Mho0PSx7tS5nlA --> ssh-ed25519 sIUg6g 6i/77i2OdEKCim0zkm1Mh8njxsWOXFm5irM52GK8aTg -kTJck0RQ0/bLxCOonJMZY2DlDTquJzIEvoWj4/mameU --> ssh-ed25519 TnanwQ NGtRXDjOE+K2NQm6uTgr7WLF5GEx9YvbBwj5ZB4X+m4 -j0sGO6bejOk+lKrbrUV8XMAPWHsixEYHZIHZWx0mr9A +-> ssh-ed25519 ZgrTqA +u18TitbmPrZLwLNMT5C9wbkXPeROgHrh3Tb1RpE52s +WcIdsXKxuTOEeja8mh5qoZ38hSlyS2K0WFS4sB/yKv8 +-> ssh-ed25519 ZaBdSg f9kJeTDYYwQLbfL0lfSZjAkRj/8i7MOzp9MQ8ojEl0s +Ez8Pmw5sLZUNWE6nIswzE6mQxZiAhKERLbD7MT/RTN4 +-> ssh-ed25519 MHZylw P/KulIF/w8YmSUpXObabu0El/rGAuETPvMGHLdfpR10 +Mz9S83bVirlz+pjOrEsJP8oRIBz6PdneMopEshYbj/I +-> ssh-ed25519 sIUg6g mobkna3lBZAMq7IwqR4uV5Bg6c353po4/+YY8Iqg/Bg +rCyfVkXKoPotBEEb6r3T56sRdjn9fC+taxrnRZuUSvc +-> ssh-ed25519 TnanwQ hCPpi8mAGltRM8bpl5OoFGVToPy58Pia9ElyCIi1enM +o9m5Zzl+8kDPEFkQ/evupeGJG6S4aiZk+PaUxlvMTSU +-> ssh-ed25519 cH4aug mR6lvjeeWSUmK50rsOjGGG6ccwzTpGVt97dW1rEEqQo +AQvUomG2XgQo6dFIkZ24N97l8/B3F9WnN/KVGzITcz8 +-> ssh-ed25519 ggrAFQ lYeue71aHAhUsy/LOgDPCNmavQEl9VIVnOVC/W/VoWk +SwYzh1DpS5WHSdX2e16wkDUwm1Sa3ARHPF9UBycdHUg -> ssh-rsa gwJx0Q -qq/z1Sg+XNa8+DcjTKuQomO0iSm8cTiX6oOMTkadr8w4DWvr/tGeGvBh/7Y4kQHV -2MXU4cT6wz2kZlIDZuUOoGOVOR6yOpMWib9AheJI62g6rmybdvBRsgtXSh5Ixqv+ -HmOGV29byOskIuEEtmTFPqEulORQtNs0TtdgOhxDw9E3p3cnFE97FLCOnaE5McAr -UxPzSwDpWUxU5V4iHOLrNUL8jP4sRa9leidPAFkLsgrKbTEABiU80utmbK8CnYPN -t0HuK4pByhgdqedOwiGnJWv6onabsfOrdGE7aKQeMVIuiVKrUbo+UkSCqNCEeupY -9Xun4Z81tZNBThVpeDRK5g --> ssh-ed25519 YFIoHA qVkfz9ZxEAsPFTfBQ3Sa8UmQ4cQbvDjfiqchTgjccyE -rqMMdU/Uj7FkwhU1s7GfdwYGlr3tF2VPTJk9RW7sxvw --> ssh-ed25519 KQfiow UpNvzen0xfeWIByjKxhmK0JY8sfQisydB+ylYPTOa04 -7i61sLdvoy64mAD5J65FrbS0jps4oK4cHlmjLT1v8RY --> ssh-ed25519 kScIxg fYyUaq6FjLCtD8cnJS7NS4qDBI9rf6nJOidhmWnLeD4 -egYBVdvxqnexI+UAAxKGEVUF7FDv4SKKSpOqc/lWxqs --> ssh-ed25519 HzX1zw O6upw4miXJY8VntrVWhAVhi+zHBuDzlIU70i8uMyzkQ -/34NSqFSmVyLCBQCEQM7gBmtK71MyDUdc6QGi0OEUvE --> ssh-ed25519 KQfiow GiZn8zhwc0LdJ8zlnqMlpqZxCxIYVlXTg4x1XXbsEl8 -8thj/vl2E0ngmK9L3001dg085+q1CkGKhTdM/ddVZq8 --> ssh-ed25519 1o2X0w 5+q/uUjueuK9zMkEPSE7/pQiJcZn/VgG/9+ad9PFqRk -gh3Z82H74dDFL3Cp0X0fRo4jkCIFffhZf+7bsxvPM0w --> ssh-ed25519 KQ5iUA 3KbeUE2ly9x1fVpHzLsDsDaf0Z1zACzhr+LHyiG1I08 -cpfTkOsQm92CkbHdI4817hEp839Ei+hZ/7cnad1MFaY --> ssh-ed25519 AKGkDw YkhCeqbRINO6gR5/GpC6oulFKxUdzWOi1+kxi23X3jA -DXmOO+PVwqn7AJPBYjaKmmn+P4gduF/zNQK0xLef6sM --> ssh-ed25519 0eS5+A N+jjZTJGK+h7u1ySFNufhy+jndAEja9+MBoAD96qGgM -m8dk2bdLrE2HNFdVgIEtdq9Qr8O9I+APHLaQpZBJSW0 --> ssh-ed25519 9/4Prw ahp6WIh7Er9G+QVTpVj9Den6Gh/10z/qihNbqAoTu0E -hTfqDKD7b97df2DbA/I7pN6jAyDuH/cv0b3Fre5+8zk --> ssh-ed25519 gAk3+Q QSJjPEwFXakPhZHAVU4BzdTRd8g1KE6v0fVdOAB6/w0 -2goRLrusz6MBGWUMNW5LW/CUviciR3nV6qVSDhKAkSk --> ssh-ed25519 X6eGtQ G/eU4DBQFVwMZRyKjFsQpkaDyGgSphEuBAAk1BYBLTw -Uwe8wL6nj2FdQUTTGTi+kq84z5wRKiV0+9QBY0XQuV8 --> ssh-ed25519 0ma8Cw z//fQ3BSwaoJoQnGVc28FSbcAGUI3rbrfVxFJa4bTV8 -BLiCiQ6LqmMVGT6WDMuA4pL7fyszKALA0lsNafLcxfw --> ssh-ed25519 Tp0Z1Q nt6X3ZoKC8A+HLIhmo8COrXamPSbsRIZ65dixix2QHg -0/lCKe6Ew/h+DTf7udM9tRL11x95ZFRTOoWI7qxcl5w --> ssh-ed25519 ePNWZQ 1n7gscBIjibhD1T4Z9RGSsVVKFnywBZBVX3+i4q93Co -Dr4M/+3wrXy+O8TyjjHS3hKqw5GYj7DqRBIUylcSieI --> ssh-ed25519 hILzzA HMPyq+rAaiXR8YJ3UHqMaW1McBpkqR5ug0AeJjliGQk -NXMBlaRxSvLII+oNgONTuTay0jnF8BiSBE3rqcAVlJA ---- u9E/Yn9nogYG1tlq5ySLqmAY4TZrWAw9Wda7QfVmQ64 -|omG#Wc4MfɏŀB9gT8Aː"2=zV{K_to)'jjۧl%XǏy#/A Ξ9GŠO. oLa~,Dt ssh-ed25519 YFIoHA Q8+eEd7maA4f64SGQfyk0pRuxY2WiD3UzHuLmzIPvVc +XWV6IuKDftDStCgj4brPMaTvea+kIlYg7JGnkyX1+Ps +-> ssh-ed25519 KQfiow rra4AZqxS0duGI0GrMAGt1KnUVRyBbnGcZhsu2QeCxM +jaIThcqxxxh9atSgrVEzMFsDip5aNTxWaekgIw+lLKw +-> ssh-ed25519 kScIxg NBVuAT7UXhPMu1THkAXJ1QYNwSnFIgvjQB6jYD7t4AI +xs+x0xP/jRBsvr2IMhEBrpP0o1Ian9Guw1yuMT0b5XA +-> ssh-ed25519 HzX1zw yyjdUbfty0hE0jIc2MMYvRkq/c/DABHJczH/CqyOkRw +c5lkqMwaxsojqx/jYJhMbgWuN0qdgf3VlBYnUHpc/OE +-> ssh-ed25519 KQfiow 70CAriiLnPXfh3a7HJnjRk0K5vYPc24AKjEWjiD/bSM +Sp/hULrynhI79p/zh96sD3rIYMTMzGD6CvN+6Dmxhhg +-> ssh-ed25519 1o2X0w +xLXrJLT2PITsHGkhak6M6/1ifd32sEHcNtI9xdTNTE +PI80gCMGaR24FRiOmNeReTXrUecgCNJZMInKGNfQHic +-> ssh-ed25519 KQ5iUA J2rBvdYjd9RYlQtVfaV50ZN0naHT58e3rZrnhgEszkg +/iG3OU/HVraqegvrTgZz5/gp1HZwyGgGkXhjGYJXAoY +-> ssh-ed25519 AKGkDw 7gJhihE5rASMzycK4rzrSj3oll5hHqzXNQo1qzoqnwE +zlisCc+y2x028mosTHDQjrMDAX2lF3HAJ8LLtzuwwZ4 +-> ssh-ed25519 0eS5+A sLIAQR51fxFZatgc7CCJYgjCtfdqYFLBnL4Qs9WmbyM +CgeHGN6+/ZE/RrQoPlaizGtu3bEz8lPfWEfFYY9wzrA +-> ssh-ed25519 9/4Prw uytvwSpCRE/5xDu/Og60k6jBF3wyBanyZMWhEjzcf1E +CM37OOCnORhdGDPXLJ7VIRYJhvMXKxfs6oK9WnHycV4 +-> ssh-ed25519 gAk3+Q hqrzZ+KHXT7mfI/6332ZymbDTQmjS2m7jDhtqNQ44no +n/k8+t4BcmPy5Tgkl9e8/CSoCcmVp2lkU8rCRlSGfZU +-> ssh-ed25519 X6eGtQ kO2cKtxVcAIRA3xC4zLLuj2cfZ6CKlOq3aTrB9cqhg8 +tG5GtTne/45DqNkJ8XjOlfbbDGLfTxweUKG1+f7aXNU +-> ssh-ed25519 0ma8Cw /PwKBNkRtj0mWkG3fJZOIjdLkhWlxxtowVABKjxShG0 +OSfm0wSpyrd8bb836wbFi1BrWHkuZ4DuWw9ZwfMP5b0 +-> ssh-ed25519 Tp0Z1Q qJqv47mimbpQkdiYO5sDqj+Qyi7Nq+y9Bb/EuxneXQg +F+b8rEY9rxDdPe+mVy0h7AggugMvGi9lvwKDfe/rjJs +-> ssh-ed25519 ePNWZQ MO3gceW2gDffFS/Tr2F2BkMSKD6Ydn/mRXHqYckGOnU +3CxqL9EwDQ99T7pN6b/NU0NQungyh2EHE56L8Stuj/U +-> ssh-ed25519 hILzzA AIf5pdaRPGOtKKV/gY5GM/PNtqSXVhoxB69t5JEgUlA +d6TC0L2OpbhvaREkVc+rNzY7U8VIQMG0in0UHFsGSUY +--- 6QUiesVdF1mNKhzpT/tPTMDvL7MAkEbXR2CHau5/SHE +ڙM x0_vuAu1ON* ݩQJE@ϚȬbClgjǘF+6"C/Ya#lpE4w/3iL?v:2ߖYls \ No newline at end of file