diff --git a/flake.nix b/flake.nix index 39d1c83..38c2017 100644 --- a/flake.nix +++ b/flake.nix @@ -10,30 +10,10 @@ inputs.utils.follows = "flake-utils"; }; - tinted-foot = { - url = "github:tinted-theming/tinted-foot"; - flake = false; - }; - tinted-vscode = { - url = "github:tinted-theming/tinted-vscode"; - flake = false; - }; rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; }; - firenvim = { - url = "github:glacambre/firenvim"; - flake = false; - }; - schemer2 = { - url = "github:thefryscorer/schemer2"; - flake = false; - }; - npmlock2nix = { - url = "github:nix-community/npmlock2nix"; - flake = false; - }; plasma-manager = { url = "github:pjones/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -51,6 +31,9 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; + hypr-darkwindow = { + url = "github:micha4w/Hypr-DarkWindow/tags/v0.51.1"; + }; }; outputs = { diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index d281165..4873f7b 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -91,14 +91,27 @@ in { # inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors hy3 hypr-dynamic-cursors + (inputs.hypr-darkwindow.packages.${pkgs.stdenv.hostPlatform.system}.Hypr-DarkWindow.overrideAttrs (super: { + buildInputs = with pkgs; [hyprland.dev] ++ hyprland.buildInputs; + })) ]; settings = { + # "darkwindow:shader[black]" = { + # from = "chromakey"; + # args = "bkg=[0.0 0.0 0.0] similarity=0.0 amount=0.0 targetOpacity=0.0"; + # }; "plugin:dynamic-cursors" = { - mode = "stretch"; + mode = "rotate"; + shake.enabled = false; }; "plugin:hy3" = { no_gaps_when_only = 1; }; + layerrule = [ + "ignorealpha 0.1, ashell-main-layer" + "blur,ashell-main-layer" + "blur,avizo" + ]; ecosystem = { no_update_news = true; no_donation_nag = true; @@ -130,6 +143,8 @@ in { "pin,class:(flameshot),title:(flameshot)" "fullscreenstate,class:(flameshot),title:(flameshot)" "float,class:(flameshot),title:(flameshot)" + + "plugin:shadewindow chromakey bkg=[0 0 0] similarity=0.02 amount=1 targetOpacity=0.8, class:librewolf" ]; bind = [ @@ -240,8 +255,10 @@ in { enable = true; systemd.enable = true; settings = { + clock.format = "%a %d %b %r"; + workspaces.visibility_mode = "MonitorSpecific"; modules = { - left = ["Workspaces" "WindowTitle"]; + left = [["Workspaces" "WindowTitle"] "Tray"]; center = ["MediaPlayer"]; right = ["SystemInfo" ["Clock" "Privacy" "Settings"]]; }; @@ -250,6 +267,14 @@ in { programs.librewolf.enable = true; + programs.zed-editor = { + themes.transparency = config.lib.stylix.colors { + template = ./zed-transparent.mustache; + extension = ".json"; + }; + userSettings.theme = lib.mkForce "Base16 Transparent ${config.lib.stylix.colors.scheme-name}"; + }; + stylix = { enable = lib.mkDefault true; autoEnable = lib.mkDefault true; @@ -267,10 +292,10 @@ in { }; opacity = { - terminal = lib.mkDefault 0.8; - popups = lib.mkDefault 0.8; + terminal = lib.mkDefault 0.85; + popups = lib.mkDefault 0.7; desktop = lib.mkDefault 0.6; - applications = lib.mkDefault 0.8; + applications = lib.mkDefault 0.85; }; }; diff --git a/home-manager/modules/zed-transparent.mustache b/home-manager/modules/zed-transparent.mustache new file mode 100644 index 0000000..ab093f7 --- /dev/null +++ b/home-manager/modules/zed-transparent.mustache @@ -0,0 +1,352 @@ +{ + "name": "Base16 Transparent {{scheme-name}}", + "author": "notgne2", + "themes": [ + { + "name": "Base16 Transparent {{scheme-name}}", + "appearance": "dark", + "style": { + "background.appearance": "blurred", + "border": "#00000000", + "border.variant": "#00000000", + "border.focused": null, + "border.selected": null, + "border.transparent": null, + "border.disabled": null, + "elevated_surface.background": "#{{base01-hex}}d9", + "surface.background": "#{{base00-hex}}d9", + "background": "#{{base00-hex}}d9", + "element.background": "#{{base00-hex}}", + "element.hover": "#{{base01-hex}}ff", + "element.active": "#{{base02-hex}}ff", + "element.selected": "#{{base02-hex}}ff", + "element.disabled": "#{{base03-hex}}d3", + "ghost_element.background": "#{{base00-hex}}", + "ghost_element.hover": "#{{base01-hex}}ff", + "ghost_element.active": "#{{base02-hex}}ff", + "ghost_element.selected": "#{{base02-hex}}ff", + "ghost_element.disabled": "#{{base03-hex}}d3", + "drop_target.background": "#{{base03-hex}}d3", + "text": "#{{base05-hex}}", + "text.muted": "#{{base04-hex}}", + "text.placeholder": "#{{base03-hex}}", + "text.disabled": "#{{base03-hex}}", + "text.accent": "#{{base0D-hex}}", + "icon": "#{{base05-hex}}", + "icon.muted": "#{{base03-hex}}", + "icon.disabled": "#{{base03-hex}}", + "icon.placeholder": "#{{base03-hex}}", + "icon.accent": "#{{base0D-hex}}", + "status_bar.background": "#{{base00-hex}}d9", + "title_bar.background": "#{{base00-hex}}d9", + "title_bar.inactive_background": "#{{base00-hex}}d9", + "toolbar.background": "#00000000", + "tab_bar.background": "#00000000", + "tab.inactive_background": "#00000000", + "tab.active_background": "#{{base01-hex}}", + "search.match_background": "#{{base02-hex}}", + "panel.background": "#00000000", + "panel.focused_border": null, + "pane.focused_border": "#{{base00-hex}}", + "scrollbar.thumb.background": "#{{base01-hex}}d3", + "scrollbar.thumb.hover_background": "#{{base02-hex}}", + "scrollbar.thumb.border": "#00000000", + "scrollbar.track.background": "#00000000", + "scrollbar.track.border": "#00000000", + "editor.foreground": "#{{base05-hex}}", + "editor.background": "#00000000", + "editor.gutter.background": "#00000000", + "editor.subheader.background": "#{{base00-hex}}", + "editor.active_line.background": "#{{base01-hex}}d9", + "editor.highlighted_line.background": "#{{base02-hex}}", + "editor.line_number": "#{{base03-hex}}", + "editor.active_line_number": "#{{base05-hex}}", + "editor.invisible": "#{{base03-hex}}", + "editor.wrap_guide": "#{{base03-hex}}", + "editor.active_wrap_guide": "#{{base03-hex}}d3", + "editor.document_highlight.read_background": "#{{base02-hex}}d3", + "editor.document_highlight.write_background": "#{{base03-hex}}d3", + "link_text.hover": "#{{base0D-hex}}", + + "conflict": "#{{base0B-hex}}", + "conflict.background": "#{{base0B-hex}}d3", + "conflict.border": "#{{base03-hex}}", + + "created": "#{{base0B-hex}}", + "created.background": "#{{base0B-hex}}d3", + "created.border": "#{{base03-hex}}", + + "deleted": "#{{base08-hex}}", + "deleted.background": "#{{base08-hex}}d3", + "deleted.border": "#{{base03-hex}}", + + "error": "#{{base08-hex}}", + "error.background": "#{{base08-hex}}d3", + "error.border": "#{{base03-hex}}", + + "hidden": "#{{base03-hex}}", + "hidden.background": "#{{base00-hex}}", + "hidden.border": "#{{base03-hex}}", + + "hint": "#{{base0D-hex}}", + "hint.background": "#{{base0D-hex}}d3", + "hint.border": "#{{base03-hex}}", + + "ignored": "#{{base03-hex}}", + "ignored.background": "#{{base00-hex}}", + "ignored.border": "#{{base03-hex}}", + + "info": "#{{base0D-hex}}", + "info.background": "#{{base0D-hex}}d3", + "info.border": "#{{base03-hex}}", + + "modified": "#{{base0A-hex}}", + "modified.background": "#{{base0A-hex}}d3", + "modified.border": "#{{base03-hex}}", + + "predictive": "#{{base0E-hex}}", + "predictive.background": "#{{base0E-hex}}d3", + "predictive.border": "#{{base03-hex}}", + + "renamed": "#{{base0D-hex}}", + "renamed.background": "#{{base0D-hex}}d3", + "renamed.border": "#{{base03-hex}}", + + "success": "#{{base0B-hex}}", + "success.background": "#{{base0B-hex}}d3", + "success.border": "#{{base03-hex}}", + + "unreachable": "#{{base03-hex}}", + "unreachable.background": "#{{base00-hex}}", + "unreachable.border": "#{{base03-hex}}", + + "warning": "#{{base0A-hex}}", + "warning.background": "#{{base0A-hex}}d3", + "warning.border": "#{{base03-hex}}", + + "players": [ + { + "cursor": "#{{base0D-hex}}", + "background": "#{{base0D-hex}}20", + "selection": "#{{base0D-hex}}30" + }, + { + "cursor": "#{{base0E-hex}}", + "background": "#{{base0E-hex}}20", + "selection": "#{{base0E-hex}}30" + }, + { + "cursor": "#{{base0E-hex}}", + "background": "#{{base0E-hex}}20", + "selection": "#{{base0E-hex}}30" + }, + { + "cursor": "#{{base09-hex}}", + "background": "#{{base09-hex}}20", + "selection": "#{{base09-hex}}30" + }, + { + "cursor": "#{{base0B-hex}}", + "background": "#{{base0B-hex}}20", + "selection": "#{{base0B-hex}}30" + }, + { + "cursor": "#{{base08-hex}}", + "background": "#{{base08-hex}}20", + "selection": "#{{base08-hex}}30" + }, + { + "cursor": "#{{base0A-hex}}", + "background": "#{{base0A-hex}}20", + "selection": "#{{base0A-hex}}30" + }, + { + "cursor": "#{{base0B-hex}}", + "background": "#{{base0B-hex}}20", + "selection": "#{{base0B-hex}}30" + } + ], + "syntax": { + "attribute": { + "color": "#{{base0D-hex}}", + "font_style": null, + "font_weight": null + }, + "boolean": { + "color": "#{{base0E-hex}}", + "font_style": null, + "font_weight": null + }, + "comment": { + "color": "#{{base03-hex}}", + "font_style": "italic", + "font_weight": null + }, + "comment.doc": { + "color": "#{{base03-hex}}", + "font_style": "italic", + "font_weight": 700 + }, + "constant": { + "color": "#{{base0E-hex}}", + "font_style": null, + "font_weight": null + }, + "constructor": { + "color": "#{{base0B-hex}}", + "font_style": null, + "font_weight": null + }, + "directive": { + "color": "#{{base0E-hex}}", + "font_style": null, + "font_weight": null + }, + "escape": { + "color": "#{{base0D-hex}}", + "font_style": "italic", + "font_weight": null + }, + "function": { + "color": "#{{base0D-hex}}", + "font_style": "italic", + "font_weight": null + }, + "function.decorator": { + "color": "#{{base0D-hex}}", + "font_style": "italic", + "font_weight": null + }, + "function.magic": { + "color": "#{{base0D-hex}}", + "font_style": "italic", + "font_weight": null + }, + "keyword": { + "color": "#{{base0E-hex}}", + "font_style": "italic", + "font_weight": null + }, + "label": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "local": { + "color": "#{{base08-hex}}", + "font_style": null, + "font_weight": null + }, + "markup": { + "color": "#{{base09-hex}}", + "font_style": null, + "font_weight": null + }, + "meta": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "modifier": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "namespace": { + "color": "#{{base08-hex}}", + "font_style": null, + "font_weight": null + }, + "number": { + "color": "#{{base0A-hex}}", + "font_style": null, + "font_weight": null + }, + "operator": { + "color": "#{{base0E-hex}}", + "font_style": null, + "font_weight": null + }, + "parameter": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "punctuation": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "regexp": { + "color": "#{{base0C-hex}}", + "font_style": null, + "font_weight": null + }, + "self": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": 700 + }, + "string": { + "color": "#{{base0B-hex}}", + "font_style": null, + "font_weight": null + }, + "strong": { + "color": "#{{base0D-hex}}", + "font_style": null, + "font_weight": 700 + }, + "support": { + "color": "#{{base0E-hex}}", + "font_style": null, + "font_weight": null + }, + "symbol": { + "color": "#{{base0A-hex}}", + "font_style": null, + "font_weight": null + }, + "tag": { + "color": "#{{base0D-hex}}", + "font_style": null, + "font_weight": null + }, + "text": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + }, + "type": { + "color": "#{{base0B-hex}}", + "font_style": null, + "font_weight": null + }, + "variable": { + "color": "#{{base05-hex}}", + "font_style": null, + "font_weight": null + } + }, + "terminal.background": "#00000000", + "terminal.foreground": "#{{base05-hex}}ff", + "terminal.ansi.black": "#{{base00-hex}}ff", + "terminal.ansi.red": "#{{base08-hex}}ff", + "terminal.ansi.green": "#{{base0B-hex}}ff", + "terminal.ansi.yellow": "#{{base0A-hex}}ff", + "terminal.ansi.blue": "#{{base0D-hex}}ff", + "terminal.ansi.magenta": "#{{base0E-hex}}ff", + "terminal.ansi.cyan": "#{{base0C-hex}}ff", + "terminal.ansi.white": "#{{base05-hex}}ff", + "terminal.ansi.bright_black": "#{{base03-hex}}ff", + "terminal.ansi.bright_red": "#{{base08-hex}}ff", + "terminal.ansi.bright_green": "#{{base0B-hex}}ff", + "terminal.ansi.bright_yellow": "#{{base0A-hex}}ff", + "terminal.ansi.bright_blue": "#{{base0D-hex}}ff", + "terminal.ansi.bright_magenta": "#{{base0E-hex}}ff", + "terminal.ansi.bright_cyan": "#{{base0C-hex}}ff", + "terminal.ansi.bright_white": "#{{base05-hex}}ff" + } + } + ] +} diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index 6f9c5f0..9fa844c 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -77,6 +77,7 @@ in { }; extensions = with pkgs.vscode-extensions; [ + illixion.vscode-vibrancy-continued tamasfe.even-better-toml vscodevim.vim jnoortheen.nix-ide @@ -143,6 +144,7 @@ in { vim-indent-object vim-commentary vim-surround + transparent-nvim { plugin = vim-airline; config = '' @@ -168,16 +170,7 @@ in { map ; :Files ''; } - ( - pkgs.vimUtils.buildVimPlugin { - pname = "firenvim"; - src = inputs.firenvim; - # yes im stupid - version = builtins.readFile (pkgs.runCommand "firenvim-version" {} '' - ${pkgs.jq}/bin/jq -j .version < ${inputs.firenvim}/package.json > $out - ''); - } - ) + firenvim vim-gitgutter ]; extraConfig = ''