Merge branch 'master' into add-river

common/wifi.nix

@@ -42,6 +42,7 @@ in {
         "InmanPerkCustomer" = mkWPA2WiFi "InmanPerkCustomer" "$InmanPerkCustomerPSK";
         "Muchacho Guest" = mkOpenWiFi "Muchacho Guest";
         "PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK";
+        "PERC COFFEE 5 Guest" = mkWPA2WiFi "PERC COFFEE 5 Guest" "$PERCguestPSK";
         "Parkgrounds1" = mkWPA2WiFi "Parkgrounds1" "$Parkgrounds1PSK";
         "Stargate-Discovery" = mkWPA2WiFi "Stargate-Discovery" "$StargateDiscoveryPSK";
         "Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi";

flake.lock

@@ -124,15 +124,15 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1716150083,
+        "lastModified": 1663659192,
-        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
-        "owner": "tinted-theming",
+        "owner": "chriskempson",
         "repo": "base16-vim",
-        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
         "type": "github"
       },
       "original": {
-        "owner": "tinted-theming",
+        "owner": "chriskempson",
         "repo": "base16-vim",
         "type": "github"
       }
@@ -271,27 +271,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -465,11 +444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726585211,
+        "lastModified": 1726660103,
-        "narHash": "sha256-6Ra4qRRWYurpdn0vsIysNxpGXz+m/9IGbXdHr0P+gac=",
+        "narHash": "sha256-6dTw76l3zyBxW2a5Xn6UfY+uFzcJgyN4IiM8tI9Vu5I=",
         "owner": "alyraffauf",
         "repo": "nixhw",
-        "rev": "f7aad63bc3f59826fd16ff748dfa3607ce2f490e",
+        "rev": "19c6cdbfe1b757aa71b9ef9e9285fb1581704be9",
         "type": "github"
       },
       "original": {
@@ -618,24 +597,23 @@
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1726170940,
+        "lastModified": 1718122552,
-        "narHash": "sha256-sobkRkGBaMX9pD0bwU1iVPWi0WtQvZqlHyl1YtvNDio=",
+        "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "35233f929629c8eb64e939e35260fc8347f94df9",
+        "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "release-24.05",
         "repo": "stylix",
         "type": "github"
       }
@@ -685,21 +663,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "wallpapers": {
       "flake": false,
       "locked": {

flake.nix

@@ -39,7 +39,7 @@
 
     stylix = {
       inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:danth/stylix";
+      url = "github:danth/stylix/release-24.05";
     };
 
     wallpapers = {

homeManagerModules/apps/backblaze/default.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.ar.home.apps.backblaze;
-in {
-  config = lib.mkIf cfg.enable {
-    home = {
-      activation.backblazeAuthentication = lib.hm.dag.entryAfter ["reloadSystemd"] ''
-        ${
-          if ((cfg.keyIdFile != null) && (cfg.keyFile != null))
-          then
-            (
-              if !(builtins.pathExists "${config.xdg.configHome}/b2/account_info")
-              then ''
-                XDG_RUNTIME_DIR=''${XDG_RUNTIME_DIR:-/run/user/$(id -u)}
-                run --quiet ${lib.getExe pkgs.backblaze-b2} authorize_account `${lib.getExe' pkgs.coreutils "cat"} ${cfg.keyIdFile}` `${lib.getExe' pkgs.coreutils "cat"} ${cfg.keyFile}`''
-              else ''run echo "backblaze: Already authenticated."''
-            )
-          else ''run echo "backblaze: Missing keyIDfile and keyFile."''
-        }
-      '';
-
-      packages = with pkgs; [backblaze-b2];
-    };
-  };
-}

homeManagerModules/apps/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./alacritty
-    ./backblaze
     ./chromium
     ./emacs
     ./fastfetch

homeManagerModules/options.nix

@@ -11,22 +11,6 @@ in {
     apps = {
       alacritty.enable = lib.mkEnableOption "Alacritty terminal.";
 
-      backblaze = {
-        enable = lib.mkEnableOption "Backblaze-b2 client with declarative authentication.";
-
-        keyIdFile = lib.mkOption {
-          description = "Backblaze key ID.";
-          default = null;
-          type = lib.types.nullOr lib.types.str;
-        };
-
-        keyFile = lib.mkOption {
-          description = "Backblaze application key.";
-          default = null;
-          type = lib.types.nullOr lib.types.str;
-        };
-      };
-
       chromium = {
         enable = lib.mkEnableOption "Chromium-based browser with default extensions.";
         package = lib.mkPackageOption pkgs "brave" {};

homeManagerModules/services/randomWallpaper/default.nix

@@ -8,7 +8,7 @@
 in {
   config = lib.mkIf config.ar.home.services.randomWallpaper.enable {
     services.hyprpaper.enable = lib.mkForce false;
-    stylix.targets.hyprpaper.enable = lib.mkForce false;
+    # stylix.targets.hyprpaper.enable = lib.mkForce false;
     wayland.windowManager.sway.config.output."*" = lib.mkForce {}; # Dirty. TODO: make more elegant.
 
     systemd.user.services.randomWallpaper = {

homeManagerModules/theme.nix

@@ -4,9 +4,9 @@
   config,
   ...
 }: let
-  cfg = config.ar.home.theme;
+  cfg = config.ar.home;
 in {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.theme.enable {
     home.packages = [
       pkgs.gnome.adwaita-icon-theme
       pkgs.liberation_ttf
@@ -35,33 +35,31 @@ in {
       };
     };
 
-    stylix.targets.gtk.extraCss = ''
+    stylix.targets.gtk.extraCss = builtins.concatStringsSep "\n" [
-      window.background { border-radius: ${toString cfg.borders.radius}; }
+      (lib.optionalString (cfg.desktop.hyprland.enable || cfg.desktop.sway.enable) ''
+        window.background { border-radius: ${toString cfg.theme.borders.radius}; }
 
         tooltip {
-        &.background {
           background-color: alpha(${config.lib.stylix.colors.withHashtag.base00}, ${builtins.toString config.stylix.opacity.popups});
-          border: 1px solid ${config.lib.stylix.colors.withHashtag.base0D};
+          border-radius: ${toString cfg.theme.borders.radius};
-        }
-
-        background-color: alpha(${config.lib.stylix.colors.withHashtag.base00}, ${builtins.toString config.stylix.opacity.popups});
-        border-radius: ${toString cfg.borders.radius};
           border: 1px solid ${config.lib.stylix.colors.withHashtag.base0D};
           color: white;
         }
 
-      ${
+        tooltip.background {
-        lib.optionalString (config.stylix.polarity == "light") "
+          background-color: alpha(${config.lib.stylix.colors.withHashtag.base00}, ${builtins.toString config.stylix.opacity.popups});
+          border: 1px solid ${config.lib.stylix.colors.withHashtag.base0D};
+        }'')
+
+      (lib.optionalString (
+          (cfg.desktop.hyprland.enable || cfg.desktop.sway.enable) && (config.stylix.polarity == "light")
+        ) ''
           tooltip {
             &.background { background-color: alpha(${config.lib.stylix.colors.withHashtag.base05}, ${builtins.toString config.stylix.opacity.popups}); }
             background-color: alpha(${config.lib.stylix.colors.withHashtag.base05}, ${builtins.toString config.stylix.opacity.popups});
-        }"
+          }'')
-      }
 
-      ${
+      (lib.optionalString cfg.theme.gtk.hideTitleBar ''
-        lib.strings.optionalString
-        cfg.gtk.hideTitleBar
-        ''
         /* No (default) title bar on wayland */
         headerbar.default-decoration {
           /* You may need to tweak these values depending on your GTK theme */
@@ -86,9 +84,7 @@ in {
         window.csd decoration { /* gtk3 */
           border-radius: 0;
           box-shadow: none;
-          }
+        }'')
-        ''
+    ];
-      }
-    '';
   };
 }

homes/aly/common.nix

@@ -1,13 +1,8 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   home = {
     homeDirectory = "/home/aly";
 
     packages = with pkgs; [
-      browsh
       curl
     ];
 
@@ -47,16 +42,9 @@
 
   ar.home = {
     apps = {
-      backblaze = {
-        enable = true;
-        keyIdFile = config.age.secrets.backblazeKeyId.path;
-        keyFile = config.age.secrets.backblazeKey.path;
-      };
-
       fastfetch.enable = true;
       helix.enable = true;
       shell.enable = true;
-      tmux.enable = true;
       yazi.enable = true;
     };
   };

homes/aly/firefox/default.nix

@@ -10,6 +10,7 @@
       default = {
         extensions = with config.nur.repos.rycee.firefox-addons; [
           augmented-steam
+          bitwarden
           omnivore
           raindropio
           sidebery

homes/aly/gui.nix

@@ -1,9 +1,4 @@
-self: {
+self: {pkgs, ...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./common.nix
     ./firefox
@@ -34,11 +29,7 @@ self: {
     username = "aly";
   };
 
-  programs = {
+  programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
-    git.extraConfig.core.editor = "${lib.getExe config.ar.home.apps.zed.package} --wait";
-    rbw.settings.pinentry = pkgs.pinentry-gnome3;
-  };
-
   systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets.
 
   ar.home = {
@@ -46,14 +37,11 @@ self: {
       chromium.enable = true;
       firefox.enable = true;
       kitty.enable = true;
-      tmux.enable = true;
       vsCodium.enable = true;
-      zed.enable = true;
     };
 
     defaultApps = {
       enable = true;
-      editor = config.ar.home.apps.zed.package;
       fileManager = pkgs.xfce.thunar;
     };
 

homes/aly/mail/default.nix

@@ -20,7 +20,7 @@ in {
         text = ''
           Thank you,
           Aly Raffauf
-          https://alyraffauf.com
+          https://aly.raffauflabs.com
         '';
 
         showSignature = "append";

homes/aly/secrets.nix

@@ -2,8 +2,6 @@
   age.secrets = {
     achacegaGmail.file = ../../secrets/aly/mail/achacega_gmail.age;
     alyraffaufFastmail.file = ../../secrets/aly/mail/alyraffauf_fastmail.age;
-    backblazeKeyId.file = ../../secrets/aly/backblaze/keyId.age;
-    backblazeKey.file = ../../secrets/aly/backblaze/key.age;
 
     transmissionRemote = {
       file = ../../secrets/aly/transmissionRemote.age;

hosts/lavaridge/default.nix

@@ -39,6 +39,9 @@
   environment.variables.GDK_SCALE = "2";
   networking.hostName = "lavaridge";
   programs.firefox.policies.Preferences."media.ffmpeg.vaapi.enabled" = lib.mkForce false;
+  # services.xserver.enable = true;
+  # services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.desktopManager.gnome.enable = true;
   system.stateVersion = "24.05";
 
   ar = {

hosts/mauville/home.nix

@@ -33,9 +33,14 @@
       }
     ];
 
-    users.aly = lib.mkForce {
+    users.aly = lib.mkForce ({config, ...}: {
       imports = [self.homeManagerModules.aly];
 
+      age.secrets = {
+        backblazeKeyId.file = ../../secrets/aly/backblaze/keyId.age;
+        backblazeKey.file = ../../secrets/aly/backblaze/key.age;
+      };
+
       systemd.user = {
         services.backblaze-sync = {
           Unit.Description = "Backup to Backblaze.";
@@ -61,6 +66,8 @@
                 ['/mnt/Archive/Shows']="b2://aly-shows"
               )
 
+              backblaze-b2 authorize_account `cat ${config.age.secrets.backblazeKeyId.path}` `cat ${config.age.secrets.backblazeKey.path}`
+
               # Recursively backup folders to B2 with sanity checks.
               for folder in "''${!backups[@]}"; do
                 if [ -d "$folder" ] && [ "$(ls -A "$folder")" ]; then
@@ -80,6 +87,6 @@
           Unit.Description = "Daily backups to Backblaze.";
         };
       };
-    };
+    });
   };
 }

hosts/slateport/default.nix

@@ -40,6 +40,11 @@
     syncthing.guiAddress = "0.0.0.0:8384";
   };
 
+  stylix = {
+    enable = false;
+    image = "${self.inputs.wallpapers}/wallhaven-mp886k.jpg";
+  };
+
   system.stateVersion = "24.05";
   zramSwap.memoryPercent = 100;
 

hosts/slateport/raffauflabs.nix

@@ -38,7 +38,7 @@ in {
 
     fail2ban = {
       enable = true;
-      bantime = "1h";
+      bantime = "24h";
       bantime-increment.enable = true;
     };