From 0e40b878c8ee64dece469d7012e83061d0d26f4b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 4 Dec 2025 10:55:20 -0500 Subject: [PATCH 1/4] 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 From bccb61ec27b46aceb355769d4ac9a4ea70ec91f1 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 4 Dec 2025 11:26:23 -0500 Subject: [PATCH 2/4] nicer niri stuff --- configs/niri/config.kdl | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 59a378f..fd5b924 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -97,7 +97,7 @@ layout { default-column-width { proportion 0.5; } focus-ring { width 4 - active-gradient from="#f00f" to="#0f05" angle=45 in="oklch longer hue" + active-gradient from="#ff06" to="#af0f" angle=45 in="oklch longer hue" inactive-color "#505050" } border { @@ -163,6 +163,10 @@ window-rule { match is-active=false opacity 0.85 } +window-rule { + match is-urgent=true + open-focused true +} window-rule { match app-id="satty" open-focused true @@ -186,6 +190,20 @@ window-rule { open-focused true opacity 0.95 } +window-rule { + match app-id=r"Bitwarden" + match app-id="Sparrow" + match title="Bitwarden" + block-out-from "screen-capture" + shadow { + on + } + focus-ring { + width 4 + active-color "#f00f" + inactive-color "#f00f" + } +} // ========================= // General Stuff // ========================= @@ -259,3 +277,35 @@ binds { } spawn-at-startup "/home/ari/.config/niri/start-up-script.sh" + + +recent-windows { + // off + debounce-ms 750 + + open-delay-ms 150 + + highlight { + active-color "#999999ff" + urgent-color "#ff9999ff" + padding 30 + corner-radius 0 + } + + previews { + max-height 480 + max-scale 0.5 + } + + binds { + Alt+Tab { next-window; } + Alt+Shift+Tab { previous-window; } + Alt+grave { next-window filter="app-id"; } + Alt+Shift+grave { previous-window filter="app-id"; } + + Mod+Tab { next-window; } + Mod+Shift+Tab { previous-window; } + Mod+grave { next-window filter="app-id"; } + Mod+Shift+grave { previous-window filter="app-id"; } + } +} From f1613955f7eeac255d4cf1170f6ce22345a092ea Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 16 Dec 2025 09:50:09 -0500 Subject: [PATCH 3/4] updated --- configs/hypr/hyprland.conf | 7 +- configs/hypr/hyprland.conf..bak | 6 ++ flake.lock | 92 +++++++++++++------------- hosts/fwbook.nix | 64 ++++++++++++++----- modules/core/user.nix | 45 +++++++------ modules/home/default.nix | 110 +++++++++++++++++--------------- 6 files changed, 187 insertions(+), 137 deletions(-) mode change 100644 => 120000 configs/hypr/hyprland.conf create mode 100644 configs/hypr/hyprland.conf..bak diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf deleted file mode 100644 index 69d693f..0000000 --- a/configs/hypr/hyprland.conf +++ /dev/null @@ -1,6 +0,0 @@ -$terminal = ghostty -$fileManager = dolphin -$menu = walker -$browser = chromium - -source = ~/.config/hypr/hyprland.d/*.conf diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf new file mode 120000 index 0000000..cc7f560 --- /dev/null +++ b/configs/hypr/hyprland.conf @@ -0,0 +1 @@ +/nix/store/rkwj8mcdsv8gsmw2nlr52cfh3gkb5179-home-manager-files/.config/hypr/hyprland.conf \ No newline at end of file diff --git a/configs/hypr/hyprland.conf..bak b/configs/hypr/hyprland.conf..bak new file mode 100644 index 0000000..69d693f --- /dev/null +++ b/configs/hypr/hyprland.conf..bak @@ -0,0 +1,6 @@ +$terminal = ghostty +$fileManager = dolphin +$menu = walker +$browser = chromium + +source = ~/.config/hypr/hyprland.d/*.conf diff --git a/flake.lock b/flake.lock index 226a0b8..18f423c 100644 --- a/flake.lock +++ b/flake.lock @@ -110,12 +110,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763536872, - "narHash": "sha256-QCYGGghBya+qsY59f1zzgYzxEzz+N9S7YRkVWDIDbgo=", - "rev": "f4e598cbb10021c93f73dd4c0cf01ec791ea53f9", - "revCount": 315, + "lastModified": 1765254444, + "narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=", + "rev": "3ccc0297525e51ac3d7905509e0616c9c8350108", + "revCount": 316, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.13.2/019a9b01-c0c6-7e1c-959e-98ac5b7675de/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz" }, "original": { "type": "tarball", @@ -125,37 +125,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-g1r0dPwlUi1h96c4BuHzv9M2lWDqRy9bPDW9tRSq35I=", + "narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-xn324irXG/EpUdUfUGFrlJNg23JN2cVArd5LsFPjGKc=", + "narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-VPM5FOGwEjl56b7Edvg3sduvauPHCyXZ11fN9hcUdTU=", + "narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" } }, "firefox-gnome-theme": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1764776959, - "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", + "lastModified": 1765605144, + "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", + "rev": "90b62096f099b73043a747348c11dbfcfbdea949", "type": "github" }, "original": { @@ -417,11 +417,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1764812569, - "narHash": "sha256-WvdCYnwzGmXYDsYMcBISom+6tIAk18jKq4zZvEoYlnw=", + "lastModified": 1765324959, + "narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "64cc3c75ec0257a1970f64d403e390466f4577e4", + "rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd", "type": "github" }, "original": { @@ -560,12 +560,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1763534330, - "narHash": "sha256-gTuB2qBdSKCKnZwENTqScs/pPBaZQOv6zZ1KJvV/ohk=", - "rev": "be871f9baf5366a220b5f25634eebab6f452a017", - "revCount": 23278, + "lastModified": 1765252170, + "narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=", + "rev": "1ddd28880651054346c34009d7bb9de36f1db2c1", + "revCount": 23362, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.13.2/019a9af6-3d7b-71bc-bccd-8b18e147ad77/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz" }, "original": { "type": "tarball", @@ -579,11 +579,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765684049, + "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "type": "github" }, "original": { @@ -672,12 +672,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", - "rev": "418468ac9527e799809c900eda37cbff999199b6", - "revCount": 905402, + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "revCount": 912002, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.905402%2Brev-418468ac9527e799809c900eda37cbff999199b6/019ae5d7-2ce4-7dbb-90bd-21ec6e69adb4/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.912002%2Brev-1306659b587dc277866c7b69eb97e5f07864d8c4/019b2463-7b8e-7042-8b7e-490d08a3cd7a/source.tar.gz" }, "original": { "type": "tarball", @@ -686,12 +686,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763375004, - "narHash": "sha256-e81Xfa7xhRZfqGB4s3xEvrg4p1v+fToM6CIQlXUyaX0=", - "rev": "8b6600824693a9c706ef09bd86711ca393703466", - "revCount": 897465, + "lastModified": 1764611609, + "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=", + "rev": "8c29968b3a942f2903f90797f9623737c215737c", + "revCount": 905078, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.897465%2Brev-8b6600824693a9c706ef09bd86711ca393703466/019a9577-b407-75dd-b18b-3308def1c215/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz" }, "original": { "type": "tarball", @@ -716,12 +716,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", - "revCount": 902477, + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "revCount": 903561, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.902477%2Brev-8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f/019adb02-05a7-7ad2-9f74-6687e899006d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.903561%2Brev-c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d/019b231b-8461-7fef-af86-fa7662ea16ad/source.tar.gz" }, "original": { "type": "tarball", @@ -788,11 +788,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764795851, - "narHash": "sha256-DgtI/SwRiVnAfAVrXoRFymVP1AGvB3ZxYL6XMOZFvJQ=", + "lastModified": 1765802640, + "narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=", "owner": "nix-community", "repo": "stylix", - "rev": "cfde343ff369c8aa898f263ed3dad8c5eb095491", + "rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index ffdf5d0..4c40d91 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,10 @@ { user }: -{ pkgs, hyprlauncher, system, ... }: +{ + pkgs, + hyprlauncher, + system, + ... +}: let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; zshFunctions = zshFWBook + "/functions.sh"; @@ -97,7 +102,9 @@ in # Enable CUPS to print documents. services.printing.enable = true; # Bluetooth - hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; + hardware.bluetooth.settings.General = { + ControllerMode = "bredr"; + }; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; # Bootloader. @@ -110,11 +117,13 @@ in # Packages environment.systemPackages = let - gdk = pkgs.google-cloud-sdk.withExtraComponents - (with pkgs.google-cloud-sdk.components; [ + gdk = pkgs.google-cloud-sdk.withExtraComponents ( + with pkgs.google-cloud-sdk.components; + [ gke-gcloud-auth-plugin kubectl - ]); + ] + ); in (with pkgs; [ @@ -126,6 +135,7 @@ in openfortivpn openfortivpn-webview openfortivpn-webview-qt + nodejs # Util libusb1 @@ -246,8 +256,10 @@ in # # Brother Printer hardware.sane.brscan5.enable = true; # # Display Managers - services.xserver.videoDrivers = - [ "modesetting" "fbdev" ]; + services.xserver.videoDrivers = [ + "modesetting" + "fbdev" + ]; # Kernel boot.kernelPackages = pkgs.linuxPackages_zen; @@ -256,18 +268,36 @@ in fileSystems."/mnt/EightTerra/FamilyStorage" = { device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; + options = [ + "x-systemd.automount" + "noauto" + ]; + }; + fileSystems."/mnt/EightTerra/k3s-cluster" = { + device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; + fsType = "nfs"; + options = [ + "x-systemd.automount" + "noauto" + ]; }; # Remote Builder - nix.buildMachines = [{ - hostName = "root@bigbox1.lab.internal"; - system = "x86_64-linux"; - protocol = "ssh-ng"; - maxJobs = 1; - speedFactor = 2; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; - }]; + nix.buildMachines = [ + { + hostName = "root@bigbox1.lab.internal"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + maxJobs = 1; + speedFactor = 2; + supportedFeatures = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ]; + mandatoryFeatures = [ ]; + } + ]; nix.distributedBuilds = true; # optional, useful when the builder has a faster internet connection than yours nix.extraOptions = '' diff --git a/modules/core/user.nix b/modules/core/user.nix index dd10381..cb73afa 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -25,11 +30,13 @@ in type = types.str; }; extraGitConfigs = mkOption { - type = types.listOf (types.submodule { - path = mkOption { - type = types.str; - }; - }); + type = types.listOf ( + types.submodule { + path = mkOption { + type = types.str; + }; + } + ); default = [ ]; }; }; @@ -37,18 +44,20 @@ in config = let - hm = (import ../home { - stateVersion = cfg.home-manager.version; - }); + hm = ( + import ../home { + stateVersion = cfg.home-manager.version; + } + ); in - mkIf cfg.user.enable - { - programs.zsh.enable = true; - home-manager.users.root = - (hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; }; - home-manager.users.${cfg.user.name} = - ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // { - imports = cfg.home-manager.extraImports; - }; + mkIf cfg.user.enable { + programs.zsh.enable = true; + home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) { + pkgs = pkgs; }; + home-manager.backupFileExtension = ".bak"; + home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // { + imports = cfg.home-manager.extraImports; + }; + }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 42914dd..509c5c4 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -16,64 +16,74 @@ let }; in { - makeRootUser = { hostName }: { pkgs, ... }: { - home = homeModule // { - packages = with pkgs; [ - jq - kubectl - kubectx - htop - btop - duf - ]; - }; - programs = (programsModule { - pkgs = pkgs; - user = { - name = "root"; + makeRootUser = + { hostName }: + { pkgs, ... }: + { + home = homeModule // { + packages = with pkgs; [ + jq + kubectl + kubectx + htop + btop + duf + ]; }; - }) // (makeCommonGitConfigs { - userName = "root"; - userEmail = "root@${hostName}"; - extraGitConfigs = [ ]; - }); - services = servicesModule { pkgs = pkgs; }; - fonts = fontsModule; - }; + programs = + (programsModule { + pkgs = pkgs; + user = { + name = "root"; + }; + }) + // (makeCommonGitConfigs { + userName = "root"; + userEmail = "root@${hostName}"; + extraGitConfigs = [ ]; + }); + services = servicesModule { pkgs = pkgs; }; + fonts = fontsModule; + }; makeCommonUser = - { fullName - , email - , extraGitConfigs ? [ ] - , name - , ... - }@user: { pkgs, ... }: { + { + fullName, + email, + extraGitConfigs ? [ ], + name, + ... + }@user: + { pkgs, ... }: + { fonts = fontsModule; + # xdg.configFile."mimeapps.list".force = true; home = homeModule // { username = name; homeDirectory = "/home/${name}"; - packages = with pkgs; - [ - jq - nixpkgs-fmt - ipfetch - nixd - htop - btop - fastfetch - kubectl - kubectx - terraform - dust - ]; + packages = with pkgs; [ + jq + nixpkgs-fmt + ipfetch + nixd + htop + btop + fastfetch + kubectl + kubectx + terraform + dust + ]; }; - programs = (programsModule { - inherit pkgs user; - }) // (makeCommonGitConfigs { - userName = fullName; - userEmail = email; - extraGitConfigs = extraGitConfigs; - }); + programs = + (programsModule { + inherit pkgs user; + }) + // (makeCommonGitConfigs { + userName = fullName; + userEmail = email; + extraGitConfigs = extraGitConfigs; + }); services = servicesModule { pkgs = pkgs; }; }; } From 5632f1fbe59b23993bccf623bf5f9a40313fd230 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 22 Dec 2025 16:59:39 -0500 Subject: [PATCH 4/4] stable place --- configs/extra.nu | 14 ++ configs/hypr/hyprland.conf | 1 - flake.lock | 100 +++++++------- flake.nix | 150 ++++++++++++--------- hosts/fwbook.nix | 20 ++- hosts/scripts/fwbook/functions.sh | 4 - modules/nixos/common/hardware/pipewire.nix | 8 +- modules/nixos/desktop/default.nix | 13 +- modules/nixos/desktop/tiler/hyprland.nix | 30 +++-- modules/nixos/desktop/tiler/niri.nix | 27 ++-- 10 files changed, 214 insertions(+), 153 deletions(-) create mode 100644 configs/extra.nu delete mode 120000 configs/hypr/hyprland.conf diff --git a/configs/extra.nu b/configs/extra.nu new file mode 100644 index 0000000..8215368 --- /dev/null +++ b/configs/extra.nu @@ -0,0 +1,14 @@ +def rocm-monitor [ + cacheFile: string = "/tmp/rocm-monitor.jsonl", + timeout: duration = 1sec +] { + if ($cacheFile | path exists) { + rm $cacheFile + } + loop { + clear + rocm-smi --showmemuse --showuse --json | save --append $cacheFile + tail -n1 $cacheFile | from json --objects | flatten | print + sleep $timeout + } +} diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf deleted file mode 120000 index cc7f560..0000000 --- a/configs/hypr/hyprland.conf +++ /dev/null @@ -1 +0,0 @@ -/nix/store/rkwj8mcdsv8gsmw2nlr52cfh3gkb5179-home-manager-files/.config/hypr/hyprland.conf \ No newline at end of file diff --git a/flake.lock b/flake.lock index 18f423c..80a528a 100644 --- a/flake.lock +++ b/flake.lock @@ -54,17 +54,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -110,12 +110,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765254444, - "narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=", - "rev": "3ccc0297525e51ac3d7905509e0616c9c8350108", - "revCount": 316, + "lastModified": 1766177528, + "narHash": "sha256-Bl+p766mM7qNCZtMqmTz13RuUbOMKsFa+/vnGYoxgPk=", + "rev": "b159c082f0f9bdefa6c386189a13c5fa0734d8d8", + "revCount": 317, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.0/019b3865-57a1-7d80-98c5-962fac29c404/source.tar.gz" }, "original": { "type": "tarball", @@ -125,37 +125,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=", + "narHash": "sha256-vDaEQ5T4eA7kEPREmm68IVWGR6zT0aDL5slZxA6dkSc=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=", + "narHash": "sha256-Hf4JsIv5G3IR0Q0RHGLSNdmDzFv97sVQQKwzY6A0vV4=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=", + "narHash": "sha256-J+J4E02XpEl0ZkpzMbUmGCf6S4yk0gYCYmiGzZ058ik=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux" } }, "firefox-gnome-theme": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1765605144, - "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", + "lastModified": 1766292113, + "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "owner": "nix-community", "repo": "home-manager", - "rev": "90b62096f099b73043a747348c11dbfcfbdea949", + "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "type": "github" }, "original": { @@ -417,11 +417,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1765324959, - "narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=", + "lastModified": 1765891583, + "narHash": "sha256-M9tRbYnLx/3d3YwepFu0KvhiZ53i1hX+tLJLNeNYeaQ=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd", + "rev": "e50b5e0797915533c81cb95a6c3623541bfb5d7a", "type": "github" }, "original": { @@ -560,12 +560,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1765252170, - "narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=", - "rev": "1ddd28880651054346c34009d7bb9de36f1db2c1", - "revCount": 23362, + "lastModified": 1766174426, + "narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=", + "rev": "15d6091194b5b90d292e8d6283db77f09c303b1e", + "revCount": 24285, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.0/019b3854-cca6-7298-a91c-0fd8551a7270/source.tar.gz" }, "original": { "type": "tarball", @@ -579,11 +579,11 @@ ] }, "locked": { - "lastModified": 1765684049, - "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -672,12 +672,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", - "revCount": 912002, + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "revCount": 914755, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.912002%2Brev-1306659b587dc277866c7b69eb97e5f07864d8c4/019b2463-7b8e-7042-8b7e-490d08a3cd7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.914755%2Brev-a6531044f6d0bef691ea18d4d4ce44d0daa6e816/019b4613-7276-7c80-8e57-953e4698fb6e/source.tar.gz" }, "original": { "type": "tarball", @@ -686,12 +686,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764611609, - "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=", - "rev": "8c29968b3a942f2903f90797f9623737c215737c", - "revCount": 905078, + "lastModified": 1765772535, + "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=", + "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb", + "revCount": 911985, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.911985%2Brev-09b8fda8959d761445f12b55f380d90375a1d6bb/019b25ab-7c11-79e0-a0b0-c94d455b7190/source.tar.gz" }, "original": { "type": "tarball", @@ -716,12 +716,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", - "revCount": 903561, + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", + "revCount": 904049, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.903561%2Brev-c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d/019b231b-8461-7fef-af86-fa7662ea16ad/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz" }, "original": { "type": "tarball", @@ -788,11 +788,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765802640, - "narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=", + "lastModified": 1766418901, + "narHash": "sha256-zaISsfwlVaLTJrUIBJf1Mk83kKLp83bl1VOzf8QVczo=", "owner": "nix-community", "repo": "stylix", - "rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153", + "rev": "c51431509b7c8dec0cd0369ea3cc20a772c3dba1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 80897c4..380d291 100644 --- a/flake.nix +++ b/flake.nix @@ -29,17 +29,18 @@ }; outputs = - { self - , nixpkgs-unstable - , determinate - , nixos-hardware - , nixpkgs - , systems - , home-manager - , nix-darwin - , nix-flatpak - , stylix - , hyprlauncher + { + self, + nixpkgs-unstable, + determinate, + nixos-hardware, + nixpkgs, + systems, + home-manager, + nix-darwin, + nix-flatpak, + stylix, + hyprlauncher, }: let user = { @@ -65,9 +66,13 @@ homeManagerVersion = homeManagerVersion; os = { enable = true; - firewall = { enable = false; }; + firewall = { + enable = false; + }; enableFonts = true; - hardware = { enable = false; }; + hardware = { + enable = false; + }; enablePrometheusExporters = true; containers = { runtime = "docker"; @@ -86,19 +91,22 @@ stylix ; specialArgs = { - inputs = - { - inherit - hyprlauncher - nixpkgs-unstable; - }; + inherit + hyprlauncher + nixpkgs-unstable + ; }; }; # Libs - lib = (import modules/lib.nix ({ - nixpkgs = nixpkgs; - home-manager = home-manager; - } // libConfig)); + lib = ( + import modules/lib.nix ( + { + nixpkgs = nixpkgs; + home-manager = home-manager; + } + // libConfig + ) + ); homelabServices = ( (lib.makeHLServices { user = user; @@ -115,26 +123,27 @@ { # Dev Setups # ------------- - devShells = - lib.eachSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in - { - default = pkgs.mkShell { - name = "nixos-setup"; - packages = with pkgs; [ - nixpkgs-fmt - nixd - nh - ]; - shellHook = '' - export PATH=$PATH:$(pwd)/bin - ''; - }; - }); + devShells = lib.eachSystem ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = pkgs.mkShell { + name = "nixos-setup"; + packages = with pkgs; [ + nixpkgs-fmt + nixd + nh + ]; + shellHook = '' + export PATH=$PATH:$(pwd)/bin + ''; + }; + } + ); lib = lib; - formatter = - lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt); + formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt); # None-NIXOS LINUX Setups # ------------- @@ -157,50 +166,61 @@ homeManagerVersion = homeManagerVersion; os = { enable = true; - firewall = { enable = false; }; + firewall = { + enable = false; + }; enableFonts = true; enableNetworking = true; enableSSH = false; - hardware = { enable = true; }; + hardware = { + enable = true; + }; containers = { localDockerRegistries = localDockerRegistries; runtime = "docker"; }; enablePrometheusExporters = true; }; - configuration = { ... }: { - imports = [ - nixos-hardware.nixosModules.framework-13-7040-amd - (import ./hosts/fwbook.nix { - user = user; - }) - ]; - }; + configuration = + { ... }: + { + imports = [ + nixos-hardware.nixosModules.framework-13-7040-amd + (import ./hosts/fwbook.nix { + user = user; + }) + ]; + }; }; # NIXOS Framework Homelab # ------------- hl-fws1 = lib.makeHLService { hostName = "hl-fws1"; - configuration = { ... }: { - imports = [ - nixos-hardware.nixosModules.framework-11th-gen-intel - (import (./hosts/hl-fws1.nix) { user = user; }) - ]; - }; + configuration = + { ... }: + { + imports = [ + nixos-hardware.nixosModules.framework-11th-gen-intel + (import (./hosts/hl-fws1.nix) { user = user; }) + ]; + }; systemStateVersion = "24.05"; }; # NIXOS Framework Desktop # ------------- hl-fwdesk = lib.makeHLService { hostName = "hl-fwdesk"; - configuration = { ... }: { - imports = [ - nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series - (import (./hosts/hl-fwdesk.nix) { user = user; }) - ]; - }; + configuration = + { ... }: + { + imports = [ + nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series + (import (./hosts/hl-fwdesk.nix) { user = user; }) + ]; + }; systemStateVersion = "25.05"; }; - } // homelabServices; + } + // homelabServices; }; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4c40d91..9aeb4e0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -3,6 +3,7 @@ pkgs, hyprlauncher, system, + nixpkgs-unstable, ... }: let @@ -12,6 +13,7 @@ let 8000 8001 ]; + unstable = nixpkgs-unstable.legacyPackages.${system}; in { imports = [ ./fwbook.hardware-configuration.nix ]; @@ -32,7 +34,7 @@ in }; desktop = { enable = true; - cosmic.enable = true; + cosmic.enable = false; kde.enable = false; crypto.enable = true; gnome.enable = false; @@ -68,7 +70,18 @@ in nssmdns4 = true; }; virtualisation.waydroid.enable = true; - + services.pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + jack.enable = true; + }; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal + ]; + }; # Tailscale services.tailscale.enable = true; # Desktop Env @@ -184,6 +197,7 @@ in rpiboot code-cursor-fhs nix-prefetch + orca-slicer # Run macos apps darling-dmg @@ -198,7 +212,6 @@ in # Work gdk slack - google-chrome # IPhone Tethering libimobiledevice @@ -252,6 +265,7 @@ in port = 11434; acceleration = "rocm"; rocmOverrideGfx = "11.0.2"; + package = unstable.ollama-rocm; }; # # Brother Printer hardware.sane.brscan5.enable = true; diff --git a/hosts/scripts/fwbook/functions.sh b/hosts/scripts/fwbook/functions.sh index 44d7b4a..97152bc 100755 --- a/hosts/scripts/fwbook/functions.sh +++ b/hosts/scripts/fwbook/functions.sh @@ -2,10 +2,6 @@ function start-windows() { quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer } -function start-windows-app() { - google-chrome-stable --app=https://windows365.microsoft.com/webclient --new-window -} - function clean-file() { grep -v '^\s*#' | grep -v '^$' } diff --git a/modules/nixos/common/hardware/pipewire.nix b/modules/nixos/common/hardware/pipewire.nix index 5aec992..e6e6de0 100644 --- a/modules/nixos/common/hardware/pipewire.nix +++ b/modules/nixos/common/hardware/pipewire.nix @@ -1,6 +1,7 @@ -{ lib -, config -, ... +{ + lib, + config, + ... }: let cfg = config.skyg.nixos.common.hardware.pipewire; @@ -18,6 +19,7 @@ in wireplumber.enable = true; pulse.enable = true; systemWide = false; + socketActivation = true; }; services.jack = { alsa.enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 9b8dc43..19b83e7 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.skyg.nixos; in @@ -17,8 +22,7 @@ in options = { skyg.nixos.desktop = { - enable = lib.mkEnableOption - "Enable Desktop"; + enable = lib.mkEnableOption "Enable Desktop"; }; }; config = lib.mkIf cfg.desktop.enable { @@ -37,9 +41,6 @@ in terminal-exec.enable = true; portal = { enable = true; - extraPortals = [ - pkgs.kdePackages.xdg-desktop-portal-kde - ]; }; }; }; diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index 5f7488b..32b52b5 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.skyg.nixos.desktop.tiler.hyprland; # hypr-plugin-dir = pkgs.symlinkJoin { @@ -13,8 +18,7 @@ in { options = { skyg.nixos.desktop.tiler.hyprland = { - enable = lib.mkEnableOption - "hyprland"; + enable = lib.mkEnableOption "hyprland"; }; }; config = lib.mkIf cfg.enable { @@ -25,19 +29,19 @@ in xwayland.enable = true; }; programs.uwsm.enable = true; - environment.systemPackages = with pkgs; [ - hyprls - ]; + # environment.systemPackages = with pkgs; [ + # hyprls + # ]; xdg.portal = { enable = true; extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; }; - home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { - enable = true; - plugins = with pkgs; [ - hyprlandPlugins.hyprexpo - hyprlandPlugins.hyprbars - ]; - }; + # home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { + # enable = true; + # plugins = with pkgs; [ + # hyprlandPlugins.hyprexpo + # hyprlandPlugins.hyprbars + # ]; + # }; }; } diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 8024be1..e6eeb67 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -1,16 +1,20 @@ -{ config, lib, pkgs, skygUtils, system, nixpkgs-unstable, ... }: +{ + config, + lib, + pkgs, + skygUtils, + system, + nixpkgs-unstable, + ... +}: let cfg = config.skyg.nixos.desktop.tiler.niri; - # unstable = import nixpkgs-unstable { - # inherit system; - # config.allowUnfree = true; - # }; + unstable = nixpkgs-unstable.legacyPackages.${system}; in { options = { skyg.nixos.desktop.tiler.niri = { - enable = lib.mkEnableOption - "niri"; + enable = lib.mkEnableOption "niri"; }; }; config = lib.mkIf cfg.enable { @@ -30,6 +34,13 @@ in filePath = "niri"; configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; }; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + gnome-keyring + ]; + }; }; } -