From 16c57c59679cb087177b8d5717e5513038f2c78f Mon Sep 17 00:00:00 2001 From: macronova Date: Wed, 29 Oct 2025 22:58:56 -0700 Subject: [PATCH] Update flake --- common/users.nix | 6 ++-- flake.lock | 72 ++++++++++++++++++++++---------------------- linux/quasar/gui.nix | 6 ++-- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/common/users.nix b/common/users.nix index 0d14991..341624f 100644 --- a/common/users.nix +++ b/common/users.nix @@ -78,8 +78,10 @@ in { ".direnv" ".envrc" ]; - userEmail = postMaster; - userName = userName; + settings.user = { + email = postMaster; + name = userName; + }; }; helix = { enable = true; diff --git a/flake.lock b/flake.lock index 22c3bf6..f55c819 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1761759700, + "narHash": "sha256-zuiwvKAPwtMmwf44tb7Q7Y5d7JkBeuaF89PISUnkWA8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "2379bc40992ec29feb1933bb4acd224fa055f3f8", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761770832, + "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1761748321, + "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "533db5857c9e00ca352558a928417116ee08a824", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1760589026, - "narHash": "sha256-cBy77jhQvkBjHEpPC4HAjVl6jYdz1FUfPYGZxZmzR18=", + "lastModified": 1761803885, + "narHash": "sha256-tIA/Lu7+m3x3Hq+sMzK8Wv6bMNLI3WpuBEjBmNU4ppY=", "ref": "refs/heads/main", - "rev": "97e696e37d7185f60aa35549be0a2c551c4c802a", - "revCount": 45, + "rev": "20edd03aa4fc150a2155959f82075fc63021960e", + "revCount": 47, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -342,11 +342,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1759321049, - "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", + "lastModified": 1761078382, + "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", + "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1760392170, - "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1760393368, - "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "sweet-ambar-blue": { "flake": false, "locked": { - "lastModified": 1759874534, - "narHash": "sha256-aA/wuj7Oc+4fkOrL8Qj/kTF2NzZrZ3/rNAmYs9nFxpw=", + "lastModified": 1760648820, + "narHash": "sha256-c8VDpDzgwnl53frZ2mSEjUEdQwHT2Vyxu99SIzqfS2g=", "ref": "Ambar-Blue", - "rev": "f2d784908d2737b40379c55c79e9b09f1c6e6b99", - "revCount": 344, + "rev": "4781ed7639d1adc31e9ed0b6ff1ff070e580a144", + "revCount": 346, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -470,11 +470,11 @@ "sweet-ambar-blue-dark": { "flake": false, "locked": { - "lastModified": 1759874277, - "narHash": "sha256-rULe52jTuZ+SFUkPEq0r91LML1z6fcMuXI+SDxWh7xI=", + "lastModified": 1760648872, + "narHash": "sha256-H5dWbA7KADhVPHLQI+WRGekcaS2QTBPYwGBF/O+ZOqc=", "ref": "Ambar-Blue-Dark", - "rev": "9f4378087326b6b594af7f61ea8a0ddea7f50056", - "revCount": 427, + "rev": "26b987cb86deec843d7b6bb4adda28a7d3946c8f", + "revCount": 428, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, diff --git a/linux/quasar/gui.nix b/linux/quasar/gui.nix index bb3ae9a..02daf8a 100644 --- a/linux/quasar/gui.nix +++ b/linux/quasar/gui.nix @@ -15,11 +15,10 @@ in { in { home.packages = with pkgs; [ exactaudiocopy - feishin-latest + feishin jellyfin-mpv-shim joplin-desktop lutris - nvtopPackages.full picard qbittorrent retroarch-free @@ -27,7 +26,8 @@ in { thunderbird via winetricks - wineWowPackages.stagingFull + wineWow64Packages.fonts + wineWow64Packages.stagingFull ]; programs = { git.signing = {