From 0eb7eb7475d64eda0f2bdbb802363ef03c02ca0d Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sat, 7 Jun 2025 17:59:34 +0300 Subject: [PATCH] treewide: update flake lock --- flake.lock | 134 ++++++++++++------ modules/common/agenix.nix | 4 +- modules/common/jujutsu.nix | 5 +- modules/darwin/system-config-primary-user.nix | 5 + modules/linux/steam.nix | 11 +- 5 files changed, 98 insertions(+), 61 deletions(-) create mode 100644 modules/darwin/system-config-primary-user.nix diff --git a/flake.lock b/flake.lock index 35cf612..17bbbd2 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,10 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -51,11 +50,10 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1744501884, - "narHash": "sha256-53+m6VaUK32GfHLRg1d5qRR9klu8XNytPEctTQtZNaA=", + "lastModified": 1749186560, "owner": "RGBCube", "repo": "crash", - "rev": "7849872b30482ecab7d3586246e46855522ea64d", + "rev": "fd77a5a50c9c49a9b18302ae305c274f04373174", "type": "github" }, "original": { @@ -70,11 +68,10 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1746599904, - "narHash": "sha256-bykoJKLSbNANMY5nedzVYa2Z3GF8poQsNTHAnc19alM=", + "lastModified": 1749278330, "owner": "nix-community", "repo": "fenix", - "rev": "589e863010225278a042480fed5b6feacb364a65", + "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", "type": "github" }, "original": { @@ -102,11 +99,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -154,6 +151,32 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -192,7 +215,6 @@ }, "locked": { "lastModified": 1746536662, - "narHash": "sha256-rcHrc39hdGcMg2MRzcj2nMW07ga4YbJMkcMUkeew+MU=", "owner": "RGBCube", "repo": "GitHub2Forgejo", "rev": "ba581ae4f2726257682ad626d4f657898d44ce05", @@ -204,6 +226,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -211,11 +255,10 @@ ] }, "locked": { - "lastModified": 1746632058, - "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", + "lastModified": 1749243446, "owner": "nix-community", "repo": "home-manager", - "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -232,7 +275,6 @@ }, "locked": { "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", "rev": "577d160da311cc7f5042038456a0713e9863d09e", @@ -253,11 +295,10 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1747093184, - "narHash": "sha256-4QVmtRMUzw0GMyJmU93IlorvuZaUjyZUL7LYFSE1LCg=", + "lastModified": 1749233614, "owner": "DeterminateSystems", "repo": "nix-src", - "rev": "6baf6470bf09ba156a85c1efcf642182f393ca1b", + "rev": "0e1df1c0f14198b12640f032156eb3e7531a4f3a", "type": "github" }, "original": { @@ -273,11 +314,10 @@ ] }, "locked": { - "lastModified": 1746254942, - "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", + "lastModified": 1749194393, "owner": "LnL7", "repo": "nix-darwin", - "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", + "rev": "19346808c445f23b08652971be198b9df6c33edc", "type": "github" }, "original": { @@ -290,17 +330,17 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746637515, - "narHash": "sha256-bUq2uHmsfY3SpJrR4dpncITykufTiD2320JsOKgIYl0=", + "lastModified": 1749244584, "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "a7d2b05a9920d90f5eb8076f449acdb6c1ad79ca", + "rev": "8b27add0883067e990bff4f847b6f7b6f53324b9", "type": "gitlab" }, "original": { @@ -312,11 +352,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -342,19 +382,20 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-regression": { @@ -391,27 +432,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734359947, - "narHash": "sha256-1Noao/H+N8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d12d5e70ee91fe8481378e540433a7303dbf6a", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1749143949, "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -439,11 +479,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746522319, - "narHash": "sha256-q+Qo00BFgXN6xKrsrQI1P7Z3K1s2zKT0GNl0h8DwBH4=", + "lastModified": 1749194353, + "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "debaef80be92d957f52d6e89c86286556075ea47", + "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", "type": "github" }, "original": { diff --git a/modules/common/agenix.nix b/modules/common/agenix.nix index a212da8..e95b084 100644 --- a/modules/common/agenix.nix +++ b/modules/common/agenix.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }: let - inherit (lib) attrNames attrValues head mkAliasOptionModule mkIf; + inherit (lib) attrNames attrValues filterAttrs hasPrefix head mkAliasOptionModule mkIf; in { imports = [(mkAliasOptionModule [ "secrets" ] [ "age" "secrets" ])]; @@ -7,7 +7,7 @@ in { (if config.isLinux then "/root/.ssh/id" else - "/Users/${head <| attrNames <| config.users.users}/.ssh/id") + "/Users/${head <| attrNames <| filterAttrs (_: value: value.home != null && hasPrefix "/Users/" value.home) config.users.users}/.ssh/id") ]; environment = mkIf config.isDesktop { diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index 36a71eb..05405ec 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -70,8 +70,8 @@ in { ui.default-command = "ls"; - ui.diff-editor = ":builtin"; - ui.diff.tool = [ "difft" "--color" "always" "$left" "$right" ]; + ui.diff-editor = ":builtin"; + ui.diff-formatter = [ "difft" "--color" "always" "$left" "$right" ]; ui.conflict-marker-style = "snapshot"; ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square"; @@ -90,7 +90,6 @@ in { git.auto-local-bookmark = true; git.push-bookmark-prefix = "change-rgbcube-"; - git.subprocess = true; git.fetch = [ "origin" "upstream" "rad" ]; git.push = "origin"; diff --git a/modules/darwin/system-config-primary-user.nix b/modules/darwin/system-config-primary-user.nix new file mode 100644 index 0000000..7ad52fb --- /dev/null +++ b/modules/darwin/system-config-primary-user.nix @@ -0,0 +1,5 @@ +{ config, lib, ... }: let + inherit (lib) attrNames filterAttrs hasPrefix head; +in { + system.primaryUser = head <| attrNames <| filterAttrs (_: value: value.home != null && hasPrefix "/Users/" value.home) config.users.users; +} diff --git a/modules/linux/steam.nix b/modules/linux/steam.nix index be8c50b..049a891 100644 --- a/modules/linux/steam.nix +++ b/modules/linux/steam.nix @@ -1,12 +1,5 @@ { config, pkgs, lib, ... }: let - inherit (lib) attrValues merge mkIf; + inherit (lib) enabled merge mkIf; in merge <| mkIf config.isDesktop { - # Steam uses 32-bit drivers for some unholy fucking reason. - hardware.graphics.enable32Bit = true; - - environment.systemPackages = attrValues { - inherit (pkgs) - steam - ; - }; + programs.steam = enabled; }