diff options
| -rw-r--r-- | checks.nix | 3 | ||||
| -rw-r--r-- | configurations/test-headful/default.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 179 | ||||
| -rw-r--r-- | flake.nix | 16 | ||||
| -rw-r--r-- | modules/common/stylix.nix | 3 | ||||
| -rw-r--r-- | modules/firefox/addons.nix | 30 | ||||
| -rw-r--r-- | modules/mpv.nix | 29 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 6 | ||||
| -rw-r--r-- | modules/xmonad.nix | 31 | ||||
| -rw-r--r-- | overlays.nix | 35 | ||||
| -rw-r--r-- | packages/openssl_1_0_0.nix | 2 |
11 files changed, 125 insertions, 210 deletions
diff --git a/checks.nix b/checks.nix index 511b658..33ab57e 100644 --- a/checks.nix +++ b/checks.nix @@ -5,7 +5,7 @@ ... }: { - preCommit = inputs.git-hooks.lib.${system}.run { + git-hooks = inputs.git-hooks.lib.${system}.run { src = builtins.path { name = "src"; path = ./.; @@ -43,3 +43,4 @@ }; }; } +// inputs.self.packages.${system} diff --git a/configurations/test-headful/default.nix b/configurations/test-headful/default.nix index f1da389..79a1536 100644 --- a/configurations/test-headful/default.nix +++ b/configurations/test-headful/default.nix @@ -4,7 +4,6 @@ with lib; nixfiles.modules = { dwm.enable = false; kde.enable = true; - xmonad.enable = false; }; boot.loader.systemd-boot.enable = true; diff --git a/flake.lock b/flake.lock index 5921505..09a2c72 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1708283120, - "narHash": "sha256-IgJe5xhssW199zGQq4Q81stGdVDJH7nFHm3yu62I75E=", + "lastModified": 1718613978, + "narHash": "sha256-iXzxAcovEZHHYUYIWtIJYMpQf96MwasMirMxMKJL5Aw=", "owner": "dwarfmaster", "repo": "arkenfox-nixos", - "rev": "05e7e0996493f47bbc15228895c4e31ce24616f0", + "rev": "35e803fa44abfd438c65b64ff2691f3f608cd2d3", "type": "github" }, "original": { @@ -198,15 +198,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -329,7 +329,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -464,11 +464,11 @@ }, "impermanence": { "locked": { - "lastModified": 1708968331, - "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", + "lastModified": 1717932370, + "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", "owner": "nix-community", "repo": "impermanence", - "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", + "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", "type": "github" }, "original": { @@ -486,14 +486,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1717515088, - "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=", + "lastModified": 1718398369, + "narHash": "sha256-ccOHDuTaUhD1DW6DGNXoDJNOwYx55rVNKECyqRzKRtE=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456", + "rev": "54cbacb6eb9938bf1eaab7a7840fb527050c2af1", "type": "gitlab" }, "original": { @@ -515,11 +515,11 @@ ] }, "locked": { - "lastModified": 1717464255, - "narHash": "sha256-+RM9dpf6F9CRIpouYgD2YL5zrK0vslyRYK44NO70zkc=", + "lastModified": 1718760354, + "narHash": "sha256-jRp9BePU8ZW2Q9UFOcSNNV1H3NSp3hqXkg/raMNhHMM=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "6929e834c2c4eba8172eafbb7b26648319217a99", + "rev": "c50d882ce2510df6e47cb6b392497dde75ed2a2a", "type": "github" }, "original": { @@ -535,11 +535,11 @@ ] }, "locked": { - "lastModified": 1717297675, - "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717515267, - "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717399147, - "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", + "lastModified": 1718606988, + "narHash": "sha256-pmjP5ePc1jz+Okona3HxD7AYT0wbrCwm9bXAlj08nDM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", + "rev": "38d3352a65ac9d621b0cd3074d3bef27199ff78f", "type": "github" }, "original": { @@ -606,13 +606,28 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1717538961, - "narHash": "sha256-IqIAhq8Pz0sKjb9mRZrHCyGIStRZ0eQzWlp7WA/Yrf0=", + "lastModified": 1718788377, + "narHash": "sha256-ZoqF46gRMKHra9+5Uw5rBKu0/0Bo9b7kO5rvjgGjy10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f3cfae3d51c84c7dc7a56b644b162f22568665a", + "rev": "2dbcf7101a397c243aa2011b4a53db73f1f1448c", "type": "github" }, "original": { @@ -624,11 +639,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717533996, - "narHash": "sha256-bBHBsdTaxfsldfvTzGGMyq3NCAd+mGjN5GsnL7/D5Kw=", + "lastModified": 1718786543, + "narHash": "sha256-R8lt4gur3+k5oG03AMaA0+Vnzdrm6BJ3c4gjnDRJZMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce4901de3c01fa0e8de0f92c39e5b585ff83e037", + "rev": "b9bb121348b1392a5994cb333559fd158b8b9fc5", "type": "github" }, "original": { @@ -695,8 +710,7 @@ "nmap-vulscan": "nmap-vulscan", "srvos": "srvos", "stylix": "stylix", - "vscode-extensions": "vscode-extensions", - "xmonad-ng": "xmonad-ng" + "vscode-extensions": "vscode-extensions" } }, "srvos": { @@ -706,11 +720,11 @@ ] }, "locked": { - "lastModified": 1717376170, - "narHash": "sha256-603uKDAsg8KKVvMzNxIgTrHvXu6vRYx32NO3tuQCIg4=", + "lastModified": 1718585173, + "narHash": "sha256-G5DB6D3p8ucyGfmWt3JmiWcVW55DeuUoiT230wQ9Am4=", "owner": "nix-community", "repo": "srvos", - "rev": "96998137e26a92debda49fc2a32d4852d754abb4", + "rev": "c607ffef7c234d88f37ed12d75b2c48de3f4b3fe", "type": "github" }, "original": { @@ -740,11 +754,11 @@ ] }, "locked": { - "lastModified": 1717514652, - "narHash": "sha256-ry2AlcYSSYl31gOcVBxgk2sISlu10EJs+bBMaNWsW+E=", + "lastModified": 1718634635, + "narHash": "sha256-REUyeY+gD/QuTwAhuJycheej0FWFGPTosI+jiG5TsQk=", "owner": "danth", "repo": "stylix", - "rev": "85a0a92c3173ceebbca9b7ec692db79cff8ce91a", + "rev": "f13c946181730f98e1a5cd09714100490207b250", "type": "github" }, "original": { @@ -798,39 +812,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vscode-extensions": { "inputs": { "flake-compat": [ @@ -844,11 +825,11 @@ ] }, "locked": { - "lastModified": 1717464314, - "narHash": "sha256-165xjtRXJ5NqR8JaL8VZNKr+1ewIgCAbL9q4taHQTxc=", + "lastModified": 1718760425, + "narHash": "sha256-kGAKl4qNbVPz5z+2F32jYM4srlRGt7j3qljoW45mjV4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "229fde964eebeacc4630a9e37761d6f5b24316a3", + "rev": "b882e3fa1da93a60e1f4185ae02314eb73fa9852", "type": "github" }, "original": { @@ -856,30 +837,6 @@ "repo": "nix-vscode-extensions", "type": "github" } - }, - "xmonad-ng": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660604184, - "narHash": "sha256-iZLY0PNsscaAgHQOY/iuV9yFIHdkEVF1m9mHfN0lT/c=", - "ref": "master", - "rev": "ba163659c9652efe46dd22cb4ad38e8a99adaf7c", - "revCount": 76, - "type": "git", - "url": "https://git.azahi.cc/xmonad-ng" - }, - "original": { - "ref": "master", - "type": "git", - "url": "https://git.azahi.cc/xmonad-ng" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1019a60..727ba2f 100644 --- a/flake.nix +++ b/flake.nix @@ -120,14 +120,6 @@ flake = false; }; - xmonad-ng = { - url = "git+https://git.azahi.cc/xmonad-ng?ref=master"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; - azahi-cc = { url = "git+https://git.azahi.cc/azahi-cc?ref=master"; flake = false; @@ -182,9 +174,11 @@ default = self.packages.${system}.nixfiles; inherit (self.legacyPackages.${system}) nixfiles; - iso = self.nixosConfigurations.iso.config.system.build.isoImage; - topology = self.topology.config.output; + + iso = self.nixosConfigurations.iso.config.system.build.isoImage; + test-headless = self.nixosConfigurations.test-headless.config.system.build.vm; + test-headful = self.nixosConfigurations.test-headful.config.system.build.vm; }; legacyPackages.${system} = pkgs; @@ -194,7 +188,7 @@ devShells.${system}.default = with pkgs; mkShell { - inherit (self.checks.${system}.preCommit) shellHook; + inherit (self.checks.${system}.git-hooks) shellHook; packages = [ go-task ]; }; diff --git a/modules/common/stylix.nix b/modules/common/stylix.nix index 314aa4c..c7409b5 100644 --- a/modules/common/stylix.nix +++ b/modules/common/stylix.nix @@ -37,11 +37,12 @@ with lib; # [1]: https://github.com/tinted-theming/base24/blob/master/styling.md config = { stylix = { + enable = this.isHeadful; autoEnable = this.isHeadful; image = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/a/a5/Bonaparte_ante_la_Esfinge%2C_por_Jean-Léon_Gérôme.jpg"; - sha256 = "sha256-qWv52oT8cF9K4ZoeawmR3jgoGB2ARfjbKKc12IljUcM="; + hash = "sha256-qWv52oT8cF9K4ZoeawmR3jgoGB2ARfjbKKc12IljUcM="; }; base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow.yaml"; diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix index 99cd8a3..abdb06f 100644 --- a/modules/firefox/addons.nix +++ b/modules/firefox/addons.nix @@ -2,10 +2,10 @@ { "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.4.2"; + version = "2024.6.2"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4282854/bitwarden_password_manager-2024.4.2.xpi"; - sha256 = "19caac7131a37e558204c1f61cf1459502cc624b0284dc5837112c4742917da0"; + url = "https://addons.mozilla.org/firefox/downloads/file/4305759/bitwarden_password_manager-2024.6.2.xpi"; + sha256 = "c064e2d6601cb921ecd154e0d3bfd54d71af43da1947aa51666877ef0afd1436"; meta = with lib; { homepage = "https://bitwarden.com"; description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information."; @@ -31,10 +31,10 @@ }; "consent-o-matic" = buildFirefoxXpiAddon { pname = "consent-o-matic"; - version = "1.0.13"; + version = "1.1.0"; addonId = "gdpr@cavi.au.dk"; - url = "https://addons.mozilla.org/firefox/downloads/file/4246350/consent_o_matic-1.0.13.xpi"; - sha256 = "ee577eaedebd9fef65f77218b86c59972818442c9af551d551a7015a4a246e9a"; + url = "https://addons.mozilla.org/firefox/downloads/file/4298698/consent_o_matic-1.1.0.xpi"; + sha256 = "c23631cdf746fcf2896e99ba0dbc6192bd92c24275d05b0802dc7d7038b4815a"; meta = with lib; { homepage = "https://consentomatic.au.dk/"; description = "Automatic handling of GDPR consent forms"; @@ -50,10 +50,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.85"; + version = "4.9.86"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4286925/darkreader-4.9.85.xpi"; - sha256 = "28180bd8b970c4b9f961bda310df271d1e26a7cdf4ff01c94239f2fca3079d05"; + url = "https://addons.mozilla.org/firefox/downloads/file/4295557/darkreader-4.9.86.xpi"; + sha256 = "dde9896751858d0179f3d724a59f2bd4a0d61e599cb8822dc8ed2de320510714"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; @@ -119,10 +119,10 @@ }; "languagetool" = buildFirefoxXpiAddon { pname = "languagetool"; - version = "8.6.0"; + version = "8.9.1"; addonId = "languagetool-webextension@languagetool.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4249956/languagetool-8.6.0.xpi"; - sha256 = "d9db9aac9fdd53eb39179c153161762cd9e9eb1f6d7da8e8b8a32238b4847094"; + url = "https://addons.mozilla.org/firefox/downloads/file/4298468/languagetool-8.9.1.xpi"; + sha256 = "0747fcd4d7066ac746d140b93870a37eb5cf3241c3a5759128c54bf12b14feea"; meta = with lib; { homepage = "https://languagetool.org"; description = "With this extension you can check text with the free style and grammar checker LanguageTool. It finds many errors that a simple spell checker cannot detect, like mixing up there/their, a/an, or repeating a word."; @@ -183,10 +183,10 @@ }; "rikaichamp" = buildFirefoxXpiAddon { pname = "rikaichamp"; - version = "1.18.0"; + version = "1.19.1"; addonId = "{59812185-ea92-4cca-8ab7-cfcacee81281}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4241410/10ten_ja_reader-1.18.0.xpi"; - sha256 = "5433bcfec5a327bf1fa198b3f0645a9cdcdc44232465ad940fa8a5858b6996f8"; + url = "https://addons.mozilla.org/firefox/downloads/file/4299897/10ten_ja_reader-1.19.1.xpi"; + sha256 = "e7e6ac877da00a8b08b68f265665a6317febdbb692350031fb133fcc2e92dd88"; meta = with lib; { homepage = "https://github.com/birchill/10ten-ja-reader/"; description = "Quickly translate Japanese by hovering over words. Formerly released as Rikaichamp."; diff --git a/modules/mpv.nix b/modules/mpv.nix index 9b26b08..90d46d9 100644 --- a/modules/mpv.nix +++ b/modules/mpv.nix @@ -99,22 +99,17 @@ in hm.programs.mpv = { enable = true; - package = - with pkgs; - wrapMpv - (mpv-unwrapped.override { - bs2bSupport = false; - cacaSupport = false; - dvbinSupport = false; - dvdnavSupport = false; - swiftSupport = false; - }) - { - scripts = with mpvScripts; [ - autoload - sponsorblock - ]; - }; + package = pkgs.mpv.override { + scripts = with pkgs.mpvScripts; [ + autoload + mpv-cheatsheet + mpv-webm + sponsorblock + thumbfast + uosc + webtorrent-mpv-hook + ]; + }; bindings = { "RIGHT" = "seek 10"; @@ -206,8 +201,6 @@ in osd-level = 1; osd-shadow-color = "#33000000"; - # osc = false; - blend-subtitles = true; embeddedfonts = false; sub-ass-force-margins = true; diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index e2925c8..331464b 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -36,7 +36,6 @@ in vscode.enable = true; wayland.enable = mkDefault true; x11.enable = mkDefault true; - xmonad.enable = mkDefault false; zathura.enable = true; }; @@ -51,10 +50,6 @@ in ''; packages = with pkgs; [ - (vesktop.override { - withSystemVencord = true; - withTTS = false; - }) element-desktop fd imv @@ -65,6 +60,7 @@ in telegram-desktop tldr tor-browser-bundle-bin + vesktop ]; }; diff --git a/modules/xmonad.nix b/modules/xmonad.nix deleted file mode 100644 index 7b49f52..0000000 --- a/modules/xmonad.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; -let - cfg = config.nixfiles.modules.xmonad; -in -{ - options.nixfiles.modules.xmonad.enable = mkEnableOption "XMonad"; - - config = mkIf cfg.enable { - nixfiles.modules.x11.enable = true; - - hm = { - xsession = { - enable = true; - - scriptPath = ".xinitrc"; - - windowManager.command = getExe' pkgs.xmonad-ng "xmonad-ng"; - }; - }; - - services.xserver.displayManager.startx.enable = true; - - nixpkgs.overlays = [ inputs.xmonad-ng.overlays.default ]; - }; -} diff --git a/overlays.nix b/overlays.nix index 3e01cfc..5b80ae2 100644 --- a/overlays.nix +++ b/overlays.nix @@ -77,20 +77,25 @@ })).overrideAttrs (_: super: { patches = (super.patches or [ ]) ++ [ ./patches/telegram-desktop-no-ads.patch ]; }); - vesktop = prev.vesktop.overrideAttrs ( - _: super: { - nativeBuildInputs = super.nativeBuildInputs ++ [ final.imagemagick ]; - patches = (super.patches or [ ]) ++ [ ./patches/vesktop-no-anime.patch ]; - postInstall = - (super.postInstall or "") - + '' - rm -rf $out/share/icons/hicolor/* - for size in 16 24 32 48 64 96; do - convert -scale $size icon.png $size.png - install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vesktop.png - done - ''; - } - ); + vesktop = + (prev.vesktop.overrideAttrs ( + _: super: { + nativeBuildInputs = super.nativeBuildInputs ++ [ final.imagemagick ]; + patches = (super.patches or [ ]) ++ [ ./patches/vesktop-no-anime.patch ]; + postInstall = + (super.postInstall or "") + + '' + rm -rf $out/share/icons/hicolor/* + for size in 1024 128 256 32 512 64; do + convert -scale $size $src/build/icon.png $size.png + install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vesktop.png + done + ''; + } + )).override + { + withSystemVencord = false; + withTTS = false; + }; }; } diff --git a/packages/openssl_1_0_0.nix b/packages/openssl_1_0_0.nix index bbcc1fc..8db3b39 100644 --- a/packages/openssl_1_0_0.nix +++ b/packages/openssl_1_0_0.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://downloads.dotslashplay.it/resources/openssl/openssl_${finalAttrs.version}.tar.xz"; - sha256 = "sha256-B8/FdkheAwrAtscn6dvUuen1slfRglM/kJb2xGm7uvA="; + hash = "sha256-B8/FdkheAwrAtscn6dvUuen1slfRglM/kJb2xGm7uvA="; }; sourceRoot = "x86_64"; |