diff --git a/profiles/applications/helix.nix b/profiles/applications/helix.nix index 87ee8fe..0dece03 100644 --- a/profiles/applications/helix.nix +++ b/profiles/applications/helix.nix @@ -39,9 +39,6 @@ [[language]] name = "nix" formatter = { command = "nixfmt", args = [] } - [[language]] - name = "markdown" - language-server = { command = "vscode-markdown-language-server", args = ["--stdio"] } ''; programs.helix = { enable = true; @@ -171,10 +168,7 @@ "diff.plus" = base0B; "diff.delta" = base0A; "diff.minus" = base08; - "diagnostic" = { - modifiers = [ "italic" ]; - underline = { style = "line"; }; - }; + "diagnostic" = { underline = { style = "line"; }; }; "diagnostic.error" = { fg = base08; } // diagnostic; "diagnostic.warning" = { fg = base09; } // diagnostic; "ui.gutter" = { bg = base00; }; diff --git a/profiles/applications/okular.nix b/profiles/applications/okular.nix index 83f308d..c59f5e0 100644 --- a/profiles/applications/okular.nix +++ b/profiles/applications/okular.nix @@ -1,19 +1,22 @@ { pkgs, lib, config, ... }: -with import ../../support.nix { inherit lib config; }; { - home-manager.users.balsoft.xdg.configFile."okularpartrc".text = genIni { - "Dlg Accessibility" = { - RecolorBackground = thmDec.base00; - RecolorForeground = thmDec.base05; - }; - "Document" = { - ChangeColors = true; - PaperColor = thmDec.base00; - RenderMode = "Recolor"; - }; - "Main View" = { ShowLeftPanel = false; }; - PageView = { - BackgroundColor = thmDec.base00; - UseCustomBackgroundColor = true; +with (pkgs.my-lib.thmDec config.themes.colors); { + home-manager.users.balsoft = { + home.packages = [ pkgs.okular ]; + xdg.configFile."okularpartrc".text = pkgs.my-lib.genIni { + "Dlg Accessibility" = { + RecolorBackground = base00; + RecolorForeground = base05; + }; + "Document" = { + ChangeColors = true; + PaperColor = base00; + RenderMode = "Recolor"; + }; + "Main View" = { ShowLeftPanel = false; }; + PageView = { + BackgroundColor = base00; + UseCustomBackgroundColor = true; + }; }; }; } diff --git a/profiles/workspace/kde/qt.nix b/profiles/workspace/kde/qt.nix index 3e633a6..5a2ff63 100644 --- a/profiles/workspace/kde/qt.nix +++ b/profiles/workspace/kde/qt.nix @@ -34,114 +34,124 @@ with pkgs.my-lib; { in { home.packages = [ pkgs.ark pkgs.dolphin ]; - xdg.configFile."kdeglobals".text = with (thmDec config.themes.colors); lib.generators.toGitINI { - "Colors:Button" = { - BackgroundAlternate = base01; - BackgroundNormal = base01; - DecorationFocus = base02; - DecorationHover = base02; - ForegroundActive = base05; - ForegroundInactive = base01; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base09; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base03; + xdg.configFile."kdeglobals".text = with (thmDec config.themes.colors); + lib.generators.toGitINI { + "Colors:Button" = { + BackgroundAlternate = base01; + BackgroundNormal = base01; + DecorationFocus = base02; + DecorationHover = base02; + ForegroundActive = base05; + ForegroundInactive = base01; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base09; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base03; + }; + "Colors:Complementary" = { + BackgroundAlternate = base01; + BackgroundNormal = base03; + DecorationFocus = base02; + DecorationHover = base02; + ForegroundActive = base09; + ForegroundInactive = base01; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base0A; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base02; + }; + "Colors:Selection" = { + BackgroundAlternate = base0D; + BackgroundNormal = base0D; + DecorationFocus = base0D; + DecorationHover = base0D; + ForegroundActive = base05; + ForegroundInactive = base05; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base09; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base02; + }; + "Colors:Tooltip" = { + BackgroundAlternate = base01; + BackgroundNormal = base00; + DecorationFocus = base02; + DecorationHover = base02; + ForegroundActive = base02; + ForegroundInactive = base01; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base09; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base03; + }; + "Colors:View" = { + BackgroundAlternate = base01; + BackgroundNormal = base00; + DecorationFocus = base02; + DecorationHover = base02; + ForegroundActive = base02; + ForegroundInactive = base01; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base09; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base03; + }; + "Colors:Window" = { + BackgroundAlternate = base01; + BackgroundNormal = base00; + DecorationFocus = base02; + DecorationHover = base02; + ForegroundActive = base02; + ForegroundInactive = base01; + ForegroundLink = base0D; + ForegroundNegative = base08; + ForegroundNeutral = base09; + ForegroundNormal = base05; + ForegroundPositive = base0B; + ForegroundVisited = base03; + }; + General = { + ColorScheme = "Generated"; + Name = "Generated"; + fixed = "${fonts.mono.family},${ + toString fonts.mono.size + },-1,5,50,0,0,0,0,0"; + font = "${fonts.main.family},${ + toString fonts.main.size + },-1,5,50,0,0,0,0,0"; + menuFont = "${fonts.main.family},${ + toString fonts.main.size + },-1,5,50,0,0,0,0,0"; + shadeSortColumn = true; + smallestReadableFont = "${fonts.main.family},${ + toString fonts.main.size + },-1,5,57,0,0,0,0,0,Medium"; + toolBarFont = "${fonts.main.family},${ + toString fonts.main.size + },-1,5,50,0,0,0,0,0"; + TerminalApplication = "alacritty"; + }; + KDE = { + DoubleClickInterval = 400; + ShowDeleteCommand = true; + SingleClick = false; + StartDragDist = 4; + StartDragTime = 500; + WheelScrollLines = 3; + contrast = 4; + widgetStyle = "Breeze"; + }; + Icons = { Theme = "Papirus-Dark"; }; }; - "Colors:Complementary" = { - BackgroundAlternate = base01; - BackgroundNormal = base03; - DecorationFocus = base02; - DecorationHover = base02; - ForegroundActive = base09; - ForegroundInactive = base01; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base0A; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base02; - }; - "Colors:Selection" = { - BackgroundAlternate = base0D; - BackgroundNormal = base0D; - DecorationFocus = base0D; - DecorationHover = base0D; - ForegroundActive = base05; - ForegroundInactive = base05; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base09; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base02; - }; - "Colors:Tooltip" = { - BackgroundAlternate = base01; - BackgroundNormal = base00; - DecorationFocus = base02; - DecorationHover = base02; - ForegroundActive = base02; - ForegroundInactive = base01; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base09; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base03; - }; - "Colors:View" = { - BackgroundAlternate = base01; - BackgroundNormal = base00; - DecorationFocus = base02; - DecorationHover = base02; - ForegroundActive = base02; - ForegroundInactive = base01; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base09; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base03; - }; - "Colors:Window" = { - BackgroundAlternate = base01; - BackgroundNormal = base00; - DecorationFocus = base02; - DecorationHover = base02; - ForegroundActive = base02; - ForegroundInactive = base01; - ForegroundLink = base0D; - ForegroundNegative = base08; - ForegroundNeutral = base09; - ForegroundNormal = base05; - ForegroundPositive = base0B; - ForegroundVisited = base03; - }; - General = { - ColorScheme = "Generated"; - Name = "Generated"; - fixed = "${fonts.mono.family},${toString fonts.mono.size},-1,5,50,0,0,0,0,0"; - font = "${fonts.main.family},${toString fonts.main.size},-1,5,50,0,0,0,0,0"; - menuFont = "${fonts.main.family},${toString fonts.main.size},-1,5,50,0,0,0,0,0"; - shadeSortColumn = true; - smallestReadableFont = - "${fonts.main.family},${toString fonts.main.size},-1,5,57,0,0,0,0,0,Medium"; - toolBarFont = "${fonts.main.family},${toString fonts.main.size},-1,5,50,0,0,0,0,0"; - TerminalApplication = "alacritty"; - }; - KDE = { - DoubleClickInterval = 400; - ShowDeleteCommand = true; - SingleClick = false; - StartDragDist = 4; - StartDragTime = 500; - WheelScrollLines = 3; - contrast = 4; - widgetStyle = "Breeze"; - }; - Icons = { Theme = "Papirus-Dark"; }; - }; }; } diff --git a/roles/desktop.nix b/roles/desktop.nix index 3024546..5411b1a 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -28,6 +28,7 @@ himalaya nheko packages + okular copyq cursor