From c34c97d13c321903693f8b564af4d0fe5e98234d Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 30 Jun 2025 17:11:02 -0400 Subject: [PATCH] nushell play and some other tweaks --- flake.lock | 12 ++++++------ modules/home/shell-conf.nix | 2 +- modules/home/shell-conf/nushell/nushell.nix | 15 ++++++++++++--- modules/home/shell-conf/starship/starship.toml | 2 +- modules/home/sway-idle-lock.nix | 3 +-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 9460c91..6355e84 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1751274822, - "narHash": "sha256-N5Kl10TFWL7mWZWR/SYiYA3+bnH2HfuB/qCFGco2HOo=", + "lastModified": 1751303444, + "narHash": "sha256-sK8xfBTztSyqWgbxzGj86ug3vSee8A61l0iwsgoNMH4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e06201e3703da9d83c608ad31c5bb44ad0753b6", + "rev": "4a0db65ba7e8499456cacec817196eaae4cd518d", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1751296747, - "narHash": "sha256-/nHOfmB0C972nYX0xVF0zWmbt8ooA9TCczfeKHNvwqI=", + "lastModified": 1751309344, + "narHash": "sha256-zmb01yyOXttyhJD3kRtW6Pkt1lsPbJvN3P92/GnI0tk=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f21ed5182a158d2f84e9136f6bf8539fd9a6890", + "rev": "78fc50f1cf8e57a974ff4bfe654563fce43d6289", "type": "github" }, "original": { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index b0fe4ae..a38a59e 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -95,7 +95,7 @@ bash-env-json bash-env-nushell nufmt - + vivid ]; programs = { diff --git a/modules/home/shell-conf/nushell/nushell.nix b/modules/home/shell-conf/nushell/nushell.nix index 1a22af6..77ed4d8 100644 --- a/modules/home/shell-conf/nushell/nushell.nix +++ b/modules/home/shell-conf/nushell/nushell.nix @@ -11,8 +11,9 @@ "rm" = "gtrash put"; "lg" = "lazygit"; "cat" = "bat --plain"; + "y" = "wezterm --config-file ~/.config/wezterm/launcher.lua start --always-new-process --cwd (pwd) yazi &"; }; - configFile.source = ./config.nu; + # configFile.source = ./config.nu; loginFile.text = '' ${pkgs.figlet}/bin/figlet -f ($env.HOME)/.local/share/flf/wavy.flf (hostname) ''; @@ -25,6 +26,12 @@ settings = { show_banner = false; ls = { clickable_links = true; }; + table = { + mode = "none"; + }; + color_config = { + hints = "#666666"; + }; completions = { case_sensitive = false; quick = true; @@ -59,8 +66,10 @@ } else { $completions } - } + } + + $env.LS_COLORS = (vivid generate one-dark) ''; - # plugins = [ pkgs.nushellPlugins.skim ]; + plugins = [ pkgs.nushellPlugins.skim ]; }; } diff --git a/modules/home/shell-conf/starship/starship.toml b/modules/home/shell-conf/starship/starship.toml index 7370990..9e6b44e 100644 --- a/modules/home/shell-conf/starship/starship.toml +++ b/modules/home/shell-conf/starship/starship.toml @@ -26,7 +26,7 @@ home_symbol = "~" use_os_path_sep = true [cmd_duration] -style = '#444444' +style = '#666666' format = '([\($duration\)]($style))' [aws] diff --git a/modules/home/sway-idle-lock.nix b/modules/home/sway-idle-lock.nix index bf4b5d2..d9a34b5 100644 --- a/modules/home/sway-idle-lock.nix +++ b/modules/home/sway-idle-lock.nix @@ -11,8 +11,7 @@ } { event = "before-sleep"; - command = "${pkgs.systemd}/bin/loginctl lock-session"; - + command = "/home/emenel/.local/bin/session-lock"; } { event = "after-resume";