From f77f518349d48edb0b507f8b2adf6e25a7839008 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Thu, 21 Mar 2024 19:40:24 -0400 Subject: [PATCH] updated flake and fixed waybar build failure --- flake.lock | 66 ++++++++++++++++---------------- modules/nixos-common.nix | 18 ++++++++- users/tacocat/neovim/default.nix | 1 + users/tacocat/shell/bash.nix | 1 - 4 files changed, 51 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index db1fd22..9158c6b 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1710281778, - "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1710281379, - "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1710601327, - "narHash": "sha256-FlRF4T6I2m9WNg1+RVtZtes/nkB+awqdZCMHIPcM78A=", + "lastModified": 1710946911, + "narHash": "sha256-qV20Q7Ejpec200oBwUAgVYQjKt5BLPMLCm5EaRX3qgQ=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "080c763aec689b3b9f9be11913b2988efbe286f1", + "rev": "034a198d09ed872331c910c6acdca1577ff30ba7", "type": "gitlab" }, "original": { @@ -296,11 +296,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710123225, - "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "NixOs", "repo": "nixos-hardware", - "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710491356, - "narHash": "sha256-DeMiM/lgf8HqeAcDU26EeMaoU0phB8mY2RVYBtpvZN0=", + "lastModified": 1710936779, + "narHash": "sha256-ecYnUzSWqRae10pp7J6ZE2BznTPJ9f8sLiIoDBQtRBw=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f7c78852f37126244b43e71e5158cdc3d70ad0a", + "rev": "4f6e90212c7ec56d7c03611fb86befa313e7f61f", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nur": { "locked": { - "lastModified": 1710607749, - "narHash": "sha256-TRgxM7sOiWF8cea73OzDnmfhyYnN8+vDHUUJlkDDZ/U=", + "lastModified": 1711052752, + "narHash": "sha256-wHgyWnWvjG7P+8PX3E2PZrtpsnIsmzodXt/7r+SyhBk=", "owner": "nix-community", "repo": "nur", - "rev": "b870db4117d587a8c5c2c8c9e2d311d7fa4befe2", + "rev": "a01b1fe8e4253ca176ece6733d4e71ab8e65fa9f", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710843117, + "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347", "type": "github" }, "original": { diff --git a/modules/nixos-common.nix b/modules/nixos-common.nix index 8c7c637..1514458 100644 --- a/modules/nixos-common.nix +++ b/modules/nixos-common.nix @@ -137,7 +137,23 @@ options = "--delete-older-than 1w"; }; - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + allowUnfree = true; + packageOverrides = pkgs: { + waybar = pkgs.waybar.override { + wireplumber = pkgs.wireplumber.overrideAttrs rec { + version = "0.4.17"; + src = pkgs.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }; + }; + }; + }; programs.nix-index.enable = true; programs.command-not-found.enable = false; diff --git a/users/tacocat/neovim/default.nix b/users/tacocat/neovim/default.nix index ca9afe6..bdb08ae 100644 --- a/users/tacocat/neovim/default.nix +++ b/users/tacocat/neovim/default.nix @@ -115,6 +115,7 @@ settings = { compiler_method = "latexrun"; view_method = "zathura"; + compiler_latexrun.out_dir = "build"; }; }; }; diff --git a/users/tacocat/shell/bash.nix b/users/tacocat/shell/bash.nix index 5e373c7..5c9d7b4 100644 --- a/users/tacocat/shell/bash.nix +++ b/users/tacocat/shell/bash.nix @@ -4,7 +4,6 @@ enableCompletion = true; enableVteIntegration = true; profileExtra = '' - ssh-add ~/.ssh/git_school ssh-add ~/.ssh/git_personal ssh-add ~/.ssh/id_ed25519 '';