From 36fa73a3b6350e933875a9635b894a4cf3d790d8 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 29 Apr 2025 13:07:33 +0100 Subject: [PATCH] Shallow clone all flake inputs Change geoclue provider to beacondb Add popsicle Add interpolation to default mpv Download from vscode store while openvsx is down Remove webp extension --- configuration/base.nix | 5 +++- devices/tuxedo/home.nix | 1 + flake.lock | 44 ++++++++++++++--------------- flake.nix | 16 +++++------ home-manager/base.nix | 2 ++ home-manager/development/games.nix | 11 ++------ home-manager/development/vscode.nix | 2 +- home-manager/firefox/firefox.nix | 1 - 8 files changed, 40 insertions(+), 42 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index ed33fea..c3b2826 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -61,7 +61,10 @@ }; services.fwupd.enable = true; - services.geoclue2.enable = true; + services.geoclue2 = { + enable = true; + geoProviderUrl = "https://api.beacondb.net/v1/geolocate"; + }; services.flatpak.enable = true; # List packages installed in system profile. To search, run: diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 35493fc..51f9afc 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -43,6 +43,7 @@ syncthing dbeaver-bin ruffle + popsicle ]; home.file = { diff --git a/flake.lock b/flake.lock index bcd49af..36ed526 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744422829, - "narHash": "sha256-rvWFZG02MQuzKLueDQryCLEljRV0Ot4uo44hoKC3CHg=", + "lastModified": 1745719264, + "narHash": "sha256-xYBggJ4x3RE064ihmgmt/k0O8fqdI45O4q1xp5uAick=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "eda6606c9e4790ebe074d18ef074906a750f0d53", + "rev": "da2903cd3b07be34ca9d7d3397b556281ec81f98", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -116,27 +116,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740547748, - "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e33919a..d377ddf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,23 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11?shallow=1"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1"; + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?shallow=1"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.11?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; disko = { - url = "github:nix-community/disko"; + url = "github:nix-community/disko?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; system-manager = { - url = "github:numtide/system-manager"; + url = "github:numtide/system-manager?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-system-graphics = { - url = "github:soupglasses/nix-system-graphics"; + url = "github:soupglasses/nix-system-graphics?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home-manager/base.nix b/home-manager/base.nix index 0d8644a..7ead140 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -56,6 +56,8 @@ } ); config = { + video-sync = "display-resample"; + interpolation = "yes"; screenshot-directory = "~/Pictures/"; screenshot-template = "%F/%F_snapshot_%P"; }; diff --git a/home-manager/development/games.nix b/home-manager/development/games.nix index 48b943a..c60dd79 100644 --- a/home-manager/development/games.nix +++ b/home-manager/development/games.nix @@ -1,16 +1,9 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs;[ jetbrains.rider # Remove when https://github.com/NixOS/nixpkgs/issues/393332 resolved (likely when 25.05 is out) - (symlinkJoin { - name = "godot-mono"; - paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ]; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 - ''; - }) + # godot_4-mono ]; } diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 35dfca9..58a9639 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -16,7 +16,7 @@ in mutableExtensionsDir = false; enableUpdateCheck = false; enableExtensionUpdateCheck = false; - extensions = with openvsx-extensions;[ + extensions = with vscode-extensions;[ biomejs.biome mkhl.direnv dracula-theme.theme-dracula diff --git a/home-manager/firefox/firefox.nix b/home-manager/firefox/firefox.nix index ffb84e2..88c9c57 100644 --- a/home-manager/firefox/firefox.nix +++ b/home-manager/firefox/firefox.nix @@ -27,7 +27,6 @@ (extension "cookie-autodelete" "CookieAutoDelete@kennydo.com") # Annoyances - (extension "dont-accept-webp" "dont-accept-webp@jeffersonscher.com") (extension "sponsorblock" "sponsorBlocker@ajay.app") (extension "bandcamp-player-volume-control" "{308ec088-284a-40fe-ae14-7c917526f694}")