From 35e20604ca80a04090aba90b17e224c1d83d3b01 Mon Sep 17 00:00:00 2001 From: Thomas Syms Date: Thu, 18 Jul 2024 16:43:48 -0300 Subject: [PATCH] Updated all lockfiles and updated config to new version --- devenv.lock | 32 +++++------ flake.lock | 69 +++++++++--------------- flake.nix | 16 ------ home/applications/vscode/extensions.lock | 40 +++++++------- home/desktops/gnome/default.nix | 1 - hosts/Blackbird/default.nix | 1 - hosts/Equinox/default.nix | 1 - hosts/Pegasus/default.nix | 1 - 8 files changed, 60 insertions(+), 101 deletions(-) diff --git a/devenv.lock b/devenv.lock index 1c3a00b..127e6e3 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1720180409, + "lastModified": 1721213664, "owner": "cachix", "repo": "devenv", - "rev": "7b3ed618571f0d14655b05f7b1c6ef600904383a", - "treeHash": "14b4b6bc32582a78300257c3b618d821557eb530", + "rev": "1d848fc26376d919458482fa0b4d0e240285a93f", + "treeHash": "cd2f7b659c9730ae8a0604d47237ee6928ae4d07", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1720420198, + "lastModified": 1721284082, "owner": "nix-community", "repo": "fenix", - "rev": "abc0549e3560189462a7d394cc9d50af4608d103", - "treeHash": "084f4a1531d6f74cc4b297a6f7537fc7f834a6b9", + "rev": "2d55ed5e2c098416bc677f4fa8658b0a5ea36491", + "treeHash": "3f5f8bc0d8095dd4a9113b05d1c94820782d183a", "type": "github" }, "original": { @@ -93,16 +93,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719957072, + "lastModified": 1721226092, "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "treeHash": "415bf0e03835797927c1b2cb46a557bcecc36673", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "treeHash": "0d48af618426f14a604c2fa720128ba5f37e72eb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -117,11 +117,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719259945, + "lastModified": 1721042469, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", - "treeHash": "1a76ff89a9d4017b48abbb1bad8837b35d604ffc", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "treeHash": "91f40b7a3b9f6886bd77482cba5b5cd890415a2e", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1720344064, + "lastModified": 1721209698, "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", - "treeHash": "61ae0456a3e5ce0203ee7a6911091c9f1c808847", + "rev": "a62ea0a59e18ded8836af1dbce9cb8f5d07a744c", + "treeHash": "7e9621d889006d6f255c353aef422428a1108c28", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index 8fa97a0..7d5c2f5 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1720402389, - "narHash": "sha256-zJv6euDOrJWMHBhxfp/ay+Dvjwpe8YtMuEI5b09bxmo=", + "lastModified": 1721266288, + "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", "owner": "nix-community", "repo": "disko", - "rev": "f1a00e7f55dc266ef286cc6fc8458fa2b5ca2414", + "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -258,26 +258,6 @@ "type": "github" } }, - "nix-ld": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701153607, - "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=", - "owner": "Mic92", - "repo": "nix-ld", - "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-ld", - "type": "github" - } - }, "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", @@ -285,11 +265,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1720402094, - "narHash": "sha256-JeVrDAEnM2bnn4u1GqyGez8deM8MzEWVj4uG1oujPG0=", + "lastModified": 1721266029, + "narHash": "sha256-rXCgXvymme5zZQwYSrd7zammksb36YgSc2BFM2TFESo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a96c4c817b46b31759adc594a364c0d69d70847f", + "rev": "829828eddd52363236a53d55c40e1d4aa7af5a56", "type": "github" }, "original": { @@ -300,11 +280,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720429258, - "narHash": "sha256-d6JI5IgJ1xdrk7DvYVx7y8ijcYz5I1nhCwOiDP6cq00=", + "lastModified": 1721323232, + "narHash": "sha256-T4K2P8FayLshsIkY04i7M8qs0aQY5ugf8HsghqGONCc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72d3c007024ce47d838bb38693c8773812f54bf2", + "rev": "ede1f14cc21e811a605f16c6b69bd3e8425383d7", "type": "github" }, "original": { @@ -331,11 +311,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -363,11 +343,11 @@ }, "nur": { "locked": { - "lastModified": 1720439178, - "narHash": "sha256-ASwgeUB0kIZm4/zurVa3jez/ePDGlIa1j9KhFR3btkY=", + "lastModified": 1721308608, + "narHash": "sha256-9+sG0T06cECg/WR19qX6k0t1BQz4qMmfB7k9N+1QGS8=", "owner": "nix-community", "repo": "NUR", - "rev": "15e84beae2b0a7e4ab2e23403ef867b05d32d44b", + "rev": "6a52aa02e9c127a4bbdee2412123b6df5caa02de", "type": "github" }, "original": { @@ -380,7 +360,6 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", - "nix-ld": "nix-ld", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -403,11 +382,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1720818679, + "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "29148118cc33f08b71058e1cda7ca017f5300b51", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9fa1fa9..c58bda5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,12 +11,6 @@ # NixOS-Hardware nixos-hardware.url = "github:NixOS/nixos-hardware"; - # Nix-ld - nix-ld = { - url = "github:Mic92/nix-ld"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Disko disko = { url = "github:nix-community/disko"; @@ -43,7 +37,6 @@ nur, stylix, home-manager, - nix-ld, ... }: let system = "x86_64-linux"; @@ -75,9 +68,6 @@ # Modules modules = [ - nix-ld.nixosModules.nix-ld - {programs.nix-ld.dev.enable = true;} - #kde2nix Module #inputs.kde2nix.nixosModules.default @@ -124,9 +114,6 @@ # Modules modules = [ - nix-ld.nixosModules.nix-ld - {programs.nix-ld.dev.enable = true;} - # NUR Modules nur.nixosModules.nur @@ -171,9 +158,6 @@ # Modules modules = [ - nix-ld.nixosModules.nix-ld - {programs.nix-ld.dev.enable = true;} - #kde2nix Module #inputs.kde2nix.nixosModules.default diff --git a/home/applications/vscode/extensions.lock b/home/applications/vscode/extensions.lock index cebafa9..230c8d7 100644 --- a/home/applications/vscode/extensions.lock +++ b/home/applications/vscode/extensions.lock @@ -37,8 +37,8 @@ merge "github"."copilot" = vscode-utils.extensionFromVscodeMarketplace { name = "copilot"; publisher = "github"; - version = "1.214.990"; - sha256 = "1havqawbs5q7196w0yzaixqv007x1sws5dh8jd02qcli5lh25v66"; + version = "1.214.994"; + sha256 = "0ajclr4z56mg96pdmz45nzdmgx76k4s3fqwmkclciywv4wpkh1vd"; }; "github"."copilot-chat" = vscode-utils.extensionFromVscodeMarketplace { name = "copilot-chat"; @@ -205,8 +205,8 @@ merge "qcz"."text-power-tools" = vscode-utils.extensionFromVscodeMarketplace { name = "text-power-tools"; publisher = "qcz"; - version = "1.47.1"; - sha256 = "13ab30w7kcivz6b2hydqxzd4glxqa1frcyrgj2j133x75nnxchwy"; + version = "1.48.0"; + sha256 = "1wqqsfn9kd1fqkj0wmp3059w9jnbdw48nj5pfw41wwlrb2vvib5q"; }; "jnoortheen"."nix-ide" = vscode-utils.extensionFromVscodeMarketplace { name = "nix-ide"; @@ -243,8 +243,8 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.11.2024071602"; - sha256 = "19qgr2bh0qcidrczb3s7i21s2rsswhv7f7z4izb55v2d14601c6h"; + version = "2024.11.2024071802"; + sha256 = "1wf8d11vlsma7rg0dphjkb18df3q7m6ilkg4hi2zbvxws28fala5"; arch = "linux-x64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { @@ -257,8 +257,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2038"; - sha256 = "097nlpj8bjs6i8bs1rnl4kghr4f522nfiszpgl2qk0ff1n4hq0gl"; + version = "0.4.2040"; + sha256 = "0k7apgylak0y92d3shnrlcz4wzs8zl1nhxgzqwyv993jqj9wxxxy"; arch = "linux-x64"; }; "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { @@ -273,8 +273,8 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.11.2024071602"; - sha256 = "13gmm5rxij3zkk6g3jmj5ipxf03a88r6qmxm9qrqfpk7pdpz80wy"; + version = "2024.11.2024071802"; + sha256 = "1rcxp961p67sbg9xpdjjff3sjp63dy85w44rq89g1cxv1kki0yw2"; arch = "linux-arm64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { @@ -287,8 +287,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2038"; - sha256 = "0w0cnr1ffvdxhq92n9agwahm7c91c1z9ixmwicwarndq4g0m3a9q"; + version = "0.4.2040"; + sha256 = "0fymzl6i9lhh4rsi1h89w63s17kc0k7kvfnws8maxx1grykwzg6a"; arch = "linux-arm64"; }; "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { @@ -303,8 +303,8 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.11.2024071602"; - sha256 = "0kbkdxjr8520ip3n6y7576r77949lnz45bwq6l46znb1qmnkyh5k"; + version = "2024.11.2024071802"; + sha256 = "1mhp4hnhk8gffz8y9xkl9bx86vbpbm2w6xyjcj2av2llwky70icl"; arch = "darwin-x64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { @@ -317,8 +317,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2038"; - sha256 = "0ypl5fflvk8rmr9qx2pddmvc05zrldqzlv169zrndms0rhl43l2i"; + version = "0.4.2040"; + sha256 = "1l2p7dshnfr181nzvykcvzqi9g21gk02c5ry4609qmjszz6s9ky5"; arch = "darwin-x64"; }; "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { @@ -333,8 +333,8 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.11.2024071602"; - sha256 = "0hlf9pvvpvg20x231gxp6falkzd355zbz8ym6jixah5jqsplzqzq"; + version = "2024.11.2024071802"; + sha256 = "1hz7cqza1fz59jhq5iqjjkgww2d9jlnlaz61fxqbp8rim2k5i4bl"; arch = "darwin-arm64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { @@ -347,8 +347,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2038"; - sha256 = "1lw7vrccq44ni934zxig1wvx9h4m7f09s8g749fkr64483pdih3i"; + version = "0.4.2040"; + sha256 = "0ggfzn1k67j8ndh7kn35np5jzr39pv4x9p0520c13dqg422myqy8"; arch = "darwin-arm64"; }; "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { diff --git a/home/desktops/gnome/default.nix b/home/desktops/gnome/default.nix index 68d7138..15457bf 100644 --- a/home/desktops/gnome/default.nix +++ b/home/desktops/gnome/default.nix @@ -28,7 +28,6 @@ mission-center mousam paper-clip - paperwork parabolic pika-backup pitivi diff --git a/hosts/Blackbird/default.nix b/hosts/Blackbird/default.nix index bc82769..a3fa887 100644 --- a/hosts/Blackbird/default.nix +++ b/hosts/Blackbird/default.nix @@ -40,7 +40,6 @@ in { }; # Setup Audio - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix index 38a82e5..d2b1642 100644 --- a/hosts/Equinox/default.nix +++ b/hosts/Equinox/default.nix @@ -61,7 +61,6 @@ in { }; # Setup Audio - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/hosts/Pegasus/default.nix b/hosts/Pegasus/default.nix index 99861e9..b767d8d 100644 --- a/hosts/Pegasus/default.nix +++ b/hosts/Pegasus/default.nix @@ -26,7 +26,6 @@ in { boot.loader.efi.canTouchEfiVariables = true; # Setup Audio - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = {