summaryrefslogtreecommitdiff
path: root/modules/common
diff options
context:
space:
mode:
Diffstat (limited to 'modules/common')
-rw-r--r--modules/common/common/stylix.nix52
-rw-r--r--modules/common/emacs/doom/config.el3
-rw-r--r--modules/common/mpv.nix8
3 files changed, 30 insertions, 33 deletions
diff --git a/modules/common/common/stylix.nix b/modules/common/common/stylix.nix
index 6e61b54..621fd4d 100644
--- a/modules/common/common/stylix.nix
+++ b/modules/common/common/stylix.nix
@@ -29,42 +29,34 @@ with lib; {
# Styling and color binding can be sourced from here[1].
#
# [1]: https://github.com/tinted-theming/base24/blob/master/styling.md
- config = {
- stylix = {
- 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=";
- };
-
- base16Scheme = "${pkgs.base16-schemes}/share/themes/default-light.yaml";
+ config.stylix = {
+ 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=";
+ };
- fonts = {
- serif = {
- package = pkgs.iosevka-bin.override {variant = "etoile";};
- name = "Iosevka Etoile";
- };
+ base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow.yaml";
- sansSerif = {
- package = pkgs.iosevka-bin.override {variant = "aile";};
- name = "Iosevka Aile";
- };
+ fonts = {
+ serif = {
+ package = pkgs.iosevka-bin.override {variant = "Etoile";};
+ name = "Iosevka Etoile";
+ };
- monospace = {
- package = pkgs.iosevka-bin;
- name = "Iosevka";
- };
+ sansSerif = {
+ package = pkgs.iosevka-bin.override {variant = "Aile";};
+ name = "Iosevka Aile";
+ };
- sizes = {
- desktop = 10;
- applications = 10;
- terminal = 12;
- };
+ monospace = {
+ package = pkgs.iosevka-bin.override {variant = "SS15";};
+ name = "Iosevka SS15";
};
- cursor = {
- name = "phinger-cursors";
- package = pkgs.phinger-cursors;
- size = 32;
+ sizes = {
+ desktop = 10;
+ applications = 10;
+ terminal = 12;
};
};
};
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 79b33fc..e31d41d 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -30,8 +30,7 @@
(setq +editorconfig-mode-alist '((sh-mode . "sh"))
editorconfig-exclude-modes '(lisp-mode
common-lisp-mode
- emacs-lisp-mode
- org-mode))
+ emacs-lisp-mode))
;;
;;; LSP
diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix
index 6f45304..e857b5b 100644
--- a/modules/common/mpv.nix
+++ b/modules/common/mpv.nix
@@ -14,7 +14,13 @@ in {
enable = true;
package = with pkgs;
- wrapMpv mpv-unwrapped {
+ wrapMpv (mpv-unwrapped.override {
+ bs2bSupport = false;
+ cacaSupport = false;
+ dvbinSupport = false;
+ dvdnavSupport = false;
+ swiftSupport = false;
+ }) {
scripts = with mpvScripts; [
autoload
sponsorblock