From 0e40b878c8ee64dece469d7012e83061d0d26f4b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 4 Dec 2025 10:55:20 -0500 Subject: [PATCH] upgrade to 25.11 --- flake.lock | 203 ++++++++---------- flake.nix | 4 +- hosts/fwbook.nix | 8 +- hosts/hl-bigbox1.nix | 8 +- hosts/hl-fwdesk.nix | 4 +- modules/home/default.nix | 24 +-- modules/home/git.nix | 33 +-- modules/home/programs.nix | 2 +- modules/nixos/common/default.nix | 1 - modules/nixos/common/fonts.nix | 4 +- modules/nixos/common/hardware/amdgpu.nix | 8 +- .../nixos/common/hardware/laptop-power.nix | 22 +- modules/nixos/desktop/gnome.nix | 2 +- modules/nixos/desktop/tiler/default.nix | 1 - 14 files changed, 151 insertions(+), 173 deletions(-) diff --git a/flake.lock b/flake.lock index 79c2533..226a0b8 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -105,21 +105,17 @@ "inputs": { "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", - "determinate-nixd-x86_64-darwin": [ - "determinate", - "determinate-nixd-aarch64-darwin" - ], "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", "nix": "nix", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761251546, - "narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=", - "rev": "70beec406153496943274f59cb2ded76be49fcd7", - "revCount": 306, + "lastModified": 1763536872, + "narHash": "sha256-QCYGGghBya+qsY59f1zzgYzxEzz+N9S7YRkVWDIDbgo=", + "rev": "f4e598cbb10021c93f73dd4c0cf01ec791ea53f9", + "revCount": 315, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.0/019a12c8-c95c-7c68-8da4-d8cc92608fbf/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.13.2/019a9b01-c0c6-7e1c-959e-98ac5b7675de/source.tar.gz" }, "original": { "type": "tarball", @@ -129,47 +125,47 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=", + "narHash": "sha256-g1r0dPwlUi1h96c4BuHzv9M2lWDqRy9bPDW9tRSq35I=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=", + "narHash": "sha256-xn324irXG/EpUdUfUGFrlJNg23JN2cVArd5LsFPjGKc=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=", + "narHash": "sha256-VPM5FOGwEjl56b7Edvg3sduvauPHCyXZ11fN9hcUdTU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux" } }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -223,11 +219,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -281,18 +277,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -302,16 +300,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764776959, + "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -419,11 +417,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1763819300, - "narHash": "sha256-WBTSRJ0PrVW+zDmTraJFXsAKPrYn01VgXvEtcixIEsQ=", + "lastModified": 1764812569, + "narHash": "sha256-WvdCYnwzGmXYDsYMcBISom+6tIAk18jKq4zZvEoYlnw=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "53a6b3f2d7f6e3981347ddaaf469b16964287fc2", + "rev": "64cc3c75ec0257a1970f64d403e390466f4577e4", "type": "github" }, "original": { @@ -562,12 +560,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1761238235, - "narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=", - "rev": "9512828397f684d0f732ea76b7631f69a0db34f7", - "revCount": 23138, + "lastModified": 1763534330, + "narHash": "sha256-gTuB2qBdSKCKnZwENTqScs/pPBaZQOv6zZ1KJvV/ohk=", + "rev": "be871f9baf5366a220b5f25634eebab6f452a017", + "revCount": 23278, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.0/019a1277-d4c6-7dca-9d55-ee5165fd0bf6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.13.2/019a9af6-3d7b-71bc-bccd-8b18e147ad77/source.tar.gz" }, "original": { "type": "tarball", @@ -581,11 +579,11 @@ ] }, "locked": { - "lastModified": 1761339987, - "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -612,11 +610,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -628,12 +626,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", - "revCount": 808723, + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" }, "original": { "type": "tarball", @@ -674,12 +672,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", - "revCount": 886100, + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "rev": "418468ac9527e799809c900eda37cbff999199b6", + "revCount": 905402, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.886100%2Brev-08dacfca559e1d7da38f3cf05f1f45ee9bfd213c/019a329e-32b1-7e68-9599-4784bdd5f623/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.905402%2Brev-418468ac9527e799809c900eda37cbff999199b6/019ae5d7-2ce4-7dbb-90bd-21ec6e69adb4/source.tar.gz" }, "original": { "type": "tarball", @@ -688,12 +686,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760965567, - "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", - "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", - "revCount": 880602, + "lastModified": 1763375004, + "narHash": "sha256-e81Xfa7xhRZfqGB4s3xEvrg4p1v+fToM6CIQlXUyaX0=", + "rev": "8b6600824693a9c706ef09bd86711ca393703466", + "revCount": 897465, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.880602%2Brev-cb82756ecc37fa623f8cf3e88854f9bf7f64af93/019a0545-358b-78f4-97fe-88a7820eac2f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.897465%2Brev-8b6600824693a9c706ef09bd86711ca393703466/019a9577-b407-75dd-b18b-3308def1c215/source.tar.gz" }, "original": { "type": "tarball", @@ -718,12 +716,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", - "revCount": 811874, + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "revCount": 902477, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.902477%2Brev-8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f/019adb02-05a7-7ad2-9f74-6687e899006d/source.tar.gz" }, "original": { "type": "tarball", @@ -739,15 +737,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -791,16 +788,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762295027, - "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", + "lastModified": 1764795851, + "narHash": "sha256-DgtI/SwRiVnAfAVrXoRFymVP1AGvB3ZxYL6XMOZFvJQ=", "owner": "nix-community", "repo": "stylix", - "rev": "91b9a270523361268ba6a8772152fde31103869f", + "rev": "cfde343ff369c8aa898f263ed3dad8c5eb095491", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -886,11 +883,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -902,11 +899,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -918,11 +915,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -930,28 +927,6 @@ "repo": "base16-zed", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4a06723..80897c4 100644 --- a/flake.nix +++ b/flake.nix @@ -11,12 +11,12 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; # Themes stylix = { - url = "github:nix-community/stylix/release-25.05"; + url = "github:nix-community/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; # Macos diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index cce199b..ffdf5d0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -67,8 +67,8 @@ in # Tailscale services.tailscale.enable = true; # Desktop Env - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; + services.displayManager.gdm.enable = true; + services.displayManager.gdm.wayland = true; services.displayManager.defaultSession = "niri"; # home manager home-manager.users.${user.name} = { @@ -167,7 +167,7 @@ in # Development vscode - zed-editor + zed-editor-fhs devenv just rpi-imager @@ -183,7 +183,7 @@ in bitwarden-cli # documents - onlyoffice-bin_latest + onlyoffice-desktopeditors # Work gdk diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 96e43c2..94ea4b4 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -56,8 +56,8 @@ networkDrives.enable = true; }; services.displayManager.defaultSession = "gnome"; - services.xserver.displayManager.gdm.enable = false; - services.xserver.displayManager.gdm.wayland = false; + services.displayManager.gdm.enable = false; + services.displayManager.gdm.wayland = false; services.autosuspend.enable = false; services.displayManager.autoLogin = { enable = true; @@ -70,8 +70,8 @@ systemd.targets.suspend.enable = false; systemd.targets.hibernate.enable = false; systemd.targets.hybrid-sleep.enable = false; - services.xserver.displayManager.gdm.autoSuspend = false; - services.xserver.displayManager.gdm.autoLogin.delay = 0; + services.displayManager.gdm.autoSuspend = false; + services.displayManager.gdm.autoLogin.delay = 0; # Remote Desktop services.xrdp.enable = true; services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 3363ed3..85e2261 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -58,8 +58,8 @@ in # Tailscale services.tailscale.enable = true; # Desktop Env - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; + services.displayManager.gdm.enable = true; + services.displayManager.gdm.wayland = true; services.displayManager.defaultSession = "niri"; # Firmware updater services.fwupd.enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index 33fbd8e..42914dd 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -32,13 +32,11 @@ in user = { name = "root"; }; - }) // { - git = (makeCommonGitConfigs { - userName = "root"; - userEmail = "root@${hostName}"; - extraGitConfigs = [ ]; - }); - }; + }) // (makeCommonGitConfigs { + userName = "root"; + userEmail = "root@${hostName}"; + extraGitConfigs = [ ]; + }); services = servicesModule { pkgs = pkgs; }; fonts = fontsModule; }; @@ -71,13 +69,11 @@ in }; programs = (programsModule { inherit pkgs user; - }) // { - git = (makeCommonGitConfigs { - userName = fullName; - userEmail = email; - extraGitConfigs = extraGitConfigs; - }); - }; + }) // (makeCommonGitConfigs { + userName = fullName; + userEmail = email; + extraGitConfigs = extraGitConfigs; + }); services = servicesModule { pkgs = pkgs; }; }; } diff --git a/modules/home/git.nix b/modules/home/git.nix index 23b6731..ad5f02a 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -7,21 +7,28 @@ let , userEmail , extraGitConfigs ? [ ] }: { - enable = true; - userName = userName; - userEmail = userEmail; - delta = { enable = true; }; - extraConfig = { - color = { ui = "auto"; }; - push = { - default = "upstream"; - autoSetupRemote = true; + delta = { + enable = true; + enableGitIntegration = true; + }; + git = { + enable = true; + settings = { + user = { + name = userName; + email = userEmail; + }; + color = { ui = "auto"; }; + push = { + default = "upstream"; + autoSetupRemote = true; + }; + init = { defaultBranch = "main"; }; }; - init = { defaultBranch = "main"; }; + includes = + (builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles) + ++ extraGitConfigs; }; - includes = - (builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles) - ++ extraGitConfigs; }; in { diff --git a/modules/home/programs.nix b/modules/home/programs.nix index 42f2d7d..1979d55 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -80,7 +80,7 @@ ''; plugins = with pkgs.nushellPlugins; [ polars - net + # net highlight ]; }; diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 4f73195..8a16cab 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -13,6 +13,5 @@ ]; config = { environment.sessionVariables.EDITOR = "vi"; - programs.thefuck.enable = true; }; } diff --git a/modules/nixos/common/fonts.nix b/modules/nixos/common/fonts.nix index 0c25cd2..421d76c 100644 --- a/modules/nixos/common/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -9,10 +9,9 @@ let font-awesome mplus-outline-fonts.githubRelease jetbrains-mono - ubuntu_font_family + ubuntu-classic noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji noto-fonts-color-emoji ]; in @@ -32,4 +31,3 @@ in }; }; } - diff --git a/modules/nixos/common/hardware/amdgpu.nix b/modules/nixos/common/hardware/amdgpu.nix index 2729e91..ac89f89 100644 --- a/modules/nixos/common/hardware/amdgpu.nix +++ b/modules/nixos/common/hardware/amdgpu.nix @@ -14,10 +14,10 @@ in config = lib.mkIf cfg.enable { boot.initrd.kernelModules = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ]; - hardware.graphics = { - extraPackages = [ pkgs.amdvlk ]; - extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; - }; + # hardware.graphics = { + # extraPackages = [ pkgs.amdvlk ]; + # extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + # }; environment.systemPackages = (with pkgs; [ rocmPackages.rocm-smi rocmPackages.rpp diff --git a/modules/nixos/common/hardware/laptop-power.nix b/modules/nixos/common/hardware/laptop-power.nix index 66f8810..7bae8ec 100644 --- a/modules/nixos/common/hardware/laptop-power.nix +++ b/modules/nixos/common/hardware/laptop-power.nix @@ -56,15 +56,19 @@ in systemd.sleep.extraConfig = "HibernateDelaySec=30m"; # Logind services.logind = { - lidSwitchExternalPower = "suspend-then-hibernate"; - lidSwitch = "suspend-then-hibernate"; - powerKey = "lock"; - extraConfig = '' - LidSwitchIgnoreInhibited=yes - HandlePowerKey=suspend-then-hibernate - IdleAction=suspend-then-hibernate - IdleActionSec=2m - ''; + settings = { + Login = { + HandleLidSwitchExternalPower = "suspend-then-hibernate"; + HandleLidSwitch = "suspend-then-hibernate"; + HandlePowerKey = "lock"; + }; + }; + # extraConfig = '' + # LidSwitchIgnoreInhibited=yes + # HandlePowerKey=suspend-then-hibernate + # IdleAction=suspend-then-hibernate + # IdleActionSec=2m + # ''; }; }; } diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix index f6cef24..6091487 100644 --- a/modules/nixos/desktop/gnome.nix +++ b/modules/nixos/desktop/gnome.nix @@ -15,7 +15,7 @@ in }; }; config = lib.mkIf cfg.enable { - services.xserver.desktopManager.gnome.enable = true; + services.desktopManager.gnome.enable = true; environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-text-editor diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index 9517029..c9568bb 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -32,7 +32,6 @@ in mako wofi rofi - rofi-wayland # Control Tools pavucontrol playerctl