diff options
Diffstat (limited to 'modules')
| -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 |
5 files changed, 29 insertions, 70 deletions
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 ]; - }; -} |