upgrade to 25.11

This commit is contained in:
ari committed 2025-12-04 10:55:20 -05:00
1 parent cec42ccf0a
commit 0e40b878c8
14 files changed
+151 -173

No files matched your search

Generated
+89 -114
View File
@@ -38,11 +38,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1746562888, "lastModified": 1755819240,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -71,11 +71,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748408240, "lastModified": 1760703920,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -105,21 +105,17 @@
"inputs": { "inputs": {
"determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
"determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", "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", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1761251546, "lastModified": 1763536872,
"narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=", "narHash": "sha256-QCYGGghBya+qsY59f1zzgYzxEzz+N9S7YRkVWDIDbgo=",
"rev": "70beec406153496943274f59cb2ded76be49fcd7", "rev": "f4e598cbb10021c93f73dd4c0cf01ec791ea53f9",
"revCount": 306, "revCount": 315,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -129,47 +125,47 @@
"determinate-nixd-aarch64-darwin": { "determinate-nixd-aarch64-darwin": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=", "narHash": "sha256-g1r0dPwlUi1h96c4BuHzv9M2lWDqRy9bPDW9tRSq35I=",
"type": "file", "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": { "original": {
"type": "file", "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": { "determinate-nixd-aarch64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=", "narHash": "sha256-xn324irXG/EpUdUfUGFrlJNg23JN2cVArd5LsFPjGKc=",
"type": "file", "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": { "original": {
"type": "file", "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": { "determinate-nixd-x86_64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=", "narHash": "sha256-VPM5FOGwEjl56b7Edvg3sduvauPHCyXZ11fN9hcUdTU=",
"type": "file", "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": { "original": {
"type": "file", "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": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748383148, "lastModified": 1764724327,
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -223,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1763759067,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -281,18 +277,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744584021, "host": "gitlab.gnome.org",
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "48.1", "ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "gitlab"
} }
}, },
"home-manager": { "home-manager": {
@@ -302,16 +300,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1764776959,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -419,11 +417,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1763819300, "lastModified": 1764812569,
"narHash": "sha256-WBTSRJ0PrVW+zDmTraJFXsAKPrYn01VgXvEtcixIEsQ=", "narHash": "sha256-WvdCYnwzGmXYDsYMcBISom+6tIAk18jKq4zZvEoYlnw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlauncher", "repo": "hyprlauncher",
"rev": "53a6b3f2d7f6e3981347ddaaf469b16964287fc2", "rev": "64cc3c75ec0257a1970f64d403e390466f4577e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -562,12 +560,12 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1761238235, "lastModified": 1763534330,
"narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=", "narHash": "sha256-gTuB2qBdSKCKnZwENTqScs/pPBaZQOv6zZ1KJvV/ohk=",
"rev": "9512828397f684d0f732ea76b7631f69a0db34f7", "rev": "be871f9baf5366a220b5f25634eebab6f452a017",
"revCount": 23138, "revCount": 23278,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -581,11 +579,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761339987, "lastModified": 1764161084,
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "rev": "e95de00a471d07435e0527ff4db092c84998698e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -612,11 +610,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1761933221, "lastModified": 1764440730,
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7467f155fcba189eb088a7601f44fbef7688669b", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -628,12 +626,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755922037, "lastModified": 1761597516,
"narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"revCount": 808723, "revCount": 811874,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -674,12 +672,12 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761672384, "lastModified": 1764667669,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "rev": "418468ac9527e799809c900eda37cbff999199b6",
"revCount": 886100, "revCount": 905402,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -688,12 +686,12 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1760965567, "lastModified": 1763375004,
"narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", "narHash": "sha256-e81Xfa7xhRZfqGB4s3xEvrg4p1v+fToM6CIQlXUyaX0=",
"rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", "rev": "8b6600824693a9c706ef09bd86711ca393703466",
"revCount": 880602, "revCount": 897465,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -718,12 +716,12 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1764522689,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"revCount": 811874, "revCount": 902477,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -739,15 +737,14 @@
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1751320053, "lastModified": 1764773531,
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -791,16 +788,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1762295027, "lastModified": 1764795851,
"narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", "narHash": "sha256-DgtI/SwRiVnAfAVrXoRFymVP1AGvB3ZxYL6XMOZFvJQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "91b9a270523361268ba6a8772152fde31103869f", "rev": "cfde343ff369c8aa898f263ed3dad8c5eb095491",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@@ -886,11 +883,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750770351, "lastModified": 1763914658,
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -902,11 +899,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751159871, "lastModified": 1764465359,
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -918,11 +915,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751158968, "lastModified": 1764464512,
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -930,28 +927,6 @@
"repo": "base16-zed", "repo": "base16-zed",
"type": "github" "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", "root": "root",
+2 -2
View File
@@ -11,12 +11,12 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
# Home manager # Home manager
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"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Themes # Themes
stylix = { stylix = {
url = "github:nix-community/stylix/release-25.05"; url = "github:nix-community/stylix/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Macos # Macos
+4 -4
View File
@@ -67,8 +67,8 @@ in
# Tailscale # Tailscale
services.tailscale.enable = true; services.tailscale.enable = true;
# Desktop Env # Desktop Env
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.displayManager.defaultSession = "niri"; services.displayManager.defaultSession = "niri";
# home manager # home manager
home-manager.users.${user.name} = { home-manager.users.${user.name} = {
@@ -167,7 +167,7 @@ in
# Development # Development
vscode vscode
zed-editor zed-editor-fhs
devenv devenv
just just
rpi-imager rpi-imager
@@ -183,7 +183,7 @@ in
bitwarden-cli bitwarden-cli
# documents # documents
onlyoffice-bin_latest onlyoffice-desktopeditors
# Work # Work
gdk gdk
+4 -4
View File
@@ -56,8 +56,8 @@
networkDrives.enable = true; networkDrives.enable = true;
}; };
services.displayManager.defaultSession = "gnome"; services.displayManager.defaultSession = "gnome";
services.xserver.displayManager.gdm.enable = false; services.displayManager.gdm.enable = false;
services.xserver.displayManager.gdm.wayland = false; services.displayManager.gdm.wayland = false;
services.autosuspend.enable = false; services.autosuspend.enable = false;
services.displayManager.autoLogin = { services.displayManager.autoLogin = {
enable = true; enable = true;
@@ -70,8 +70,8 @@
systemd.targets.suspend.enable = false; systemd.targets.suspend.enable = false;
systemd.targets.hibernate.enable = false; systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false; systemd.targets.hybrid-sleep.enable = false;
services.xserver.displayManager.gdm.autoSuspend = false; services.displayManager.gdm.autoSuspend = false;
services.xserver.displayManager.gdm.autoLogin.delay = 0; services.displayManager.gdm.autoLogin.delay = 0;
# Remote Desktop # Remote Desktop
services.xrdp.enable = true; services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+2 -2
View File
@@ -58,8 +58,8 @@ in
# Tailscale # Tailscale
services.tailscale.enable = true; services.tailscale.enable = true;
# Desktop Env # Desktop Env
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.displayManager.defaultSession = "niri"; services.displayManager.defaultSession = "niri";
# Firmware updater # Firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
+10 -14
View File
@@ -32,13 +32,11 @@ in
user = { user = {
name = "root"; name = "root";
}; };
}) // { }) // (makeCommonGitConfigs {
git = (makeCommonGitConfigs { userName = "root";
userName = "root"; userEmail = "root@${hostName}";
userEmail = "root@${hostName}"; extraGitConfigs = [ ];
extraGitConfigs = [ ]; });
});
};
services = servicesModule { pkgs = pkgs; }; services = servicesModule { pkgs = pkgs; };
fonts = fontsModule; fonts = fontsModule;
}; };
@@ -71,13 +69,11 @@ in
}; };
programs = (programsModule { programs = (programsModule {
inherit pkgs user; inherit pkgs user;
}) // { }) // (makeCommonGitConfigs {
git = (makeCommonGitConfigs { userName = fullName;
userName = fullName; userEmail = email;
userEmail = email; extraGitConfigs = extraGitConfigs;
extraGitConfigs = extraGitConfigs; });
});
};
services = servicesModule { pkgs = pkgs; }; services = servicesModule { pkgs = pkgs; };
}; };
} }
+20 -13
View File
@@ -7,21 +7,28 @@ let
, userEmail , userEmail
, extraGitConfigs ? [ ] , extraGitConfigs ? [ ]
}: { }: {
enable = true; delta = {
userName = userName; enable = true;
userEmail = userEmail; enableGitIntegration = true;
delta = { enable = true; }; };
extraConfig = { git = {
color = { ui = "auto"; }; enable = true;
push = { settings = {
default = "upstream"; user = {
autoSetupRemote = true; 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 in
{ {
+1 -1
View File
@@ -80,7 +80,7 @@
''; '';
plugins = with pkgs.nushellPlugins; [ plugins = with pkgs.nushellPlugins; [
polars polars
net # net
highlight highlight
]; ];
}; };
-1
View File
@@ -13,6 +13,5 @@
]; ];
config = { config = {
environment.sessionVariables.EDITOR = "vi"; environment.sessionVariables.EDITOR = "vi";
programs.thefuck.enable = true;
}; };
} }
+1 -3
View File
@@ -9,10 +9,9 @@ let
font-awesome font-awesome
mplus-outline-fonts.githubRelease mplus-outline-fonts.githubRelease
jetbrains-mono jetbrains-mono
ubuntu_font_family ubuntu-classic
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji noto-fonts-color-emoji
]; ];
in in
@@ -32,4 +31,3 @@ in
}; };
}; };
} }
+4 -4
View File
@@ -14,10 +14,10 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
hardware.graphics = { # hardware.graphics = {
extraPackages = [ pkgs.amdvlk ]; # extraPackages = [ pkgs.amdvlk ];
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; # extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
}; # };
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
rocmPackages.rocm-smi rocmPackages.rocm-smi
rocmPackages.rpp rocmPackages.rpp
+13 -9
View File
@@ -56,15 +56,19 @@ in
systemd.sleep.extraConfig = "HibernateDelaySec=30m"; systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Logind # Logind
services.logind = { services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate"; settings = {
lidSwitch = "suspend-then-hibernate"; Login = {
powerKey = "lock"; HandleLidSwitchExternalPower = "suspend-then-hibernate";
extraConfig = '' HandleLidSwitch = "suspend-then-hibernate";
LidSwitchIgnoreInhibited=yes HandlePowerKey = "lock";
HandlePowerKey=suspend-then-hibernate };
IdleAction=suspend-then-hibernate };
IdleActionSec=2m # extraConfig = ''
''; # LidSwitchIgnoreInhibited=yes
# HandlePowerKey=suspend-then-hibernate
# IdleAction=suspend-then-hibernate
# IdleActionSec=2m
# '';
}; };
}; };
} }
+1 -1
View File
@@ -15,7 +15,7 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.xserver.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [ environment.gnome.excludePackages = with pkgs; [
gnome-tour gnome-tour
gnome-text-editor gnome-text-editor
-1
View File
@@ -32,7 +32,6 @@ in
mako mako
wofi wofi
rofi rofi
rofi-wayland
# Control Tools # Control Tools
pavucontrol pavucontrol
playerctl playerctl