removing settings

This commit is contained in:
Charlie Root 2024-08-13 11:09:42 +02:00
commit bf0174978e
6 changed files with 17 additions and 82 deletions

View file

@ -29,7 +29,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Nix but better # Nix but better or something
nix-super = { nix-super = {
url = "github:privatevoid-net/nix-super"; url = "github:privatevoid-net/nix-super";
}; };

View file

@ -6,7 +6,7 @@
inputs, inputs,
... ...
}: let }: let
inherit (builtins) filter map toString path; inherit (builtins) filter map toString;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
inherit (lib.strings) hasSuffix fileContents; inherit (lib.strings) hasSuffix fileContents;
inherit (lib.attrsets) genAttrs; inherit (lib.attrsets) genAttrs;

View file

@ -39,19 +39,23 @@ in {
word-delimiters = '',`|:"'()[]{}<>''; word-delimiters = '',`|:"'()[]{}<>'';
selection-target = "primary"; selection-target = "primary";
}; };
desktop-notifications.command = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; desktop-notifications.command = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
bell = { bell = {
urgent = "yes"; urgent = "yes";
notify = "yes"; notify = "yes";
command = "${pkgs.libnotify}/bin/notify-send bell"; command = "${pkgs.libnotify}/bin/notify-send bell";
command-focused = "no"; command-focused = "no";
}; };
scrollback = { scrollback = {
lines = 100000; lines = 100000;
multiplier = 10.0; multiplier = 10.0;
indicator-position = "relative"; indicator-position = "relative";
indicator-format = "line"; indicator-format = "line";
}; };
url = { url = {
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}"; launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
label-letters = "sadfjklewcmpgh"; label-letters = "sadfjklewcmpgh";
@ -60,51 +64,23 @@ in {
uri-characters = '' uri-characters = ''
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]''; abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]'';
}; };
cursor = { cursor = {
style = "beam"; style = "beam";
blink = "true"; blink = "true";
}; };
mouse = { mouse = {
hide-when-typing = "yes"; hide-when-typing = "yes";
alternate-scroll-mode = "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";}; csd = {preferred = "server";};
key-bindings = { key-bindings = {
show-urls-launch = "Control+Shift+u"; show-urls-launch = "Control+Shift+u";
unicode-input = "Control+Shift+i"; 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";
};
}; };
}; };
}; };

View file

@ -5,7 +5,7 @@
... ...
}: }:
with lib; let with lib; let
username = config.modules.other.system.username; inherit (config.modules.other.system) username;
cfg = config.modules.programs.minecraft; cfg = config.modules.programs.minecraft;
in { in {
options.modules.programs.minecraft = { options.modules.programs.minecraft = {
@ -14,15 +14,6 @@ in {
}; };
config = mkIf cfg.enable { 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} = { home-manager.users.${username} = {
# Install minecraft # Install minecraft
home.packages = with pkgs; [prismlauncher]; home.packages = with pkgs; [prismlauncher];

View file

@ -175,23 +175,17 @@ in {
settings = { settings = {
"gfx.webrender.all" = true; "gfx.webrender.all" = true;
"media.ffmpeg.vaapi.enabled" = true; "media.ffmpeg.vaapi.enabled" = true;
# "media.rdd-ffmpeg.enabled" = true; "media.rdd-ffmpeg.enabled" = true;
# "media.av1.enabled" = true; "media.av1.enabled" = true;
# "gfx.x11-egl.force-enabled" = true; "gfx.x11-egl.force-enabled" = true;
# "widget.dmabuf.force-enabled" = true; "widget.dmabuf.force-enabled" = true;
"layers.acceleration.force-enabled" = true; "layers.acceleration.force-enabled" = true;
"browser.startup.page" = 3;
"browser.ctrlTab.sortByRecentlyUsed" = true; "browser.ctrlTab.sortByRecentlyUsed" = true;
# This makes websites prefer a dark theme (in theory) # This makes websites prefer a dark theme (in theory)
# "layout.css.prefers-color-scheme.content-override" = 0; "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;
}; };
}; };
}; };

View file

@ -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];
};
}