new wm, hyprland gone
This commit is contained in:
parent
003f37bfbd
commit
cb4b22b4e5
GPG key ID:
DAF5EAF6665839FD
41 changed files with 1145 additions and 1364 deletions
|
|
@ -37,7 +37,7 @@ in {
|
|||
};
|
||||
|
||||
programs.gamescope = {
|
||||
enable = true;
|
||||
enable = cfg.useGamescope;
|
||||
# capSysNice = true; https://github.com/NixOS/nixpkgs/issues/351516
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,76 +11,80 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
hm.programs.vscode = {
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
# nix is *the* language here
|
||||
jnoortheen.nix-ide
|
||||
|
||||
# general extensions
|
||||
oderwat.indent-rainbow
|
||||
usernamehw.errorlens
|
||||
editorconfig.editorconfig
|
||||
ms-vsliveshare.vsliveshare
|
||||
ms-vscode-remote.remote-ssh
|
||||
ms-vscode.hexeditor
|
||||
tamasfe.even-better-toml
|
||||
github.copilot
|
||||
|
||||
# language specific
|
||||
# js/ts
|
||||
dbaeumer.vscode-eslint
|
||||
astro-build.astro-vscode
|
||||
# rs
|
||||
rust-lang.rust-analyzer
|
||||
# lua
|
||||
sumneko.lua
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
# general extensions
|
||||
{
|
||||
name = "discord-vscode";
|
||||
publisher = "icrawl";
|
||||
version = "5.8.0";
|
||||
sha256 = "sha256-IU/looiu6tluAp8u6MeSNCd7B8SSMZ6CEZ64mMsTNmU=";
|
||||
}
|
||||
];
|
||||
mutableExtensionsDir = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
enableUpdateCheck = false;
|
||||
userSettings = with config.modules.desktop.fonts.fonts; {
|
||||
"editor.fontFamily" = "'${monospace.family}', monospace";
|
||||
"editor.fontSize" = monospace.size;
|
||||
profiles.default = {
|
||||
enableExtensionUpdateCheck = false;
|
||||
enableUpdateCheck = false;
|
||||
|
||||
"terminal.integrated.fontFamily" = "\"${monospace.family}\"";
|
||||
"terminal.integrated.fontSize" = monospace.size;
|
||||
"terminal.integrated.smoothScrolling" = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
# nix is *the* language here
|
||||
jnoortheen.nix-ide
|
||||
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
# general extensions
|
||||
oderwat.indent-rainbow
|
||||
usernamehw.errorlens
|
||||
editorconfig.editorconfig
|
||||
ms-vsliveshare.vsliveshare
|
||||
ms-vscode-remote.remote-ssh
|
||||
ms-vscode.hexeditor
|
||||
tamasfe.even-better-toml
|
||||
github.copilot
|
||||
|
||||
"editor.tabSize" = 4;
|
||||
"editor.cursorSmoothCaretAnimation" = "on";
|
||||
# language specific
|
||||
# js/ts
|
||||
dbaeumer.vscode-eslint
|
||||
astro-build.astro-vscode
|
||||
# rs
|
||||
rust-lang.rust-analyzer
|
||||
# lua
|
||||
sumneko.lua
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
# general extensions
|
||||
{
|
||||
name = "discord-vscode";
|
||||
publisher = "icrawl";
|
||||
version = "5.8.0";
|
||||
sha256 = "sha256-IU/looiu6tluAp8u6MeSNCd7B8SSMZ6CEZ64mMsTNmU=";
|
||||
}
|
||||
];
|
||||
|
||||
"window.dialogStyle" = "custom";
|
||||
"window.titleBarStyle" = "custom";
|
||||
userSettings = with config.modules.desktop.fonts.fonts; {
|
||||
"editor.fontFamily" = "'${monospace.family}', monospace";
|
||||
"editor.fontSize" = monospace.size;
|
||||
|
||||
"workbench.tips.enabled" = false;
|
||||
"workbench.list.smoothScrolling" = true;
|
||||
"terminal.integrated.fontFamily" = "\"${monospace.family}\"";
|
||||
"terminal.integrated.fontSize" = monospace.size;
|
||||
"terminal.integrated.smoothScrolling" = true;
|
||||
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${lib.getExe pkgs.nil}";
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
|
||||
"security.workspace.trust.enabled" = "false";
|
||||
"editor.tabSize" = 4;
|
||||
"editor.cursorSmoothCaretAnimation" = "on";
|
||||
|
||||
"explorer.compactFolders" = false;
|
||||
"explorer.confirmDelete" = false;
|
||||
"explorer.confirmDragAndDrop" = true;
|
||||
"window.dialogStyle" = "custom";
|
||||
"window.titleBarStyle" = "custom";
|
||||
|
||||
"editor.smoothScrolling" = true;
|
||||
"editor.wordWrap" = "on";
|
||||
"editor.wrappingStrategy" = "advanced";
|
||||
"editor.fontWeight" = "normal";
|
||||
"editor.semanticHighlighting.enabled" = true;
|
||||
"workbench.tips.enabled" = false;
|
||||
"workbench.list.smoothScrolling" = true;
|
||||
|
||||
# prevent vscode from modifying the terminal colors
|
||||
"terminal.integrated.minimumContrastRatio" = 1;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${lib.getExe pkgs.nil}";
|
||||
|
||||
"security.workspace.trust.enabled" = "false";
|
||||
|
||||
"explorer.compactFolders" = false;
|
||||
"explorer.confirmDelete" = false;
|
||||
"explorer.confirmDragAndDrop" = true;
|
||||
|
||||
"editor.smoothScrolling" = true;
|
||||
"editor.wordWrap" = "on";
|
||||
"editor.wrappingStrategy" = "advanced";
|
||||
"editor.fontWeight" = "normal";
|
||||
"editor.semanticHighlighting.enabled" = true;
|
||||
|
||||
# prevent vscode from modifying the terminal colors
|
||||
"terminal.integrated.minimumContrastRatio" = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
services.flatpak.enable = true;
|
||||
hm.home.packages = [ pkgs.flatpak ];
|
||||
hm.home.packages = with pkgs; [ flatpak gnome-software ];
|
||||
fonts.fontDir.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ in {
|
|||
|
||||
config = {
|
||||
hwdec = "auto";
|
||||
keep-open = "yes";
|
||||
no-keepaspect-window = ""; # tiling doesn't play nice..
|
||||
osc = "no";
|
||||
border = "no";
|
||||
};
|
||||
|
|
@ -22,11 +24,16 @@ in {
|
|||
visualizer = {
|
||||
mode = "noalbumart";
|
||||
};
|
||||
modernz = with config.colorScheme.palette; {
|
||||
bottomhover = "no";
|
||||
hover_effect = ""; # these are weird lookin
|
||||
seekbarfg_color = "#${base0D}"; # blue is a sane default
|
||||
};
|
||||
};
|
||||
|
||||
scripts = with pkgs.mpvScripts; [
|
||||
mpris
|
||||
modernx
|
||||
modernz
|
||||
thumbfast
|
||||
visualizer
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
{ lib, config, pkgs, inputs, system, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
|
@ -9,12 +9,11 @@ in {
|
|||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.wezterm;
|
||||
example = "pkgs.wezterm";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.variables.TERM = "wezterm";
|
||||
|
||||
hm.programs.wezterm = {
|
||||
enable = true;
|
||||
package = cfg.package;
|
||||
|
|
@ -28,14 +27,17 @@ in {
|
|||
local config = {}
|
||||
|
||||
config.front_end = "WebGpu"
|
||||
config.font = wezterm.font '${fonts.monospaceBitmap.family}'
|
||||
config.font_size = ${toString fonts.monospaceBitmap.size}
|
||||
config.font = wezterm.font '${fonts.monospace.family}'
|
||||
-- this is a hack to get the font size to be the same as the bitmap font
|
||||
-- the size is in px, but wezterm uses pt, so we use a conversion
|
||||
config.font_size = ${toString fonts.monospace.size} / (4 / 3)
|
||||
config.freetype_load_flags = 'MONOCHROME'
|
||||
config.enable_wayland = false
|
||||
config.enable_wayland = true
|
||||
config.use_fancy_tab_bar = false
|
||||
config.use_resize_increments = true
|
||||
config.initial_cols = 120
|
||||
config.initial_rows = 40
|
||||
-- TODO: tiling acting WACK. these just make it even worse
|
||||
--config.use_resize_increments = true
|
||||
--config.initial_cols = 120
|
||||
--config.initial_rows = 40
|
||||
config.window_background_opacity = 0.8
|
||||
${config.modules.desktop.themes.wezterm or ""}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue