From a911a95162e563b7b61e81b69d1caa8dcbbda96e Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Wed, 25 Jun 2025 01:20:19 -0400 Subject: [PATCH 1/5] added atuin --- modules/home-manager/home.nix | 1 + modules/home-manager/zsh.nix | 49 +++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index a75c369..62408ce 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -44,6 +44,7 @@ bitwarden gimp vlc + atuin # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index ab47217..b460940 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -1,26 +1,37 @@ -{ pkgs, config, lib, ...}: +{ pkgs, config, lib, ... }: { options.speccon18.hm.zsh.enable = lib.mkEnableOption "enables specs zsh config"; + config = lib.mkIf config.speccon18.hm.zsh.enable { programs.zsh = { - enable = lib.mkDefault true; - dotDir = ".config/zsh"; - history = { - path = "$ZDOTDIR/.zsh_history"; - save = 10000000; - }; - autosuggestion.enable = lib.mkDefault true; - enableCompletion = lib.mkDefault true; - syntaxHighlighting.enable = lib.mkDefault true; - shellAliases = { - ls = "eza -l"; - lsa = "eza -al"; - grep = "rg"; - osrb = "sudo nixos-rebuild $1 --flake ~/code/nixos-config/#katana"; - }; - localVariables = { - EDITOR="hx"; - }; + enable = lib.mkDefault true; + dotDir = ".config/zsh"; + + history = { + path = "$ZDOTDIR/.zsh_history"; + save = 10000000; + }; + + autosuggestion.enable = lib.mkDefault true; + enableCompletion = lib.mkDefault true; + syntaxHighlighting.enable = lib.mkDefault true; + + shellAliases = { + ls = "eza -l"; + lsa = "eza -al"; + grep = "rg"; + osrb = "sudo nixos-rebuild $1 --flake ~/code/nixos-config/#katana"; + }; + + localVariables = { + EDITOR = "nvim"; + }; + + # This adds the atuin init line to your Zsh config + initExtra = '' + eval "$(atuin init zsh)" + ''; }; }; } + From 76ce0b002feb04446861aa4130a1d94b76f9b773 Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Wed, 25 Jun 2025 02:58:42 -0400 Subject: [PATCH 2/5] added rio terminal --- modules/home-manager/home.nix | 6 +++++- modules/home-manager/rio.nix | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 modules/home-manager/rio.nix diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 62408ce..5bc5900 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -2,6 +2,7 @@ { imports = [ ./alacritty.nix + ./rio.nix ./direnv.nix ./git.nix ./ncspot.nix @@ -22,7 +23,8 @@ speccon18.hm.zellij.enable = false; speccon18.hm.zoxide.enable = false; speccon18.hm.zsh.enable = true; - + speccon18.hm.rio.enable = true; + # Home Manager needs a bit of information about you and the paths it should # manage. home = { @@ -45,6 +47,8 @@ gimp vlc atuin + rio + # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello diff --git a/modules/home-manager/rio.nix b/modules/home-manager/rio.nix new file mode 100644 index 0000000..adc05b2 --- /dev/null +++ b/modules/home-manager/rio.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs,... }: + +{ + options.speccon18.hm.rio.enable = lib.mkEnableOption "Enable Rio Term"; + config = lib.mkIf config.speccon18.hm.rio.enable { + programs.rio= { + enable = true; + }; + }; +} From 326fcd20118e4969765e54c65d11a1efd4587443 Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Wed, 25 Jun 2025 03:01:05 -0400 Subject: [PATCH 3/5] disabled alacritty --- modules/home-manager/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 5bc5900..4b4e375 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -13,7 +13,7 @@ ./zoxide.nix ./zsh.nix ]; - speccon18.hm.alacritty.enable = true; + speccon18.hm.alacritty.enable = false; speccon18.hm.direnv.enable = true; speccon18.hm.git.enable = true; speccon18.hm.ncspot.enable = false; From 25112eeb707be7a29bc78308b99597fbe1c48f2e Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Wed, 25 Jun 2025 15:41:33 -0400 Subject: [PATCH 4/5] removed htop and unused insecure package allowence --- hosts/katana.nix | 4 ---- modules/home-manager/home.nix | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hosts/katana.nix b/hosts/katana.nix index 4083813..8cb3981 100644 --- a/hosts/katana.nix +++ b/hosts/katana.nix @@ -95,9 +95,6 @@ nixpkgs = { config = { allowUnfree = true; - permittedInsecurePackages = [ - "electron-25.9.0" - ]; }; hostPlatform = lib.mkDefault "x86_64-linux"; }; @@ -125,7 +122,6 @@ openssl tree eza - htop zsh dig #dns lookup rage #file encryption diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 4b4e375..3314f55 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -48,6 +48,7 @@ vlc atuin rio + imgcat # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. From 28526185e44f28dd8847d0876d1af316601ebc22 Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Wed, 25 Jun 2025 16:52:00 -0400 Subject: [PATCH 5/5] disabled rio enabled alacritty fixed initExtra deprication in zsh hm config --- modules/home-manager/home.nix | 8 ++++---- modules/home-manager/zsh.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 3314f55..e6e3abc 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -13,7 +13,7 @@ ./zoxide.nix ./zsh.nix ]; - speccon18.hm.alacritty.enable = false; + speccon18.hm.alacritty.enable = true; speccon18.hm.direnv.enable = true; speccon18.hm.git.enable = true; speccon18.hm.ncspot.enable = false; @@ -23,7 +23,7 @@ speccon18.hm.zellij.enable = false; speccon18.hm.zoxide.enable = false; speccon18.hm.zsh.enable = true; - speccon18.hm.rio.enable = true; + speccon18.hm.rio.enable = false; # Home Manager needs a bit of information about you and the paths it should # manage. @@ -47,8 +47,8 @@ gimp vlc atuin - rio - imgcat + #rio + #imgcat # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index b460940..a2c9233 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -28,7 +28,7 @@ }; # This adds the atuin init line to your Zsh config - initExtra = '' + initContent = '' eval "$(atuin init zsh)" ''; };