diff --git a/flake.lock b/flake.lock index fc3f4fb..876a66f 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1698670511, - "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e5416b478e465985eec274bc3a018024435c106", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { diff --git a/modules/packages.nix b/modules/packages.nix index 563ba16..2cedbd1 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -57,7 +57,7 @@ rmlint sd smartmontools - # visidata + visidata scc hwinfo stress @@ -123,8 +123,4 @@ ]; environment.defaultPackages = [ ]; - - nixpkgs.config.permittedInsecurePackages = [ - "electron-24.8.6" # logseq - ]; } diff --git a/overlays/cmus.nix b/overlays/cmus.nix deleted file mode 100644 index 94ae8d6..0000000 --- a/overlays/cmus.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: - -{ - nixpkgs.overlays = [ - (final: prev: { - cmus = prev.cmus.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or [ ]) ++ [ - # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254 - (pkgs.fetchpatch { - url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; - hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; - }) - ]; - }); - }) - ]; -} diff --git a/overlays/default.nix b/overlays/default.nix index 06c8db1..8402c5e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,9 +1,7 @@ { imports = [ ./alejandra.nix - ./cmus.nix ./eza.nix - ./hyprnome.nix ./zola.nix ]; } diff --git a/overlays/hyprnome.nix b/overlays/hyprnome.nix deleted file mode 100644 index a439381..0000000 --- a/overlays/hyprnome.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - nixpkgs.overlays = [ - (final: prev: { - hyprnome = prev.hyprnome.overrideAttrs (oldAttrs: rec { - version = "0.2.0"; - - src = prev.fetchFromGitHub { - owner = "donovanglover"; - repo = "hyprnome"; - rev = version; - hash = "sha256-zlXiT2EOIdgIDI4NQuU3C903SSq5bylBAFJXyv7mdJ4="; - }; - - cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const { - name = "hyprnome-vendor.tar.gz"; - inherit src; - outputHash = "sha256-HNKjEwryfado8kDsdt6BRMQU/uPqytRztJANw4Mnw/Y="; - }); - - postInstall = '' - installManPage target/man/hyprnome.1 - - installShellCompletion --cmd hyprnome \ - --bash <(cat target/completions/hyprnome.bash) \ - --fish <(cat target/completions/hyprnome.fish) \ - --zsh <(cat target/completions/_hyprnome) - ''; - }); - }) - ]; -}