update flake lock, set nixpkgs config for IFD

2025-12-13 23:35:05 -05:00
14 changed files with 75 additions and 155 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -21,17 +21,17 @@
    "base16-fish": {
      "flake": false,
      "locked": {
-        "lastModified": 1765809053,
-        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
+        "lastModified": 1754405784,
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
        "type": "github"
      },
      "original": {
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
        "type": "github"
      }
    },
@@ -76,11 +76,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1766203416,
-        "narHash": "sha256-UrIuqnXvM+73owAiq1zjHNtaWrv72wD1yKO6jTowhTQ=",
+        "lastModified": 1765685099,
+        "narHash": "sha256-D4VYn8NN0sLOzoo4geYDiV/T/Ilor78CaS50gNq6Ep0=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "8b55bb199045aa79e2965b7482b04ee4773192e3",
+        "rev": "51712b3d3481dfaeef9a5f8b293ea1aa04a61cdb",
        "type": "gitlab"
      },
      "original": {
@@ -125,11 +125,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "lastModified": 1765495779,
+        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766171975,
-        "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=",
+        "lastModified": 1765682243,
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
        "type": "github"
      },
      "original": {
@@ -283,11 +283,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766066098,
-        "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=",
+        "lastModified": 1765113580,
+        "narHash": "sha256-b8YOwGDFprkQJjXsKGuSNS1pWe8w4cUW36YxlUelNpU=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690",
+        "rev": "db18f83bebbc2cf43a21dbb26cd99aabe672d923",
        "type": "github"
      },
      "original": {
@@ -440,11 +440,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765760415,
-        "narHash": "sha256-IWqUDFoagKlofu68/8Q1yqkn1BHMLpgsx9fnrSZNH4s=",
+        "lastModified": 1765680822,
+        "narHash": "sha256-e5YH/ypoOYwmT7mnK1NzxHMg9XMIOr449TdCivh1cHs=",
        "owner": "NuschtOS",
        "repo": "nixos-modules",
-        "rev": "fce41e57c75d878e77cb8e01bafc4676d1b401fe",
+        "rev": "457cb20476534590ea8911a6cc5f614fcc683528",
        "type": "github"
      },
      "original": {
@@ -471,11 +471,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
        "type": "github"
      },
      "original": {
@@ -502,11 +502,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
        "type": "github"
      },
      "original": {
@@ -552,11 +552,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765911976,
-        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
+        "lastModified": 1765464257,
+        "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
+        "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766198367,
-        "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=",
+        "lastModified": 1765680428,
+        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3",
+        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
        "type": "github"
      },
      "original": {
@@ -616,11 +616,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765836173,
-        "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
+        "lastModified": 1765684837,
+        "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
+        "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
        "type": "github"
      },
      "original": {
@@ -650,11 +650,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1765897595,
-        "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=",
+        "lastModified": 1765474444,
+        "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3",
+        "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e",
        "type": "github"
      },
      "original": {
@@ -787,11 +787,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765936672,
-        "narHash": "sha256-wxkeSF0/3FI0HSBKhZ2mlAAmFviNrZzdhjHqTfWP6h0=",
+        "lastModified": 1759739742,
+        "narHash": "sha256-nTNmgO71tD3jJGpr9yIS1atOBJp8K1pwZOxnEdS+aAk=",
        "owner": "Toqozz",
        "repo": "wired-notify",
-        "rev": "491197a6a5ef9c65a85c3eb1531786f32ffff5b3",
+        "rev": "6a96aa2066d8ad945f2323b63dc217081ef51168",
        "type": "github"
      },
      "original": {
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,5 +1,6 @@
 { lib, pkgs, ... }:
 {
+  nixpkgs.config.allowImportrFromDerivation = true;
  nix = {
    #package = pkgs.nixVersions.latest;
    diffSystem = true;
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -52,7 +52,7 @@
      };
    };
    calibre-server = {
-      enable = false;
+      enable = true;
      user = "calibre-web";
      group = "calibre-web";

--- a/systems/artemision/default.nix
+++ b/systems/artemision/default.nix
@@ -7,7 +7,7 @@
  server = false;
  users = [ "alice" ];
  modules = [
-    inputs.nixos-hardware.nixosModules.framework-16-amd-ai-300-series
+    inputs.nixos-hardware.nixosModules.framework-16-7040-amd
    inputs.stylix.nixosModules.stylix
    {
      environment.systemPackages = [
--- a/systems/artemision/hardware.nix
+++ b/systems/artemision/hardware.nix
@@ -100,7 +100,7 @@
  # (the default) this is the recommended approach. When using systemd-networkd it's
  # still possible to use this option, but it's recommended to use it in conjunction
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.interfaces.wlp191s0.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
--- a/systems/artemision/private-wifi.nix
+++ b/systems/artemision/private-wifi.nix
@@ -3,17 +3,17 @@
  networking.nameservers = [
    "9.9.9.9"
    "1.1.1.1"
-    #"192.168.76.1"
+    "192.168.76.1"
  ];

-  #services.resolved = {
-  #  enable = true;
-  #  dnssec = "false";
-  #  domains = [ "~." ];
-  #  fallbackDns = [
-  #    "1.1.1.1#one.one.one.one"
-  #    "1.0.0.1#one.one.one.one"
-  #  ];
-  #  dnsovertls = "true";
-  #};
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    domains = [ "~." ];
+    fallbackDns = [
+      "1.1.1.1#one.one.one.one"
+      "1.0.0.1#one.one.one.one"
+    ];
+    dnsovertls = "true";
+  };
 }
--- a/systems/palatine-hill/docker/arr.nix
+++ b/systems/palatine-hill/docker/arr.nix
@@ -1,51 +1,13 @@
 {
  config,
  lib,
+  pkgs,
  ...
 }:
 let
  vars = import ../vars.nix;
-  arr_postgres_config =
-    container_type:
-    let
-      ctype = lib.strings.toUpper container_type;
-    in
-    {
-      "${ctype}__POSTGRES__HOST" = "host.docker.internal";
-      "${ctype}__POSTGRES__USER" = "SOPS_ONLY";
-      "${ctype}__POSTGRES__PASSWORD" = "SOPS_ONLY";
-      "${ctype}__POSTGRES__PORT" = toString config.services.postgresql.settings.port;
-    };
 in
 {
-  # Notes:
-  # Jellyplex-watched - sync watch status between plex and jellyfin as long as users and library is the same
-  # Tdarr - for distributed transcoding?
-  #
-  # list of containers supporting postgres:
-  #   bazarr:
-  #     POSTGRES_ENABED: true
-  #     POSTGRES_HOST:
-  #     POSTGRES_PORT:
-  #     POSTGRES_DATABASE: bazarr
-  #     POSTGRES_USERNAME: arr
-  #     POSTGRES_PASSWORD: sops
-  #   prowlarr:
-  #     see ctype
-  #   radarr:
-  #     see ctype
-  #   sonarr:
-  #     see ctype
-  #   lidarr:
-  #     see ctype
-  #   jellyseerr:
-  #     DB_TYPE: postgres
-  #     DB_HOST:
-  #     DB_PORT:
-  #     DB_USER: arr
-  #     DB_PASS: sops
-  #     DB_NAME: jellyseerr
-  #
  virtualisation.oci-containers.containers = {
    bazarr = {
      image = "ghcr.io/linuxserver/bazarr:latest";
@@ -54,19 +16,11 @@ in
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-        POSTGRES_HOST = "host.docker.internal";
-        POSTGRES_USER = "SOPS_ONLY";
-        POSTGRES_PASSWORD = "SOPS_ONLY";
-        POSTGRES_PORT = toString config.services.postgresql.settings.port;
      };
      volumes = [
        "${vars.primary_docker}/bazarr:/config"
        "${vars.primary_plex_storage}/data:/data"
      ];
-      extraOptions = [
-        "--network=arrnet"
-        "--add-host=host.docker.internal:host-gateway"
-      ];
      autoStart = true;
    };
    prowlarr = {
@@ -76,9 +30,7 @@ in
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-      }
-      // arr_postgres_config "prowlarr";
-      extraOptions = [ "--network=arrnet" ];
+      };
      volumes = [ "${vars.primary_docker}/prowlarr:/config" ];
      autoStart = true;
    };
@@ -89,13 +41,11 @@ in
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-      }
-      // arr_postgres_config "radarr";
+      };
      volumes = [
        "${vars.primary_docker}/radarr:/config"
        "${vars.primary_plex_storage}/data:/data"
      ];
-      extraOptions = [ "--network=arrnet" ];
      autoStart = true;
    };
    sonarr = {
@@ -105,13 +55,11 @@ in
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-      }
-      // arr_postgres_config "sonarr";
+      };
      volumes = [
        "${vars.primary_docker}/sonarr:/config"
        "${vars.primary_plex_storage}/data:/data"
      ];
-      extraOptions = [ "--network=arrnet" ];
      autoStart = true;
    };
    lidarr = {
@@ -121,13 +69,11 @@ in
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-      }
-      // arr_postgres_config "lidarr";
+      };
      volumes = [
        "${vars.primary_docker}/lidarr:/config"
        "${vars.primary_plex_storage}/data:/data"
      ];
-      extraOptions = [ "--network=arrnet" ];
      autoStart = true;
    };
    unpackerr = {
@@ -140,60 +86,36 @@ in
        "${vars.primary_docker}/unpackerr:/config"
        "${vars.primary_plex_storage}:/data"
      ];
-      extraOptions = [ "--network=arrnet" ];
      autoStart = true;
    };
    notifiarr = {
      image = "golift/notifiarr:latest";
-      ports = [ "5454:5454" ];
      user = "600:100";
      environment = {
        TZ = "America/New_York";
-      }
-      // arr_postgres_config "notifiarr";
-      environmentFiles = [ config.sops.secrets."docker/notifiarr".path ];
+      };
      volumes = [
        "${vars.primary_docker}/notifiarr:/config"
        "${vars.primary_plex_storage}:/data"
      ];
-      extraOptions = [ "--network=arrnet" ];
      autoStart = true;
    };
-    jellyseerr = {
-      image = "fallenbagel/jellyseerr:latest";
+    overseerr = {
+      image = "fallenbagel/jellyseerr:preview-seerr";
      environment = {
        PUID = "600";
        PGID = "100";
        TZ = "America/New_York";
-        DB_TYPE = "postgres";
-        DB_HOST = "host.docker.internal";
-        DB_PORT = toString config.services.postgresql.settings.port;
-        DB_USER = "SOPS_ONLY";
-        DB_PASS = "SOPS_ONLY";
      };
      volumes = [ "${vars.primary_docker}/overseerr:/config" ];
      # TODO: remove ports later since this is going through web
-      extraOptions = [
-        "--network=arrnet"
-        "--network=haproxy-net"
-        # "--health-cmd \"wget --no-verbose --tries 1 --spider http://localhost:5055/api/v1/status || exit 1\""
-        # "--health-start-period 20s"
-        # "--health-timeout 3s"
-        # "--health-interval 15s"
-        # "--health-retries 3"
-      ];
      ports = [ "5055:5055" ]; # Web UI port
      dependsOn = [
        "radarr"
        "sonarr"
      ];
+      extraOptions = [ "--network=haproxy-net" ];
      autoStart = true;
    };
  };
-
-  sops = {
-    secrets = {
-      "docker/notifiarr".owner = "docker-service";
-    };
-  };
 }
--- a/systems/palatine-hill/docker/nextcloud.nix
+++ b/systems/palatine-hill/docker/nextcloud.nix
@@ -8,13 +8,13 @@ let
  # nextcloud-image = import ./nextcloud-image { inherit pkgs; };
  nextcloud-base = {
    # image comes from running docker compose build in nextcloud-docker/.examples/full/apache
-    image = "docker.io/library/nextcloud-nextcloud";
+    image = "nextcloud-nextcloud";
    # pull = "always";
    # do NOT enable pull here, this image is generated based on a custom docker image
    hostname = "nextcloud";
    volumes = [
      "${nextcloud_path}/nc_data:/var/www/html:z"
-      #"${nextcloud_path}/nc_php:/usr/local/etc/php"
+      "${nextcloud_path}/nc_php:/usr/local/etc/php"
      "${nextcloud_path}/nc_prehooks:/docker-entrypoint-hooks.d/before-starting"
      #"${nextcloud_path}/remoteip.conf:/etc/apache2/conf-enabled/remoteip.conf:ro"
    ];
--- a/systems/palatine-hill/hydra.nix
+++ b/systems/palatine-hill/hydra.nix
@@ -43,9 +43,9 @@ in
    hydra = {
      enable = true;
      package = inputs.hydra.packages.x86_64-linux.hydra.overrideAttrs (old: {
-        preCheck = ''
+        checkPhase = ''
          export YATH_JOB_COUNT=8
-          ${old.preCheck or ""}
+          ${old.checkPhase or "yath test"}
        '';
      });
      hydraURL = "https://hydra.alicehuston.xyz";
--- a/systems/palatine-hill/postgresql.nix
+++ b/systems/palatine-hill/postgresql.nix
@@ -1,5 +1,6 @@
 {
  config,
+  lib,
  pkgs,
  ...
 }:
--- a/systems/palatine-hill/secrets.yaml
+++ b/systems/palatine-hill/secrets.yaml
@@ -25,7 +25,7 @@ docker:
    collabora: ENC[AES256_GCM,data:LPRkzPEv5qfzeWSDbf+L+0asfmiK5Mhj8jCdfVyvVQAaD75Cbo4qLD0Nc80z,iv:/l2vAyYYJChhv6T+JkHT4I74ZpdhvbVqxlDWIM4Y4bw=,tag:/+uzn1vtd1RnO9/lGiQAKA==,type:str]
    delugevpn: ENC[AES256_GCM,data:YGkgaQUuA9oteKD77tnFzxZSHctyOQjMNlfvJr3mPWAl2P8wfcshiUoa6SNp69pagxbzRV6mfuzwzinbkQCoZN3lw7uF76y0,iv:Bro0H4tFR+3wi9DGGq9a6ge4o4uPlVXBUF7h17zyqg8=,tag:N1kVNFasqGMx8R9qTq2dJA==,type:str]
    protonvpn-start-script: ENC[AES256_GCM,data:ZnlDpCLdILHXSUCI6itWkqO4y75Lwjj7qT1DBkfueLneQOaQ0JhuE2FbOOajkmI046nP9fMrJbu3g4QZHsq1g8yqGU1wb0OOT+eS9+M92Md29B4NnUdwnVAO6/RzvRKXP2tsQ4iprx9An+BEFwZYD6WG6DQc6NjJVSgRcYvfH9rQey2VdwLysNsgFCs8eC6QgikqBpeg4eOIvDDNbdXPKkW+ZPph9xpzGkcFIMwlX5esg0n7qyUoMvWwBn4avC46U5erOw0fNajY60ri9sm5Afht6LZrFal71Hx/K9/5EXBp9dD4teLO2Ew0CQX0i94pKCuR207l9868s7Ao3udLp4wbiLnXoRKq+w==,iv:qR0kNYpb50NXEqSksvHBPAaRG51RKCsSwTq32nosxzo=,tag:+xRQyuWi4Ja/N9lcd11oJA==,type:str]
-    notifiarr: ENC[AES256_GCM,data:XxVEhp4Rei6mRcdSSooRnofuVNZDalVhDYiVUmvQUr8QihrVRMKRE9Kpl5PGWUBw,iv:urMLaUf3XUjMks2vk0E7iRUU3mLHBiMAiwtQgmWQq20=,tag:dHdTOyC/ukd71UlYEI5fWw==,type:str]
+    notifiarr: ENC[AES256_GCM,data:8p7+58u1WSjBMjgxxkyDVp0CK26RMBAOFe7Ax5ugfs85+K97loSCAgTaDzplkHwZ0W1jc7rKUyEp6H22R+VwIUL5CvlYZ4XIZbcbrTfcuAqXcVExDNP/hQQs0Kg6,iv:kXKVrHPiBKvUvaeZvf1AG8M+Zu3SaSv5UacBqeHeBWA=,tag:jiZe/6oEZ8IPybZ3rDevEg==,type:str]
 acme:
    bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str]
    dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str]
@@ -44,8 +44,8 @@ sops:
            cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
            LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-08T03:05:16Z"
-    mac: ENC[AES256_GCM,data:gIw//fnDU/lE2rDP4890MjnQ2xp0I4fXwvSWrLC0kFjW1RMLzNCaRLlJzw5/khALH/IZgTrnRqTHF3zHZd+mlyqvC/vzkyBBVdWRRX6w5l9JhFDfe83r86tvsV9G/AOeRchDp1gGuBBNkRamSuCOj7QFc1l334e/jNdKDadhwgI=,iv:nrOQxvJBce5/NDvpowJX/AiIssQdNOStvjj/Lkutppk=,tag:MlRJxbG3laajsi5KHAxy5g==,type:str]
+    lastmodified: "2025-10-15T02:30:11Z"
+    mac: ENC[AES256_GCM,data:uG3ZnIAepcCDFXZNhE18dqd0R3pL0a4JTxTaYx8fnaoT3ooN580yIA6tfjGj+6M3JyqPCM56dmqmnMsPplkr+WToW5Wgc8EBe+L2UdSpVK6Zk1ClxvG+NMmZK0u+dNOszJHpoRWTFLl5Wffku9hKEwcgYTA0nwVcrqPc3FSZQyA=,iv:hN2Wfr/IopxM1ItekB7YcXPjR5zBIwPvq1EzW1yjS34=,tag:ao059oZR+kT7IMBF4b2aAQ==,type:str]
    pgp:
        - created_at: "2024-11-28T18:56:39Z"
          enc: |-
--- a/systems/palatine-hill/zfs.nix
+++ b/systems/palatine-hill/zfs.nix
@@ -49,7 +49,7 @@
          daily = 30;
          weekly = 0;
          monthly = 6;
-          yearly = 2;
+          yearly = 3;
          autosnap = true;
          autoprune = true;
        };
--- a/users/alice/home/hypr/hyprland.conf
+++ b/users/alice/home/hypr/hyprland.conf
@@ -116,8 +116,8 @@ master {
 }

 gestures {
-    # See https://wiki.hypr.land/Configuring/Gestures/ for more
-    gesture = 3, horizontal, workspace
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = off
 }

 misc {
@@ -149,7 +149,6 @@ bind = $mainMod, W, killactive,
 #bind = $mainMod, W, exit, 
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating, 
-bind = $mainMod, F, fullscreen, toggle
 bind = $mainMod, SPACE, exec, $menu
 bind = $mainMod, O, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -108,8 +108,5 @@

    # media tools
    #deepin.deepin-music
-
-    # arch zed deps
-    nixd
  ];
 }