Fix audio i3status

.sops.yaml

@@ -2,6 +2,7 @@ keys:
   - &muon age1m97a3eptxwpdd7h5kkqe9gkmhg6rquc64qjmlsfqfhfqv8q72crqrylhgc
   - &muho age1v4s4hg7u3vjjkarvrk7v6ev7w3wja2r5xm7f4t06culw3fuq7qns8sfju7
   - &mups age1n7qz2w3hkf7fcdv92kxw9k6uef487na2tlc87486rcjwj8lyfuws5q46gn
+  - &murk age1mgjhkqy9x27gv2t2xvq46dxcajkr9c8zes7rr3dj0ac7md2j6vas43dftp
 
 creation_rules:
   - path_regex: modules/nixos/sops/secrets.ya?ml$
@@ -10,6 +11,7 @@ creation_rules:
       - *muon
       - *muho
       - *mups
+      - *murk
 
   - path_regex: modules/home/sops/secrets.ya?ml$
     key_groups:
@@ -17,3 +19,4 @@ creation_rules:
       - *muon
       - *muho
       - *mups
+      - *murk

hosts/murk/configuration.nix

@@ -34,17 +34,26 @@ in {
   mods.theme.scheme = "woodland";
   mods.theme.wallpaper = ./wallpaper.png;
 
-  mods.impermanence.enable = true;
-
   services.xserver.windowManager.i3.enable = true;
 
-  # Hardware preferences
+  mods.impermanence.enable = true;
 
+  # Persist
+  environment.persistence."/persist" = {
+    directories = [ "/etc/NetworkManager" "/var/lib/NetworkManager" ];
+  };
+
+  # Hardware preferences
   environment.variables = {
     WINIT_HIDPI_FACTOR = "1";
     WINIT_X11_SCALE_FACTOR = "1";
   };
 
+  ## Laptop
+  powerManagement.enable = true;
+  services.thermald.enable = true;
+  services.tlp.enable = true;
+
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";
 

hosts/murk/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, osConfig, inputs, ... }:
+{ pkgs, lib, config, osConfig, inputs, ... }:
 let cfg = osConfig.mods;
 in {
   imports = [ inputs.impermanence.homeManagerModules.impermanence ];
@@ -6,6 +6,7 @@ in {
   # Modules
   mods.xdg.enable = true;
   mods.i3.enable = true;
+  mods.battery.enable = true;
   mods.terminal.zsh.enable = true;
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
@@ -13,8 +14,19 @@ in {
   mods.desktop.development.enable = true;
   mods.desktop.productivity.enable = false;
 
-  # Hardware preferences
+  home.packages = with pkgs;
+    [
+      thunderbird
+      pulseaudio
+      pavucontrol
+      alsa-utils
+    ]
 
+    # Non-free </3
+
+    ++ [ google-cloud-sdk ];
+
+  # Hardware preferences
   ## Monitors
   services.autorandr.enable = true;
   programs.autorandr = {

modules/home/desktop/i3.nix

@@ -14,6 +14,7 @@ let
     };
 in with lib; {
   options.mods.i3.enable = mkEnableOption "enables i3";
+  options.mods.battery.enable = mkEnableOption "enables battery";
 
   config = mkIf config.mods.i3.enable {
     services.unclutter.enable = true;
@@ -21,29 +22,52 @@ in with lib; {
 
     programs.i3status-rust = {
       enable = true;
-      bars.default = {
-        settings.theme.overrides = with config.lib.stylix.colors.withHashtag; {
-          idle_bg = base00;
-          idle_fg = base05;
-          separator = "";
-        };
-        icons = "awesome5";
-        blocks = [
-          {
-            block = "sound";
-            format = " $icon $volume ";
-            click = [{
-              button = "left";
-              cmd = "${lib.getExe pkgs.pavucontrol}";
-            }];
-          }
-          {
-            block = "time";
-            format = "$icon $timestamp.datetime(f:'%Y-%m-%d %a %H:%M:%S') ";
-            interval = 1;
-          }
-        ];
-      };
+      bars.default = lib.mkMerge [
+        {
+          blocks = lib.mkBefore [
+            {
+              block = "privacy";
+              driver = [ { name = "v4l"; } { name = "pipewire"; } ];
+            }
+            {
+              block = "net";
+              format = " $icon  ";
+              inactive_format = " $icon ";
+            }
+          ];
+        }
+        (lib.mkIf config.mods.battery.enable {
+          blocks = [{
+            block = "battery";
+            format = " $icon $percentage ";
+            # format_alt =
+            #   " $icon $percentage {$time_remaining.dur(hms:true, min_unit:m) |}";
+          }];
+        })
+        {
+          settings.theme.overrides = lib.mkMerge [
+            { separator = ""; }
+            config.lib.stylix.i3status-rust.bar
+          ];
+          icons = "awesome5";
+          blocks = lib.mkAfter [
+            {
+              block = "sound";
+              format = " $icon {$volume |} ";
+              click = [{
+                button = "left";
+                cmd = "${lib.getExe pkgs.pavucontrol}";
+              }];
+            }
+            {
+              block = "time";
+              format = "$icon $timestamp.datetime(f:'%Y-%m-%d %a %H:%M:%S') ";
+              # format_alt = "$icon $timestamp.datetime(f:'%Y-%m-%d %H:%M') ";
+              interval = 1;
+            }
+          ];
+        }
+      ];
     };
 
     xsession.windowManager.i3 = let

modules/home/sops/default.nix

@@ -7,5 +7,6 @@ in with lib; {
     defaultSopsFile = ./secrets.yaml;
     secrets.zipline-auth = { };
     secrets.atuin-auth = { };
+    secrets.hr-password = { };
   };
 }

modules/home/sops/secrets.yaml

@@ -1,35 +1,45 @@
 zipline-auth: ENC[AES256_GCM,data:RkJI6GuH7RzdcSlKn32gMGojjB6rkdDcnNUvsi/BTfJk2slzoktAaJPzQA==,iv:LIiB3tyqXf/D64aIDSo0AyG3imvI6ZE893KBPlYFr28=,tag:wl8spMBwzfvuKA+Y6JnVyQ==,type:str]
 atuin-auth: ENC[AES256_GCM,data:LDkiXWIwxor8Ro383gonJCyqu+nyxS7DrI2J8uo4Cqu2X61rBUlnpNR6YirUZS/lYAnWYJhZM7sR0G7ZNh9EgQ==,iv:UEs2KW8ImMnaQrSLrIGbVXEq86QiVPAPNIXBZpa3jFI=,tag:N0rhnPbasFzkoI3CJ9CV+Q==,type:str]
+hr-password: ENC[AES256_GCM,data:QZuzAnTJ2KgPnffHvdCWrJEM5d/FXxhX3dA1,iv:FgDw6aXDY0jCpJiYc9WOobR96TXNtnvN7neJu8drxMM=,tag:YT82wryVy3V+41w0YbMOrA==,type:str]
 sops:
     age:
         - recipient: age1m97a3eptxwpdd7h5kkqe9gkmhg6rquc64qjmlsfqfhfqv8q72crqrylhgc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZdno1QTVQci94M083c01O
-            MzlHZnhOb3BxNFBtSE9YWUcySmNNL0ovbHdvCmF3K1dVMFN2REs0Wm5JODgyVSt1
-            aGJGODRZWllaeHd3Y2tHcXNxN01WelUKLS0tIElqaENucWgzcytSRlE3YThjRTda
-            bC9hQXVTSU9yYU0xTlE1QVYyclp4L28KlAWVfsSmIHxbjsgRggmEzBk79aFem93d
-            dwCuAzM95eRDPB0pnhgROa0f9uiAUDdrtfWRrGVvIVzCKL0DPCPA5w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqWlVGK0V3UTVuejFMRVA0
+            QUhrRXhwcTc4N3B5b1V6ckZqRUJVcXdCbWtzCnl2a0JTeVJKSkpreGdyc0xnODk1
+            WlFFdVBBbTkxRnVoRmQ5VjFsRGxvN1EKLS0tIGQ2dlFFRlM5NzQxQkZ5MENuYU8x
+            SkhrZUR0MkVyazc2MUx0aklWUFZFNHMKm8wOh9R1LWyLgJ7nJ0mCGmSeK8biNfHG
+            Y9w991ccXbVd8QVq7k0I2sJ/T/4DLlFineV8jRsj4rN9cks4Uo5mTQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1v4s4hg7u3vjjkarvrk7v6ev7w3wja2r5xm7f4t06culw3fuq7qns8sfju7
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpcFJ6ejRkQnQwSUtLY2d4
-            Sm1QL3RDQmtieDZ3T1Z2Z2RFR25HTmxPNERVCmM3TW1wSW05bkxJenUxQjF2S3Br
-            bDNpK3V4RnFnYVFaRXM3NEhFTmZiZVkKLS0tIGJxVnpEZ2FUK0JDUmp3UjRBUGhV
-            MEVmRjM2elE3MHRXQ0FURW1PSlRKL3cKcPYPd6fLVZpxMK/A9dR144irkkmQW/hN
-            FdXlOWIV9f/I5qi1Lay6WQM67Z13kiNFOC/GSv/0Amu+Y1RmvedRgA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQlJQN3c2WVU4T2hhVDV1
+            SjlqZkVJSFk5VEw4dkNxejF6MFBkWVQ0MUE0Cjc2WTQvTXlsbDZqNlg1RkZ4eVNF
+            NTczRGJ6M2c1cXBqcmxYbzMxVGdSVjAKLS0tIG9JNmdLUW9iN29CVVZ0dC9BVFRP
+            Y2g3MU1TZnhjQ0t5MkxKWVhQVDJ3WDAKMuI1G3t4BmG3JbwXfQKNTdkHCjnU/jHK
+            Z2eKhvwKqT08z+Pvtxd2pcRtK+t23/edCUJv684VrNXoBlgMH10PuA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1n7qz2w3hkf7fcdv92kxw9k6uef487na2tlc87486rcjwj8lyfuws5q46gn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwYTRqV0E1MGNpMm45c1d5
-            UU5Eem5QRC82NmFmTytHakljMFJXYWE1eVZZCmVtWGxVeVVFUWlzSWZyZXd0V1Q4
-            eEVQY2hndTI0aEo4bW9tMlk3M2k5cW8KLS0tIDV2RU9vdkgrdDhTMkpYZkV6aXd4
-            cThxTVpmcEMrcG9Lczd3dkdyQ0paSHMKUfkx9jh7zIqBkUjxaH3dVKvNJG3Mipts
-            OjmJ5aVVIR5U8MhgSgECb22mGlOgW8SU/x4gxcWgafZwbv2vbON6OA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5Lyt4Zk5GeW1XNTBLbnBZ
+            MHE4WG5Cci9Sa1V4aDZQRkVzdDJ0a3JRYWwwCmhSSFFNdTlCM05wUy9uQnhUcFY3
+            c05xUFRiamV1WmxuU2tFeWVqeTlYdGsKLS0tIGJtWWNMc2lwK0taOHluN3BmcnRO
+            YVYySTJaNE1aalAxUXZqR1BWMzJvalUKnD3hpu5b1Tb+tg+gmVWuAYVlg2SPRI8p
+            kILLFBP2mHz3V6lRX77tXXvCkjLZ8EFKMIl8owGZ8LUsokz1k5EbSA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-01T11:06:26Z"
-    mac: ENC[AES256_GCM,data:bcCDmG+460Y+hUYHg6yVl2E6Oyw2MQcHVLp7sfhJDwWAHCwEPeYKlQLp8yumOTyQQxw6uSgj+vso7JmiAsnJvk/v9BIx6SNmfKK+rz9cwIJY1d8Da99Yn7WUVAjXQyWqxNckrELS+CKSsGXl7nr/PKYM1w87Fpbq9F7x4bp/V28=,iv:/XrjK+qaJCPrqoSEZ+hJQa7jvjWgzJQJXRXn+7Y1m8I=,tag:BruzsbUBC61Hzsx/3k8Vcg==,type:str]
+        - recipient: age1mgjhkqy9x27gv2t2xvq46dxcajkr9c8zes7rr3dj0ac7md2j6vas43dftp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6d0JHVWd6eGt4b05RNUVr
+            VzFsSnN1Qk5wSnk4aWdvOVlzY0k5LzZMQXc4CmxRMmMrM3pVMjV6S0pVNnNsQlFo
+            S3lDTGZGTHV3cXdyWndzd0JQSVRUYTQKLS0tIDJHbnZvTFN0YmVsdkFhR2NhckYy
+            a0V1N2VjUDE4Z3R5MGxMQVNmOVp0bVUK9cppJW33tKFOSvbIn/2Dga8k7/McaTpK
+            m7M+83guMzNoOlpJ/WYU1BaePcM974AgjVR0WD/v+xGBvGKubKHqtw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-08-02T21:23:43Z"
+    mac: ENC[AES256_GCM,data:zj7n2RO4MsF6yDDKn7WtOrXsmUT/A9/agUd+ErXrdaVm74KENGg84si72OZiivvbYxsf166BMZmLuWnZzJ7kjqNEWulrdhSj44ycLAjbijV1IVUTZy2YcoEaozSCWDwJvCtcSY4EtftLiOMnG9IItl29LVI7GCX5bnY0+mlrWTY=,iv:ABHf6vvAnqpIGRfW0BoqUlWbpMxS8YsQpPgVdzdxPYs=,tag:elkVdV6Gr61fraUKJXIsjA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2

modules/home/terminal/tools.nix

@@ -59,6 +59,9 @@ in with lib; {
       vifm
       unzip
 
+      # email
+      aerc
+
       # security
       pinentry-tty
 

modules/nixos/core/network.nix

@@ -27,8 +27,15 @@ in with lib; {
 
   config = {
     networking.networkmanager.enable = true;
-    networking.nameservers = [ "45.90.28.97" "45.90.30.97" ];
-    # services.resolved.enable = true;
+    # networking.nameservers = [ "45.90.28.97" "45.90.30.97" ];
+    networking.nameservers = [ "194.242.2.4#base.dns.mullvad.net" ];
+    services.resolved = {
+      enable = true;
+      dnssec = "false";
+      dnsovertls = "true";
+      domains = [ "~." ];
+      fallbackDns = [ "194.242.2.4#base.dns.mullvad.net" ];
+    };
 
     # udev 250 doesn't reliably reinitialize devices after restart
     systemd.services.systemd-udevd.restartIfChanged = false;

modules/nixos/sops/secrets.yaml

@@ -7,29 +7,38 @@ sops:
         - recipient: age1m97a3eptxwpdd7h5kkqe9gkmhg6rquc64qjmlsfqfhfqv8q72crqrylhgc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZdno1QTVQci94M083c01O
-            MzlHZnhOb3BxNFBtSE9YWUcySmNNL0ovbHdvCmF3K1dVMFN2REs0Wm5JODgyVSt1
-            aGJGODRZWllaeHd3Y2tHcXNxN01WelUKLS0tIElqaENucWgzcytSRlE3YThjRTda
-            bC9hQXVTSU9yYU0xTlE1QVYyclp4L28KlAWVfsSmIHxbjsgRggmEzBk79aFem93d
-            dwCuAzM95eRDPB0pnhgROa0f9uiAUDdrtfWRrGVvIVzCKL0DPCPA5w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4bUg1Z1JBcmRldDIzN2Zt
+            Ky9LOTVBK0IzdE1UUFBXci94R0x1bitjT2hjCjA1NC9wMzNHZkorZllIaFpNMVlm
+            Y05oLzBYcENBbmNOc0Y5cVVHV0VVUVkKLS0tIFZzTjE5NVVEaWFKcUU4aWlnSjFt
+            eWlTRmEzYVpQdENiNUMxaWJta0NjcVEKx3togykPGYRNGgJR6fl9cDbJKiLWHjA9
+            XujrttnDTwNCCZENn/E4BABC4XecW8IqSsUmJW6GwZzYJu+4rNTSwA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1v4s4hg7u3vjjkarvrk7v6ev7w3wja2r5xm7f4t06culw3fuq7qns8sfju7
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpcFJ6ejRkQnQwSUtLY2d4
-            Sm1QL3RDQmtieDZ3T1Z2Z2RFR25HTmxPNERVCmM3TW1wSW05bkxJenUxQjF2S3Br
-            bDNpK3V4RnFnYVFaRXM3NEhFTmZiZVkKLS0tIGJxVnpEZ2FUK0JDUmp3UjRBUGhV
-            MEVmRjM2elE3MHRXQ0FURW1PSlRKL3cKcPYPd6fLVZpxMK/A9dR144irkkmQW/hN
-            FdXlOWIV9f/I5qi1Lay6WQM67Z13kiNFOC/GSv/0Amu+Y1RmvedRgA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWWE5tU0ltaTJscUVQSDBy
+            WHRDb2FTRVFtZ2s2eGRjb21ncU1HNkx3RmhRClMwQ0E1cCt1SmtoYi9TWExXdVdX
+            Ym5RS2h3bWt3SkRzUGVtbXEvWkcyWDgKLS0tIERuVFhubHprQ0JKVHBFdjBFSk1j
+            Qm5yVjBNc1l6VFQ4OGJsWXdsWUIyNFkKksIW0x8RxTdaw9YR4y+84VrYnfVZz2js
+            qz1RG4TXs9NRcm8fGGa/ZYZZN72h/l0WY+fayZ+ZUaHD43tHFisoYg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1n7qz2w3hkf7fcdv92kxw9k6uef487na2tlc87486rcjwj8lyfuws5q46gn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwYTRqV0E1MGNpMm45c1d5
-            UU5Eem5QRC82NmFmTytHakljMFJXYWE1eVZZCmVtWGxVeVVFUWlzSWZyZXd0V1Q4
-            eEVQY2hndTI0aEo4bW9tMlk3M2k5cW8KLS0tIDV2RU9vdkgrdDhTMkpYZkV6aXd4
-            cThxTVpmcEMrcG9Lczd3dkdyQ0paSHMKUfkx9jh7zIqBkUjxaH3dVKvNJG3Mipts
-            OjmJ5aVVIR5U8MhgSgECb22mGlOgW8SU/x4gxcWgafZwbv2vbON6OA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1L29jY3lNeU8xeE03VUFu
+            MWJyczNxZFJHSG82c0p3OEtBOThqaE8xTFMwCm9KemZJMjBOQ0I1TU9Qd2IvMGVU
+            Ry9GQ1JuN0lHSVNpUjZMWU5hWWlFYmcKLS0tIE56b0prSDZCMnZXeTJpUksvN29I
+            UXp0a3AwM0hvbG1jeEZIMlViYU9ZWTgKKJ2YL6Q2LyR9x4Oqt5qWiyL7f4wAWrqw
+            FTY5r2unI7YdIFtzmbjIAqv/4qqy62Th8EEsqAZUcL/YBcuNIiyg6Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1mgjhkqy9x27gv2t2xvq46dxcajkr9c8zes7rr3dj0ac7md2j6vas43dftp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJOUhRY0RtaUhNaHZZTHk3
+            QVF4cXV2Lzc3d1RRM2pzMXBBQU95endLRFFZCkdMVVlkV3VzSnRyRHpROHlReUdJ
+            ek9EbXk4WHVDblFXTkhHLzdwRTV3TjAKLS0tIDMxS1psQ1dSNG1XbGxvYlNQZ2dl
+            VFdIbUg1WjlldFFNbGx3dytQNXBsMDgKuU/86fojKVJ5X8+9OIf3k7ud6bujjyFI
+            HQoONJgXGoQJtkPsmJbMUuMjo/znK+tdCd/uAwxK1Nk670NVxGmJYA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-05-17T09:59:07Z"
     mac: ENC[AES256_GCM,data:ewURL+W/C0XnEJiXipeSXr5F5hItD3LPMdThjBg1ObY/N7Tb28Tm18vCOpbr37H0gDWnDjNu2rzVN3+XjrbVzXe7n4YUzN2sZa2zZEJhHDTyQWdiPtMpApXeu1Va621EQymDyTm7N2hJz3MvadiWYIv/ft685FPY7qRX7pluUFc=,iv:FIoClE4hX8+PBHY5LOFeSowxSrAHIaDPFblD6Pkakes=,tag:FepKajXRusCbLTlJGPKm6g==,type:str]