From a0bc0231588382c842b371dabc51efda9041d724 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Wed, 5 Mar 2025 16:20:17 +0200 Subject: [PATCH] Wed Mar 5 14:20:06 EET 2025 --- hosts/dunamis/users/user/programs.nix | 11 +-- hosts/sarien/users/user/programs.nix | 12 +-- modules/home/desktop/hyprland/default.nix | 6 ++ modules/home/programs/editor/zed.nix | 1 + modules/home/programs/shell/fish.nix | 2 + modules/home/programs/shell/nushell.nix | 104 +++++++--------------- 6 files changed, 55 insertions(+), 81 deletions(-) diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index a09dbf0..168aead 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { shell = { fish.enable = true; - nushell.enable = false; + #nushell.enable = true; oh-my-posh.enable = true; }; @@ -50,15 +50,16 @@ }; home.packages = with pkgs; [ - alejandra # nix formatter + alejandra # nix formatter in rust flatpak # flatpak cli - trashy # trash cli + trashy # trash cli in rust + devenv # programming deps in rust procs # ps in rust ouch # archive manager in runt dust # du in rust fend # calc in rust - moar # better pager - tree # tree util + moar # better pager (in go) + just # make in rust rbw # bitwarden cli in rust pinentry-qt # pinentry for rbw vial # qmk keyboard configuring app diff --git a/hosts/sarien/users/user/programs.nix b/hosts/sarien/users/user/programs.nix index 5e99840..168aead 100644 --- a/hosts/sarien/users/user/programs.nix +++ b/hosts/sarien/users/user/programs.nix @@ -1,13 +1,14 @@ {pkgs, ...}: { shell = { fish.enable = true; - nushell.enable = false; + #nushell.enable = true; oh-my-posh.enable = true; }; console.yazi.enable = true; stylix.targets.fzf.enable = false; + services.ssh-agent.enable = true; programs = { bat.enable = true; btop = { @@ -49,15 +50,16 @@ }; home.packages = with pkgs; [ - alejandra # nix formatter + alejandra # nix formatter in rust flatpak # flatpak cli - trashy # trash cli + trashy # trash cli in rust + devenv # programming deps in rust procs # ps in rust ouch # archive manager in runt dust # du in rust fend # calc in rust - moar # better pager - tree # tree util + moar # better pager (in go) + just # make in rust rbw # bitwarden cli in rust pinentry-qt # pinentry for rbw vial # qmk keyboard configuring app diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index 20b71ba..c4b1c87 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -407,6 +407,12 @@ in { "noblur, title:TelegramDesktop" "float, title:TelegramDesktop" "pin, title:TelegramDesktop" + # any chromium-based + "noborder, title:Картинка в картинці" + "keepaspectratio, title:Картинка в картинці" + "noblur, title:Картинка в картинці" + "float, title:Картинка в картинці" + "pin, title:Картинка в картинці" # screenshot editor "noanim, class:com.gabm.satty" "float, class:com.gabm.satty" diff --git a/modules/home/programs/editor/zed.nix b/modules/home/programs/editor/zed.nix index 105cc1b..568e353 100644 --- a/modules/home/programs/editor/zed.nix +++ b/modules/home/programs/editor/zed.nix @@ -18,6 +18,7 @@ in { "nix" "latex" "typst" + "justfile" ]; userSettings = { vim_mode = true; diff --git a/modules/home/programs/shell/fish.nix b/modules/home/programs/shell/fish.nix index 2edfc52..7ec55ec 100644 --- a/modules/home/programs/shell/fish.nix +++ b/modules/home/programs/shell/fish.nix @@ -21,6 +21,8 @@ in { # }; eza.enable = true; zoxide.enable = true; + direnv.enable = true; + nix-your-shell.enable = true; fish = { enable = true; shellAliases = { diff --git a/modules/home/programs/shell/nushell.nix b/modules/home/programs/shell/nushell.nix index 1a26856..da3a8fc 100644 --- a/modules/home/programs/shell/nushell.nix +++ b/modules/home/programs/shell/nushell.nix @@ -1,5 +1,5 @@ { - pkgs, + # pkgs, config, lib, ... @@ -14,97 +14,59 @@ in { config = mkIf cfg.enable { programs = { atuin = { - enable = true; + enable = false; enableNushellIntegration = true; flags = [ "--disable-up-arrow" ]; }; - carapace = { - enable = true; - enableNushellIntegration = true; - }; - zoxide = { - enable = true; - enableNushellIntegration = true; - }; + carapace.enable = true; + zoxide.enable = true; oh-my-posh.enableNushellIntegration = true; - keychain = { - enable = true; - keys = ["id_ed25519"]; - enableNushellIntegration = true; - extraFlags = [ - "--quiet" - "--noask" - ]; - }; nushell = { enable = true; environmentVariables = { - CARAPACE_BRIDGES = "zsh,fish,bash,inshellisense"; + CARAPACE_BRIDGES = "fish"; CARAPACE_MATCH = 1; EDITOR = "hx"; }; shellAliases = { cd = "z"; - cat = "bat"; la = "ls -a"; l = "ls -la"; nix-shell = "nix-shell --command nu"; }; extraConfig = '' - $env.config = { - show_banner: false - shell_integration: { - # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title - osc2: true - # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory - osc7: true - # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8 - osc8: true - # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal - osc9_9: false - # osc133 is several escapes invented by Final Term which include the supported ones below. - # 133;A - Mark prompt start - # 133;B - Mark prompt end - # 133;C - Mark pre-execution - # 133;D;exit - Mark execution finished with exit code - # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is - osc133: true - # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features - # 633;A - Mark prompt start - # 633;B - Mark prompt end - # 633;C - Mark pre-execution - # 633;D;exit - Mark execution finished with exit code - # 633;E - Explicitly set the command line with an optional nonce - # 633;P;Cwd= - Mark the current working directory and communicate it to the terminal - # and also helps with the run recent menu in vscode - osc633: true - # reset_application_mode is escape \x1b[?1l and was added to help ssh work better - reset_application_mode: true - } - - ls: { - use_ls_colors: true - clickable_links: true - } - - rm: { - always_trash: true - } - edit_mode: 'vi' - completions: { - case_sensitive: false - quick: true - partial: true - algorithm: "fuzzy" - external: { - enable: true - # max_results: 100 - # completer: $carapace_completer # check 'carapace_completer' - } + $env.config = { + show_banner: false + shell_integration: { + osc2: true + osc7: true + osc8: true + osc9_9: false + osc133: true + osc633: true + reset_application_mode: true + } + ls: { + use_ls_colors: true + clickable_links: true + } + rm: { + always_trash: true + } + edit_mode: 'vi' + completions: { + case_sensitive: false + quick: true + partial: true + algorithm: "fuzzy" + external: { + enable: true + #max_results: 100 } } + } ''; }; };