From ba45da3b8a7c176262f0961f5035ea56af16953e Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Sun, 23 Mar 2025 17:05:45 +0100 Subject: [PATCH] stashing --- modules/home/desktop/plasma.nix | 20 ++++++++----- modules/home/desktop/terminal/ghostty.nix | 4 +-- modules/home/shell/toolset/starship.nix | 35 +++++++++-------------- modules/home/themes/default.nix | 19 ++++++------ 4 files changed, 36 insertions(+), 42 deletions(-) diff --git a/modules/home/desktop/plasma.nix b/modules/home/desktop/plasma.nix index 07a8233..8c4eb24 100644 --- a/modules/home/desktop/plasma.nix +++ b/modules/home/desktop/plasma.nix @@ -57,8 +57,14 @@ in immutableByDefault = true; windows.allowWindowsToRememberPositions = true; + session = { + general.askForConfirmationOnLogout = false; + sessionRestore.restoreOpenApplicationsOnLogin = "onLastLogout"; + }; + workspace = { - colorScheme = "CatppuccinMocha"; + clickItemTo = "select"; + colorScheme = "EverforestDark"; wallpaper = config.stylix.image; }; @@ -89,8 +95,8 @@ in location = "bottom"; floating = true; lengthMode = "fill"; - height = 32; - hiding = "dodgewindows"; + height = 42; + hiding = "none"; screen = "all"; widgets = [ { @@ -135,10 +141,10 @@ in }; behavior = { grouping = { - clickAction = "showPresentWindowsEffect"; - method = "byProgramName"; + clickAction = "showPresentWindowsEffect"; + method = "byProgramName"; }; - minimizeActiveTaskOnClick = true; + minimizeActiveTaskOnClick = true; newTasksAppearOn = "right"; showTasks = { onlyInCurrentActivity = true; @@ -154,7 +160,7 @@ in }; }; launchers = [ - "applications:org.kde.dolphin.desktop" + "preferred://filemanager" "preferred://browser" "preferred://terminal" "preferred://editor" diff --git a/modules/home/desktop/terminal/ghostty.nix b/modules/home/desktop/terminal/ghostty.nix index b23a233..7c2eb29 100644 --- a/modules/home/desktop/terminal/ghostty.nix +++ b/modules/home/desktop/terminal/ghostty.nix @@ -25,8 +25,8 @@ in { enable = true; settings = { background-blur-radius = 20; - # theme = "dark:stylix,light:stylix"; - # window-theme = config.stylix.polarity; + theme = "dark:stylix,light:stylix"; + window-theme = (config.modules.${user}.themes.polarity or "dark"); background-opacity = 0.8; minimum-contrast = 1.1; }; diff --git a/modules/home/shell/toolset/starship.nix b/modules/home/shell/toolset/starship.nix index 6b86fc1..3fdf7db 100644 --- a/modules/home/shell/toolset/starship.nix +++ b/modules/home/shell/toolset/starship.nix @@ -11,24 +11,15 @@ in config = mkIf config.modules.${user}.shell.toolset.starship.enable { home-manager.users.${user}.programs.starship = { enable = true; - settings = let - # inherit (config.lib.stylix.colors) cyan red magenta yellow green blue; - - cyan = "#00ffff"; - red = "#ff0000"; - magenta = "#ff00ff"; - yellow = "#ffff00"; - green = "#00ff00"; - blue = "#0000ff"; - in { + settings = { scan_timeout = 10; add_newline = true; line_break.disabled = true; format = "$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character"; username = { - style_user = "${cyan} bold"; - style_root = "${red} bold"; + style_user = "cyan bold"; + style_root = "red bold"; format = "[$user]($style) "; disabled = false; show_always = true; @@ -37,7 +28,7 @@ in hostname = { ssh_only = false; ssh_symbol = "🌐 "; - format = "on [$hostname](bold ${red}) "; + format = "on [$hostname](bold red) "; trim_at = ".local"; disabled = false; }; @@ -45,28 +36,28 @@ in nix_shell = { symbol = " "; format = "[$symbol$name]($style) "; - style = "${magenta} bold"; + style = "magenta bold"; }; git_branch = { only_attached = true; format = "[$symbol$branch]($style) "; symbol = "שׂ"; - style = "${yellow} bold"; + style = "yellow bold"; }; git_commit = { only_detached = true; format = "[ﰖ$hash]($style) "; - style = "${yellow} bold"; + style = "yellow bold"; }; git_state = { - style = "${magenta} bold"; + style = "magenta bold"; }; git_status = { - style = "${green} bold"; + style = "green bold"; }; directory = { @@ -76,16 +67,16 @@ in cmd_duration = { format = "[$duration]($style) "; - style = "${blue}"; + style = "blue"; }; jobs = { - style = "${green} bold"; + style = "green bold"; }; character = { - success_symbol = "[\\$](${green}} bold)"; - error_symbol = "[\\$](${red} bold)"; + success_symbol = "[\\$](green bold)"; + error_symbol = "[\\$](red bold)"; }; }; }; diff --git a/modules/home/themes/default.nix b/modules/home/themes/default.nix index 21130c7..e02d31e 100644 --- a/modules/home/themes/default.nix +++ b/modules/home/themes/default.nix @@ -27,21 +27,18 @@ in { config = mkIf (cfg.enable) { modules.theming.enable = true; - environment.sessionVariables = { QT_QPA_PLATFORMTHEME = "kde"; }; + environment.sessionVariables = { QT_QPA_PLATFORMTHEME = "kde6"; }; home-manager.users.${user} = { xdg.configFile."menus/applications.menu".source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; qt = { enable = true; - platformTheme.package = with pkgs.kdePackages; [ - plasma-integration - systemsettings - ]; - style = { - package = pkgs.kdePackages.breeze; - name = mkDefault "Breeze"; - }; + platformTheme = "kde6"; + # style = { + # package = pkgs.kdePackages.breeze; + # name = mkDefault "Breeze"; + # }; }; }; @@ -65,8 +62,8 @@ in { }; monospace = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans Mono"; + package = pkgs.nerd-fonts.jetbrains-mono; + name = "JetBrainsMono Nerd Font Mono"; }; emoji = {