From f5d5791efd5c19bab341b7931b66f2cda5c34af9 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Wed, 29 Oct 2025 15:26:46 +0100 Subject: [PATCH] fix some regressions --- flake.lock | 170 ++++++++++++++------ flake.nix | 9 +- hosts/yoga-7-pro/hardware-configuration.nix | 13 +- modules/home-manager/code.nix | 43 ++--- modules/nixos/power.nix | 2 - 5 files changed, 147 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index c8247e6..4a19de4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1759499898, + "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", "type": "github" }, "original": { @@ -153,6 +153,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -215,11 +233,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -295,11 +313,11 @@ ] }, "locked": { - "lastModified": 1756891319, - "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -324,11 +342,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757423991, - "narHash": "sha256-tL+b6WC4gJJSo6wjNVIZpQ0DsYg8RmoGHxYuk6jJKbU=", + "lastModified": 1760108751, + "narHash": "sha256-GYyykk6SJytykQAz50WjKa2xK4C+sjPsz2wj5QjRktI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "150d693fe794a01aab762a18d2d8a2c8bc54b43c", + "rev": "6a01c399a971a57854fb4a99ce246534139beda4", "type": "github" }, "original": { @@ -417,11 +435,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1759080228, + "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", "type": "github" }, "original": { @@ -446,11 +464,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -471,11 +489,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1759619523, + "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", "type": "github" }, "original": { @@ -525,13 +543,33 @@ "type": "github" } }, + "nix-vscode-extensions": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1759936999, + "narHash": "sha256-3HWI+eKHqTvIZ6lRy0e4z5gvPwHYsHntZ3fl7zivg8M=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "fd5c5549692ff4d2dbee1ab7eea19adc2f97baeb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "fd5c5549692ff4d2dbee1ab7eea19adc2f97baeb", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -543,11 +581,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757347588, - "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { @@ -559,11 +597,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1759770925, + "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "674c2b09c59a220204350ced584cadaacee30038", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "674c2b09c59a220204350ced584cadaacee30038", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -573,7 +627,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1751211869, "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", @@ -625,11 +679,11 @@ ] }, "locked": { - "lastModified": 1757239681, - "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -645,11 +699,11 @@ ] }, "locked": { - "lastModified": 1758273351, - "narHash": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=", + "lastModified": 1759997568, + "narHash": "sha256-xQyzPkgpgjAceJKwZhLU2//Y1jAmvPGOq80svqkWFhQ=", "ref": "refs/heads/master", - "rev": "e9a574d919a89602d2868621576b2ccae54a5cb0", - "revCount": 675, + "rev": "3e32ae595f97bd2d2e5ed4512fb4bb25edb4eae6", + "revCount": 691, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -663,7 +717,8 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", + "nix-vscode-extensions": "nix-vscode-extensions", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "quickshell": "quickshell", "sops-nix": "sops-nix", @@ -679,11 +734,11 @@ ] }, "locked": { - "lastModified": 1757449901, - "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -701,9 +756,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -711,11 +766,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757361712, - "narHash": "sha256-GwObJtrAqVim66e4Jb5VzAKT6zGFJ3KOi63rfcrfMV4=", + "lastModified": 1759596342, + "narHash": "sha256-1Eda1V8pjpviMdBTdDXrFp7jkaUokIgXgBYTZyzDODk=", "owner": "danth", "repo": "stylix", - "rev": "3bf1430ed85a4484e4e1facee2344d2bb20288e6", + "rev": "4d065856e936fc6a99ba55d39ac2df9ded6bedbe", "type": "github" }, "original": { @@ -755,6 +810,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -928,11 +998,11 @@ ] }, "locked": { - "lastModified": 1757395105, - "narHash": "sha256-kwctEcCrHXZg80POmuOfqRqxSjy8bXhdBuNcRWaEpFA=", + "lastModified": 1759965431, + "narHash": "sha256-HvXr+rOkSZeseOYCruuMKMAUedcDkHOuYpFbnlIPs8Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d7b87e67233fdb42e655600f3de4c2e8a13bc6a7", + "rev": "391a133511ad7e09651b9c3939d8cf8d379766b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8e11345..a6b9186 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; - + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions/fd5c5549692ff4d2dbee1ab7eea19adc2f97baeb"; }; outputs = { @@ -44,6 +44,7 @@ stylix, sops-nix, quickshell, + nix-vscode-extensions, ... } @ inputs: let @@ -101,11 +102,17 @@ specialArgs = { inherit inputs; }; modules = [ + { + nixpkgs.overlays = [ + inputs.nix-vscode-extensions.overlays.default + ]; + } ./hosts/yoga-7-pro sops-nix.nixosModules.sops stylix.nixosModules.stylix home-manager.nixosModules.home-manager { + home-manager.backupFileExtension = ".backup"; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; diff --git a/hosts/yoga-7-pro/hardware-configuration.nix b/hosts/yoga-7-pro/hardware-configuration.nix index 0329f66..f4b3f39 100644 --- a/hosts/yoga-7-pro/hardware-configuration.nix +++ b/hosts/yoga-7-pro/hardware-configuration.nix @@ -19,11 +19,16 @@ ]; # https://github.com/lwfinger/rtw89/issues/240 - boot.extraModprobeConfig = '' - options rtw89_pci disable_aspm_l1ss=y disable_aspm_l1=y disable_clkreq=y - options rtw89_core disable_ps_mode=y - ''; + # boot.extraModprobeConfig = '' + # options rtw89_pci disable_aspm_l1ss=y disable_aspm_l1=y disable_clkreq=y + # options rtw89_core disable_ps_mode=y + # ''; + # ipu is apparently required to make the webcam available as a camera device + hardware.ipu6 = { + enable = true; + platform = "ipu6"; + }; services.fwupd.enable = true; diff --git a/modules/home-manager/code.nix b/modules/home-manager/code.nix index ea0d720..974760c 100644 --- a/modules/home-manager/code.nix +++ b/modules/home-manager/code.nix @@ -1,24 +1,16 @@ {pkgs, ...}: let - baseExtensions = with pkgs.vscode-extensions; [ + baseExtensions = with pkgs.vscode-marketplace; [ # QOL mhutchie.git-graph redhat.vscode-yaml - github.copilot - github.copilot-chat - + # github.copilot + # github.copilot-chat # Nix environment selector arrterian.nix-env-selector + continue.continue ]; - # baseExtensions = with pkgs; [ - # (vscode-with-extensions.override { - # vscodeExtensions = with vscode-extensions; [ - # bbenoist.nix - - # ]; - # }) - # ]; baseSettings = { # visual @@ -101,17 +93,16 @@ in { programs.vscode = { enable = true; - # install vscode in a FHS environment to allow extensions with prebuilt binaries - # package = pkgs.vscode.fhs; profiles.default = { userSettings = baseSettings // { "window.newWindowProfile" = "development"; }; + extensions = []; }; profiles.development = { - extensions = baseExtensions ++ (with pkgs.vscode-extensions; [ + extensions = baseExtensions ++ (with pkgs.vscode-marketplace; [ # python ms-python.python ms-python.isort @@ -134,30 +125,19 @@ in profiles.science = { - extensions = baseExtensions ++ (with pkgs.vscode-extensions; [ + extensions = baseExtensions ++ (with pkgs.vscode-marketplace; [ # python + jupyter ms-python.python ms-python.isort ms-python.debugpy ms-python.vscode-pylance ms-toolsai.vscode-jupyter-slideshow + ms-toolsai.jupyter + ms-toolsai.jupyter-hub ms-toolsai.jupyter-renderers # Typst myriad-dreamin.tinymist - ]) ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "jupyter"; - publisher = "ms-toolsai"; - version = "2025.3.2025032101"; - sha256 = "sha256-s2qEUl9J6EOije6MasZOnHErYs3NYXBqLSfMT03vEH0="; - } - { - name = "jupyter-hub"; - publisher = "ms-toolsai"; - version = "2024.10.1002831100"; - sha256 = "sha256-5IRczwXbYkDdYEOXvQnnH+HJNLvsRsrZ6fnoVCveqrs="; - } - ]; + ]); keybindings = baseKeybindings ++ [ # run code cell in jupyter @@ -196,10 +176,7 @@ in "workbench.colorCustomizations" = { "statusBar.background" = "#003f9293"; }; - }; }; - }; - } diff --git a/modules/nixos/power.nix b/modules/nixos/power.nix index 88cf427..51128a9 100644 --- a/modules/nixos/power.nix +++ b/modules/nixos/power.nix @@ -79,8 +79,6 @@ }; }; - # write the watt-config under /etc/watt.toml - services.irqbalance = { enable = true;