From 82458342c7d8a77b1d1ed43c746f957c95424f1f Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 11 Jul 2025 20:46:50 -0400 Subject: [PATCH] upgrade to nixos 25.05 --- common/spotify/default.nix | 2 +- common/zsh/home.nix | 2 +- darwin/default.nix | 2 + flake.lock | 370 ++++++++++++++++++--------------- flake.nix | 13 +- machines/mac/configuration.nix | 6 +- nixos/hyprland/home.nix | 2 - overlays/default.nix | 1 - user/modules/dev.nix | 8 +- user/modules/vscode.nix | 2 +- 10 files changed, 218 insertions(+), 190 deletions(-) diff --git a/common/spotify/default.nix b/common/spotify/default.nix index 60d2465..26aaf21 100644 --- a/common/spotify/default.nix +++ b/common/spotify/default.nix @@ -31,7 +31,7 @@ in { keyboardShortcut ]; theme = spicePkgs.themes.text; - colorScheme = "gruvbox"; + colorScheme = "Gruvbox"; }; } ); diff --git a/common/zsh/home.nix b/common/zsh/home.nix index c700871..ccc3837 100644 --- a/common/zsh/home.nix +++ b/common/zsh/home.nix @@ -22,7 +22,7 @@ in { enableCompletion = true; # Enable pure prompt - initExtra = '' + initContent = '' fpath+=${pkgs.pure-prompt}/share/zsh/site-functions autoload -U promptinit; promptinit diff --git a/darwin/default.nix b/darwin/default.nix index 24bb569..5816673 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -14,5 +14,7 @@ hm.imports = [./home.nix]; + system.primaryUser = "michael"; + environment.systemPackages = [inputs'.agenix.packages.default]; } diff --git a/flake.lock b/flake.lock index f224b70..4b60e33 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -23,50 +23,6 @@ "type": "github" } }, - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", - "owner": "aylur", - "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -96,16 +52,16 @@ ] }, "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", + "lastModified": 1749744770, + "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", + "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-24.11", + "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } @@ -113,11 +69,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -131,11 +87,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -152,11 +108,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -186,6 +142,27 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -240,6 +217,27 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": [ + "nvf", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -283,41 +281,20 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "rycee", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, - "hyprpanel": { - "inputs": { - "ags": "ags", - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1745885816, - "narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=", - "owner": "jas-singhfsu", - "repo": "hyprpanel", - "rev": "0c82ce9704c8063be8d8f60443071c91943eb68c", - "type": "github" - }, - "original": { - "owner": "jas-singhfsu", - "repo": "hyprpanel", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -332,16 +309,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -374,7 +351,7 @@ "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" }, "original": { "type": "tarball", @@ -383,11 +360,11 @@ }, "master": { "locked": { - "lastModified": 1746825093, - "narHash": "sha256-LAJzhgg1nKvyEGWvg4HGM6zlLJ1b+g34Z5IpEXcgRS8=", + "lastModified": 1752279991, + "narHash": "sha256-S/4OLxUqFcT9BaXlLWnX8JzN9HdJYuAV3n3C+vihpFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "710e189c6e3d4a8d04fd040b70353819c541080a", + "rev": "6c186a90523d9ce6128beb9351c590d6b4aeb7e1", "type": "github" }, "original": { @@ -396,17 +373,32 @@ "type": "github" } }, + "mnw": { + "locked": { + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "mnw", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746755975, - "narHash": "sha256-4YQ/jq1vZrjngu0DDJmYaJW7Jh4IEPiHvrLvlBkvWmk=", + "lastModified": 1752200230, + "narHash": "sha256-WqqWjRX4qZYqO/cgvU/ZEzJBQqHBi17OEVv2kt05WiU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6e320439558ef494b83d6407b0c6f2218e47522a", + "rev": "3c866dfb70d282247452742098d315b97df713d2", "type": "github" }, "original": { @@ -421,11 +413,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746453552, - "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", + "lastModified": 1752199438, + "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be618645aa0adf461f778500172b6896d5ab2d01", + "rev": "d34d9412556d3a896e294534ccd25f53b6822e80", "type": "github" }, "original": { @@ -453,11 +445,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -468,42 +460,42 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, "nixpkgs_4": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -514,6 +506,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -529,13 +537,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "nixos", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { @@ -551,14 +559,15 @@ "nixpkgs": [ "unstable" ], - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_5" }, "locked": { - "lastModified": 1746822201, - "narHash": "sha256-XAt4FgViCT9kcSkODQUcbQ8JejjjbTGcMVGIP+7o7YE=", + "lastModified": 1752262661, + "narHash": "sha256-jPDiaHsKZeFH+zoxRIW0t1T/R+S8cYM3/9YUfMMjUEA=", "owner": "nix-community", "repo": "nixvim", - "rev": "1b1e43a36e4f701fb2fc870c322373579936f739", + "rev": "658980fb247e2f10fa692bae372ac21389a67c6c", "type": "github" }, "original": { @@ -570,15 +579,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1746819918, - "narHash": "sha256-ONwwPLlsoIuTN3NLFCVL9eAr9yFyweMurxXZ6R97Lxw=", + "lastModified": 1752274809, + "narHash": "sha256-EIpOaZoPeC+5PSeaU2UgAqgdkQ70R53W4UkabW0c94o=", "owner": "nix-community", "repo": "NUR", - "rev": "1470795ec7d4bdd9d0bd5b9f83e403fe858294ad", + "rev": "4fd103b49d2f1d3cd956adb3591093bc49c4b647", "type": "github" }, "original": { @@ -597,11 +605,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -610,13 +618,34 @@ "type": "github" } }, + "nvf": { + "inputs": { + "flake-parts": "flake-parts_4", + "flake-utils": "flake-utils_4", + "mnw": "mnw", + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1752180730, + "narHash": "sha256-aSmib/P5DWXrpOdwFOo+lxuupUlNTGUDsLVSxJwWfUg=", + "owner": "notashelf", + "repo": "nvf", + "rev": "8ea010d7e3bf00c2a1f24d52da88afaed87d96f5", + "type": "github" + }, + "original": { + "owner": "notashelf", + "repo": "nvf", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "darwin": "darwin_2", "flake-parts": "flake-parts", "home-manager": "home-manager_2", - "hyprpanel": "hyprpanel", "lix-module": "lix-module", "master": "master", "nix-vscode-extensions": "nix-vscode-extensions", @@ -624,9 +653,10 @@ "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur", + "nvf": "nvf", "rust-overlay": "rust-overlay", "spicetify": "spicetify", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix", "unstable": "unstable", "utils": "utils", "zen-browser": "zen-browser" @@ -634,14 +664,14 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746758179, - "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=", + "lastModified": 1752201818, + "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8", + "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d", "type": "github" }, "original": { @@ -655,19 +685,18 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_7" }, "locked": { - "lastModified": 1743595372, - "narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=", + "lastModified": 1751776600, + "narHash": "sha256-75wd/aSvSoXUVd/buwI+Gsqx6LdmBVMbdXw+tCV1u58=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff", + "rev": "54fad36eeae085f4a6ce4522bc351705b9c0c58a", "type": "github" }, "original": { "owner": "Gerg-L", - "ref": "24.11", "repo": "spicetify-nix", "type": "github" } @@ -762,37 +791,46 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, + "systems_7": { "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "treefmt-nix_2": { + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { @@ -803,11 +841,11 @@ }, "unstable": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -818,7 +856,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -841,11 +879,11 @@ ] }, "locked": { - "lastModified": 1746763614, - "narHash": "sha256-tfBsztz6aUcfIFK8Sewn44mkMXZs8rRQfmHBjVhkUBM=", + "lastModified": 1752120791, + "narHash": "sha256-Tf5qZ6kGwBFyVsnAgkX/uTg0210JWb/GB4XUz15n9WU=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "154aa27229783bca87c3ea3ac4ef32ab9b99cdb6", + "rev": "5dbf3f7b62f638ed1e137c32930918c01689c817", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 901bf10..d188f38 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,19 @@ description = "Michael Thomas's NixOS configuration"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; unstable.url = "nixpkgs/nixos-unstable"; master.url = "github:NixOS/nixpkgs"; nur.url = "github:nix-community/NUR"; home-manager = { - url = "github:rycee/home-manager/release-24.11"; + url = "github:rycee/home-manager/release-25.05"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-24.11"; + url = "github:lnl7/nix-darwin/nix-darwin-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; @@ -30,8 +30,9 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "unstable"; }; + nvf.url = "github:notashelf/nvf"; spicetify = { - url = "github:Gerg-L/spicetify-nix/24.11"; + url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; zen-browser = { @@ -40,10 +41,6 @@ }; rust-overlay.url = "github:oxalica/rust-overlay"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; - hyprpanel = { - url = "github:jas-singhfsu/hyprpanel"; - inputs.nixpkgs.follows = "unstable"; - }; agenix = { url = "github:ryantm/agenix"; diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index 37a8af7..097766a 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -51,11 +51,7 @@ }; }; - security.pam.enableSudoTouchIdAuth = true; - - services = { - nix-daemon.enable = true; - }; + security.pam.services.sudo_local.touchIdAuth = true; system = { # Since it's not possible to declare default shell, run this command after build diff --git a/nixos/hyprland/home.nix b/nixos/hyprland/home.nix index 5b47c7c..f4226b6 100644 --- a/nixos/hyprland/home.nix +++ b/nixos/hyprland/home.nix @@ -8,8 +8,6 @@ inherit (lib) mkEnableOption mkIf; cfg = config.my.hyprland; in { - imports = [inputs.hyprpanel.homeManagerModules.hyprpanel]; - options.my.hyprland = { enable = mkEnableOption "hyprland"; }; diff --git a/overlays/default.nix b/overlays/default.nix index c62c7ed..9e809cf 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -34,7 +34,6 @@ # External overlays # Included after the above to ensure modifications are applied lix = inputs.lix-module.overlays.default; - hyprpanel = inputs.hyprpanel.overlay; rust-overlay = inputs.rust-overlay.overlays.default; vscode-extensions = inputs.nix-vscode-extensions.overlays.default; diff --git a/user/modules/dev.nix b/user/modules/dev.nix index 79bee47..56caa3c 100644 --- a/user/modules/dev.nix +++ b/user/modules/dev.nix @@ -30,16 +30,14 @@ pandoc ] ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv - ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - CoreFoundation - CoreServices - SystemConfiguration + ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ + apple-sdk ]); # Required for the `openssl-sys` crate to build properly home.sessionVariables.PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; - programs.zsh.initExtra = '' + programs.zsh.initContent = '' export PATH=~/.npm-packages/bin:$PATH export NODE_PATH=~/.npm-packages/lib/node_modules ''; diff --git a/user/modules/vscode.nix b/user/modules/vscode.nix index b29eeb1..795988b 100644 --- a/user/modules/vscode.nix +++ b/user/modules/vscode.nix @@ -33,7 +33,7 @@ in { vscode = { enable = true; inherit package; - extensions = with pkgs.open-vsx; [ + profiles.default.extensions = with pkgs.open-vsx; [ # Editor vscodevim.vim pkgs.vscode-marketplace.miguelsolorio.min-theme