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