From 9011da375c366fbf93c647634eecd7c895e88e2b Mon Sep 17 00:00:00 2001 From: cswimr Date: Thu, 23 Jan 2025 15:09:04 -0600 Subject: [PATCH] update flake lockfile and remove useless flake inputs --- flake.lock | 141 +++++++++++++++++----------------------- flake.nix | 8 ++- home-manager/vscode.nix | 10 +-- nixos/configuration.nix | 2 +- 4 files changed, 69 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index 8034186..01fc444 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -95,22 +95,6 @@ "type": "github" } }, - "dotnettoolsVscodeExtensions": { - "locked": { - "lastModified": 1734047168, - "narHash": "sha256-Ox2388ILx6q/0Zae7xmgkgDDGjGtukd6HWdhgfT1IwQ=", - "owner": "GGG-KILLER", - "repo": "nixpkgs", - "rev": "620b6a067933435bd080ce6b566ce52b7d89f123", - "type": "github" - }, - "original": { - "owner": "GGG-KILLER", - "repo": "nixpkgs", - "rev": "620b6a067933435bd080ce6b566ce52b7d89f123", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -161,12 +145,12 @@ }, "flake-compat_4": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -220,11 +204,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -358,18 +342,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -429,11 +409,11 @@ ] }, "locked": { - "lastModified": 1735343815, - "narHash": "sha256-p7IJP/97zJda/wwCn1T2LJBz4olF5LjNf4uwhuyvARo=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b7a7cd5dd1a74a9fe86ed4e016f91c78483b527a", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -451,11 +431,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -527,11 +507,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -542,11 +522,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1734864618, - "narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=", + "lastModified": 1736952876, + "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "13be795cac27df7044a425c0b2de3a42b10ddb18", + "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058", "type": "github" }, "original": { @@ -562,11 +542,11 @@ ] }, "locked": { - "lastModified": 1735222882, - "narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=", + "lastModified": 1737257306, + "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530", + "rev": "744d330659e207a1883d2da0141d35e520eb87bd", "type": "github" }, "original": { @@ -605,11 +585,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1735350281, - "narHash": "sha256-rNhcGVh6Xnc0DKWR5RTTD9OxucfAotd41LEuMCGz228=", + "lastModified": 1737596814, + "narHash": "sha256-hfMz2iTGrM95jvnxgFD3kQmCBr4qvLtoJxT7pU20QN0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "57719f14beefb91c5b58da26bb9cffbdb4f70bfa", + "rev": "2dc18aa9f519bb9c7f908c38a141562619ce01fb", "type": "github" }, "original": { @@ -680,17 +660,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1737629725, + "narHash": "sha256-tjAyt92vcvzkoEMQFLK36A72F92J6Z7LhrHNHEFFf88=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "c805021f3a95da44a1811f1235b997f57d893dc3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "c805021f3a95da44a1811f1235b997f57d893dc3", "type": "github" } }, @@ -709,11 +689,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735343514, - "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", + "lastModified": 1737644327, + "narHash": "sha256-gyP1Ds62ySpWszHCL9kzWzdLg2WFIuFcDc1kDIGBgB0=", "owner": "nix-community", "repo": "nixvim", - "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", + "rev": "85bef9e19191000db4a13337198266359cefb9b6", "type": "github" }, "original": { @@ -731,11 +711,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735363680, - "narHash": "sha256-jnbJ8qlGn0sMGhzL6gOfal+AzyT+DezJ3d74I6SqV8k=", + "lastModified": 1737647191, + "narHash": "sha256-dAimiNgNK/eIugeRb2PAEYxwruMdUHb+GxScFboRwkM=", "owner": "nix-community", "repo": "NUR", - "rev": "49f16569423f577090a817b1b4f0888ab076b036", + "rev": "8f066f1f44bf8d7f99b07aecddd9e2ad42c135d4", "type": "github" }, "original": { @@ -754,11 +734,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", "type": "github" }, "original": { @@ -799,11 +779,11 @@ ] }, "locked": { - "lastModified": 1735049224, - "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=", + "lastModified": 1736549395, + "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b", + "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", "type": "github" }, "original": { @@ -843,7 +823,6 @@ "inputs": { "catppuccin-vsc": "catppuccin-vsc", "compose2nix": "compose2nix", - "dotnettoolsVscodeExtensions": "dotnettoolsVscodeExtensions", "gauntlet": "gauntlet", "home-manager": "home-manager", "lanzaboote": "lanzaboote", @@ -891,11 +870,11 @@ ] }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -906,11 +885,11 @@ }, "stable": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { @@ -922,11 +901,11 @@ }, "staging-next": { "locked": { - "lastModified": 1735344853, - "narHash": "sha256-XiYmpwkEe55DUEf7wtQpP4rmY1vk4vulSaMHqiYqWa8=", + "lastModified": 1737633971, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d60fe3fb716a834be7d21323a66ba7fda286859c", + "rev": "773f59ce7fbafc16330372752c76b86b78b89eb4", "type": "github" }, "original": { @@ -1004,11 +983,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 27b8fd9..a1a0280 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,11 @@ description = "System Configuration @ cswimr 2024"; inputs = { stable.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # change this back to nixos-unstable once + # https://github.com/NixOS/nixpkgs/commit/c805021f3a95da44a1811f1235b997f57d893dc3 + # trickles down to nixos-unstable + nixpkgs.url = "github:NixOS/nixpkgs/c805021f3a95da44a1811f1235b997f57d893dc3"; staging-next.url = "github:NixOS/nixpkgs/staging-next"; - dotnettoolsVscodeExtensions.url = "github:GGG-KILLER/nixpkgs/620b6a067933435bd080ce6b566ce52b7d89f123"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -113,6 +115,8 @@ hardware.bluetooth.enable = true; } + # nixpkgs.nixosModules.readOnlyPkgs + # { nixpkgs.pkgs = pkgs; } inputs.sops-nix.nixosModules.sops inputs.nixvim.nixosModules.nixvim inputs.nur.modules.nixos.default diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 774594a..bcc99ae 100644 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -37,12 +37,6 @@ rec { ]; programs.vscode = - let - dotnettools = import inputs.dotnettoolsVscodeExtensions { - inherit system; - config.allowUnfree = true; - }; - in { enable = true; enableUpdateCheck = false; @@ -82,8 +76,8 @@ rec { catppuccin.catppuccin-vsc-icons # C# - dotnettools.vscode-extensions.ms-dotnettools.csharp - dotnettools.vscode-extensions.ms-dotnettools.csdevkit + pkgs.vscode-extensions.ms-dotnettools.csharp + pkgs.vscode-extensions.ms-dotnettools.csdevkit pkgs.vscode-extensions.ms-dotnettools.vscodeintellicode-csharp pkgs.vscode-extensions.ms-dotnettools.vscode-dotnet-runtime csharpier.csharpier-vscode diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fc1cb97..a869920 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -84,7 +84,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true;