From bf0174978e02427926efed675b811a01a0723a23 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 13 Aug 2024 11:09:42 +0200 Subject: [PATCH] removing settings --- flake.nix | 2 +- modules/editors/nvf/settings.nix | 2 +- modules/gui/foot.nix | 40 +++++++------------------------ modules/gui/minecraft.nix | 11 +-------- modules/gui/schizofox/default.nix | 18 +++++--------- modules/gui/schizofox/package.nix | 26 -------------------- 6 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 modules/gui/schizofox/package.nix diff --git a/flake.nix b/flake.nix index a090ed7..29d1d61 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Nix but better + # Nix but better or something nix-super = { url = "github:privatevoid-net/nix-super"; }; diff --git a/modules/editors/nvf/settings.nix b/modules/editors/nvf/settings.nix index 5b64b78..94b065d 100644 --- a/modules/editors/nvf/settings.nix +++ b/modules/editors/nvf/settings.nix @@ -6,7 +6,7 @@ inputs, ... }: let - inherit (builtins) filter map toString path; + inherit (builtins) filter map toString; inherit (lib.filesystem) listFilesRecursive; inherit (lib.strings) hasSuffix fileContents; inherit (lib.attrsets) genAttrs; diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix index 2ae342a..ac2339d 100644 --- a/modules/gui/foot.nix +++ b/modules/gui/foot.nix @@ -39,19 +39,23 @@ in { word-delimiters = '',│`|:"'()[]{}<>''; selection-target = "primary"; }; + desktop-notifications.command = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; + bell = { urgent = "yes"; notify = "yes"; command = "${pkgs.libnotify}/bin/notify-send bell"; command-focused = "no"; }; + scrollback = { lines = 100000; multiplier = 10.0; indicator-position = "relative"; indicator-format = "line"; }; + url = { launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}"; label-letters = "sadfjklewcmpgh"; @@ -60,51 +64,23 @@ in { uri-characters = '' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]''; }; + cursor = { style = "beam"; blink = "true"; }; + mouse = { hide-when-typing = "yes"; alternate-scroll-mode = "yes"; }; - # colors = { - # alpha = 0.85; - # foreground = "cdd6f4"; # Text - # background = "1e1e2e"; # Base - # regular0 = "45475a"; # Surface 1 - # regular1 = "f38ba8"; # red - # regular2 = "a6e3a1"; # green - # regular3 = "f9e2af"; # yellow - # regular4 = "89b4fa"; # blue - # regular5 = "f5c2e7"; # pink - # regular6 = "94e2d5"; # teal - # regular7 = "bac2de"; # Subtext 1 - # bright0 = "585b70"; # Surface 2 - # bright1 = "f38ba8"; # red - # bright2 = "a6e3a1"; # green - # bright3 = "f9e2af"; # yellow - # bright4 = "89b4fa"; # blue - # bright5 = "f5c2e7"; # pink - # bright6 = "94e2d5"; # teal - # bright7 = "a6adc8"; # Subtext 0 - # }; + csd = {preferred = "server";}; + key-bindings = { show-urls-launch = "Control+Shift+u"; unicode-input = "Control+Shift+i"; }; - mouse-bindings = { - # selection-override-modifiers = "Shift"; - # primary-paste = "BTN_MIDDLE"; - # select-begin = "BTN_LEFT"; - # select-begin-block = "Control+BTN_LEFT"; - # select-extend = "BTN_RIGHT"; - # select-extend-character-wise = "Control+BTN_RIGHT"; - # select-word = "BTN_LEFT-2"; - # select-word-whitespace = "Control+BTN_LEFT-2"; - # #select-row = "BTN_LEFT-3"; - }; }; }; }; diff --git a/modules/gui/minecraft.nix b/modules/gui/minecraft.nix index 9910fcb..bb421fa 100644 --- a/modules/gui/minecraft.nix +++ b/modules/gui/minecraft.nix @@ -5,7 +5,7 @@ ... }: with lib; let - username = config.modules.other.system.username; + inherit (config.modules.other.system) username; cfg = config.modules.programs.minecraft; in { options.modules.programs.minecraft = { @@ -14,15 +14,6 @@ in { }; config = mkIf cfg.enable { - # Set wayland environment flag - environment.variables = - mkIf cfg.wayland {__GL_THREADED_OPTIMIZATIONS = 0;}; - # Install glfw-wayland-minecraft - environment.systemPackages = with pkgs; - mkIf cfg.wayland [ - glfw-wayland-minecraft # Use these parameters in the prism launcher: -Dfml.earlyprogresswindow=false -Dorg.lwjgl.glfw.libname=/nix/store/ypkdx5844pp1vdw2z2nmnf2nb9kgl0mp-glfw-wayland-minecraft-unstable-2023-06-01/lib/libglfw.so - ]; - home-manager.users.${username} = { # Install minecraft home.packages = with pkgs; [prismlauncher]; diff --git a/modules/gui/schizofox/default.nix b/modules/gui/schizofox/default.nix index 518b30b..312cbbd 100644 --- a/modules/gui/schizofox/default.nix +++ b/modules/gui/schizofox/default.nix @@ -175,23 +175,17 @@ in { settings = { "gfx.webrender.all" = true; "media.ffmpeg.vaapi.enabled" = true; - # "media.rdd-ffmpeg.enabled" = true; - # "media.av1.enabled" = true; - # "gfx.x11-egl.force-enabled" = true; - # "widget.dmabuf.force-enabled" = true; + "media.rdd-ffmpeg.enabled" = true; + "media.av1.enabled" = true; + "gfx.x11-egl.force-enabled" = true; + "widget.dmabuf.force-enabled" = true; "layers.acceleration.force-enabled" = true; + "browser.startup.page" = 3; "browser.ctrlTab.sortByRecentlyUsed" = true; # This makes websites prefer a dark theme (in theory) - # "layout.css.prefers-color-scheme.content-override" = 0; - # "widget.use-xdg-desktop-portal.file-picker" = 1; - # Leaving this on breaks a lot - # "privacy.resistFingerprinting" = false; - # "permissions.fullscreen.allowed" = true; - # "dom.webnotifications.enabled" = true; - - "browser.startup.page" = 3; + "layout.css.prefers-color-scheme.content-override" = 0; }; }; }; diff --git a/modules/gui/schizofox/package.nix b/modules/gui/schizofox/package.nix deleted file mode 100644 index 681e1cc..0000000 --- a/modules/gui/schizofox/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Stolen from Raf, kinda -{ - lib, - stdenvNoCC, -}: let - name = "schizofox-startpage"; - version = "2023-12-29-unstable"; -in - stdenvNoCC.mkDerivation { - inherit name version; - src = ./src; - - dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -rv $src/* $out - runHook postInstall - ''; - - meta = { - description = "My personal startpage"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [NotAShelf]; - }; - }