Merge branch 'main' of github.com:bloxx12/nichts
This commit is contained in:
commit
9899774377
8 changed files with 106 additions and 24 deletions
|
@ -61,6 +61,14 @@
|
|||
install_url = "https://addons.mozilla.org/firefox/downloads/file/4231522/new_tab_override-16.0.0.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"keepassxc-browser@keepassxc.org" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/file/4257616/keepassxc_browser-1.9.0.3.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"{7be2ba16-0f1e-4d93-9ebc-5164397477a9}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/file/3756025/videospeed-0.6.3.3.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -91,6 +91,9 @@ in {
|
|||
exec-once = [
|
||||
"waybar"
|
||||
"swww init & swww img ${gitPath}/${cfg.wallpaper}"
|
||||
"keepassxc"
|
||||
"nextcloud"
|
||||
"element-desktop --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu"
|
||||
];
|
||||
|
||||
bind = [
|
||||
|
@ -120,8 +123,13 @@ in {
|
|||
"$mod, down, movefocus, d"
|
||||
"$mod, F, fullscreen"
|
||||
|
||||
# Special Workspaces
|
||||
"$mod SHIFT, F, movetoworkspacesilent, special"
|
||||
"$mod, s, togglespecialworkspace,"
|
||||
|
||||
# Screenshot
|
||||
"$mod SHIFT, s, exec, grim -g '$(slurp -d)' - | wl-copy"
|
||||
"$mod SHIFT, s, exec, grim -g \"$(slurp -d)\" - | wl-copy"
|
||||
|
||||
]
|
||||
++ (
|
||||
builtins.concatLists (builtins.genList (
|
||||
|
@ -137,6 +145,11 @@ in {
|
|||
)
|
||||
10)
|
||||
);
|
||||
# Mouse movement
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
"$mod, mouse:273, resizewindow"
|
||||
];
|
||||
} cfg.extra];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -13,6 +13,11 @@
|
|||
opacity = 0.8;
|
||||
blur = true;
|
||||
};
|
||||
|
||||
steam = {
|
||||
enable = true;
|
||||
gamescope = true;
|
||||
};
|
||||
};
|
||||
|
||||
hyprland = {
|
||||
|
|
|
@ -1,6 +1,30 @@
|
|||
{ config, inputs, pkgs, ... }:
|
||||
{ config, inputs, pkgs, lib, ... }:
|
||||
let
|
||||
username = config.modules.other.system.username;
|
||||
|
||||
# Fetch the GLFW with Wayland patches for Minecraft
|
||||
customGLFW = let
|
||||
mcWaylandPatchRepo = pkgs.fetchFromGitHub {
|
||||
owner = "Admicos";
|
||||
repo = "minecraft-wayland";
|
||||
rev = "370ce5b95e3ae9bc4618fb45113bc641fbb13867";
|
||||
sha256 = "sha256-RPRg6Gd7N8yyb305V607NTC1kUzvyKiWsh6QlfHW+JE=";
|
||||
};
|
||||
mcWaylandPatches = map (name: "${mcWaylandPatchRepo}/${name}")
|
||||
(lib.naturalSort (builtins.attrNames (lib.filterAttrs
|
||||
(name: type:
|
||||
type == "regular" && lib.hasSuffix ".patch" name)
|
||||
(builtins.readDir mcWaylandPatchRepo))));
|
||||
in pkgs.glfw.overrideAttrs (previousAttrs: {
|
||||
patches = previousAttrs.patches ++ mcWaylandPatches;
|
||||
buildInputs = previousAttrs.buildInputs ++ [ pkgs.wayland ];
|
||||
});
|
||||
|
||||
# Minecraft launcher with the custom GLFW
|
||||
minecraftPrismLauncher = pkgs.prismlauncher.override {
|
||||
glfw = customGLFW;
|
||||
};
|
||||
|
||||
in {
|
||||
home-manager.users.${username} = {
|
||||
home.packages = let
|
||||
|
@ -9,4 +33,9 @@ in {
|
|||
in with pkgs; [
|
||||
];
|
||||
};
|
||||
|
||||
# System-wide installation of Minecraft PrismLauncher
|
||||
environment.systemPackages = [
|
||||
minecraftPrismLauncher
|
||||
];
|
||||
}
|
||||
|
|
|
@ -63,6 +63,8 @@ in {
|
|||
yubikey-personalization-gui
|
||||
yubikey-personalization
|
||||
yubioath-flutter
|
||||
fzf
|
||||
nix-index
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -13,5 +13,6 @@ _: {
|
|||
./WM
|
||||
./alacritty.nix
|
||||
./firefox.nix
|
||||
./steam.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ in {
|
|||
enable = true;
|
||||
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
EnableTrackingProtection = {
|
||||
Value= true;
|
||||
|
@ -36,28 +36,30 @@ in {
|
|||
DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
|
||||
DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
|
||||
SearchBar = "unified"; # alternative: "separate"
|
||||
FirefoxSuggest = {
|
||||
WebSuggestions = true;
|
||||
ImproveSuggest = true;
|
||||
Locked = true;
|
||||
};
|
||||
SearchSuggestEnabled = true;
|
||||
theme = {
|
||||
colors = {
|
||||
background-darker = "181825";
|
||||
background = "1e1e2e";
|
||||
foreground = "cdd6f4";
|
||||
};
|
||||
};
|
||||
FirefoxSuggest = {
|
||||
WebSuggestions = true;
|
||||
ImproveSuggest = true;
|
||||
Locked = true;
|
||||
};
|
||||
SearchSuggestEnabled = true;
|
||||
theme = {
|
||||
colors = {
|
||||
background-darker = "181825";
|
||||
background = "1e1e2e";
|
||||
foreground = "cdd6f4";
|
||||
};
|
||||
};
|
||||
|
||||
font = "Lexend";
|
||||
ExtensionSettings = lib.mkMerge [{
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
} cfg.extensions];
|
||||
};
|
||||
OfferToSaveLogins = false;
|
||||
|
||||
font = "Lexend";
|
||||
ExtensionSettings = lib.mkMerge [{
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
} cfg.extensions];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
22
modules/gui/steam.nix
Normal file
22
modules/gui/steam.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
|
||||
{ config, lib, inputs, pkgs, ... }:
|
||||
with lib; let
|
||||
username = config.modules.other.system.username;
|
||||
cfg = config.modules.programs.steam;
|
||||
in {
|
||||
options.modules.programs.steam = {
|
||||
enable = mkEnableOption "steam";
|
||||
gamescope = mkEnableOption "gamescope";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
gamescopeSession.enable = mkIf cfg.gamescope true;
|
||||
};
|
||||
home-manager.users.${username} = {
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue