Move Firefox/Thunderbird configs here from dotfiles, combine all two-item attrsets That second thing is probably super controversial since it bloats up the line and byte counts, but my reasoning is that I'm currently doing it inconsistently in various places and plus who cares about line counts anyways.

Changes

5 changed files (+80/-53)

• ThinkPad-X1-Yoga-Gen-6/default.nix
  • @@ -14,22 +14,32 @@
    # Overlays! Fixed points! nixpkgs.overlays = [ (import ./overlays.nix) ]; - # Auto screen rotation in tablet mode - hardware.sensor.iio.enable = true; - # VA-API - hardware.graphics.extraPackages = with pkgs; [ intel-media-driver ]; + hardware = { + # Auto screen rotation in tablet mode + sensor.iio.enable = true; + # VA-API + graphics.extraPackages = with pkgs; [ intel-media-driver ]; + }; boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - networking.hostName = "ThinkPad-X1-Yoga-Gen-6"; - # TODO: nmcli connection modify "MIT SECURE" +ipv4.routes "10.0.0.0/9" - networking.networkmanager.enable = true; + networking = { + hostName = "ThinkPad-X1-Yoga-Gen-6"; + # TODO: nmcli connection modify "MIT SECURE" +ipv4.routes "10.0.0.0/9" + networkmanager.enable = true; + }; programs = { - firefox.enable = true; + firefox = { + enable = true; + preferences = { + "widget.use-xdg-desktop-portal.file-picker" = 1; + "places.history.expiration.max_pages" = 2147483647; + }; + }; # Disable Akonadi and other evil things kde-pim.enable = false; kdeconnect.enable = true;
  • @@ -39,7 +49,12 @@
    startAgent = true; enableAskPassword = true; }; - thunderbird.enable = true; + thunderbird = { + enable = true; + preferences = { + "widget.use-xdg-desktop-portal.file-picker" = 1; + }; + }; }; # Enable Podman because I'm weak and need my Arch Linux help I need it I really need it
  • @@ -83,20 +98,22 @@
    # For VSCodium environment.variables.NIXOS_OZONE_WL = "1"; - # The default CJK font (Unifont) looks atrocious - fonts.packages = with pkgs; [ wqy_microhei ]; - # Fix broken emojis - # https://github.com/NixOS/nixpkgs/issues/336989 - fonts.fontconfig.localConf = '' - <match target="font"> - <test name="family" qual="first"> - <string>Noto Color Emoji</string> - </test> - <edit name="antialias" mode="assign"> - <bool>false</bool> - </edit> - </match> - ''; + fonts = { + # The default CJK font (Unifont) looks atrocious + packages = with pkgs; [ wqy_microhei ]; + # Fix broken emojis + # https://github.com/NixOS/nixpkgs/issues/336989 + fontconfig.localConf = '' + <match target="font"> + <test name="family" qual="first"> + <string>Noto Color Emoji</string> + </test> + <edit name="antialias" mode="assign"> + <bool>false</bool> + </edit> + </match> + ''; + }; # TODO: Plasma also pulls in ibus unfortunately # https://github.com/NixOS/nixpkgs/issues/303593
  • @@ -158,11 +175,11 @@
    }; }; }; - systemd.services.btrbk-btrbk = { + systemd.services.btrbk-btrbk.serviceConfig = { # Wait for internet connectivity if we just woke up - serviceConfig.ExecStartPre = "${pkgs.networkmanager}/bin/nm-online -q"; + ExecStartPre = "${pkgs.networkmanager}/bin/nm-online -q"; # + makes this run as root instead of the btrbk user - serviceConfig.ExecStartPost = + ExecStartPost = "+" + pkgs.writeShellScript "symlink latest srv" '' cd /.snapshots
• Unnamed-Server/default.nix
  • @@ -43,13 +43,15 @@
    }; }; - # XVM only has BIOS not UEFI, so no systemd-boot 😭 - boot.loader.grub.enable = true; - # Spooky Xen stuff - boot.initrd.availableKernelModules = [ - "xen-blkfront" - "xen-netfront" - ]; + boot = { + # XVM only has BIOS not UEFI, so no systemd-boot 😭 + loader.grub.enable = true; + # Spooky Xen stuff + initrd.availableKernelModules = [ + "xen-blkfront" + "xen-netfront" + ]; + }; nix = { # https://crystalwobsite.gay/posts/2025-02-09-deploying_nixos#deploying-with-a-trusted-key
  • @@ -60,9 +62,11 @@
    daemonIOSchedClass = "idle"; }; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - # Overlays! Fixed points! - nixpkgs.overlays = [ (import ./overlays.nix) ]; + nixpkgs = { + hostPlatform = lib.mkDefault "x86_64-linux"; + # Overlays! Fixed points! + overlays = [ (import ./overlays.nix) ]; + }; networking.hostName = "Unnamed-Server";
• configuration.nix
  • @@ -18,16 +18,18 @@
    # Not sure why the inconsistency... dates = [ "weekly" ]; }; - # Don't trash my $HOME please like come on it's not 2005 anymore - settings.use-xdg-base-directories = true; - # Fancy stuff yay - # The new CLI is so much better anyways - # Why oh why is it still "experimental" - settings.experimental-features = [ - "nix-command" - "flakes" - "pipe-operators" - ]; + settings = { + # Don't trash my $HOME please like come on it's not 2005 anymore + use-xdg-base-directories = true; + # Fancy stuff yay + # The new CLI is so much better anyways + # Why oh why is it still "experimental" + experimental-features = [ + "nix-command" + "flakes" + "pipe-operators" + ]; + }; }; boot = {
• flake.lock
  • @@ -61,11 +61,11 @@
    }, "nixpkgs": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": {
• flake.nix
  • @@ -4,12 +4,16 @@
    # For building an image for XVM # https://lantian.pub/en/article/modify-computer/nixos-low-ram-vps.lantian/ # https://unnamed.website/posts/nixvm/ - disko.url = "github:nix-community/disko/latest"; - disko.inputs.nixpkgs.follows = "nixpkgs"; + disko = { + url = "github:nix-community/disko/latest"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # https://crystalwobsite.gay/posts/2025-02-09-deploying_nixos # https://lantian.pub/en/article/modify-website/nixos-initial-config-flake-deploy.lantian/#batch-deployment-with-deploy-rs - deploy-rs.url = "github:serokell/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + deploy-rs = { + url = "github:serokell/deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nixpkgs, ... }: