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 a75c369..e6e3abc 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 = false; + # Home Manager needs a bit of information about you and the paths it should # manage. home = { @@ -44,6 +46,10 @@ bitwarden gimp vlc + atuin + #rio + #imgcat + # # 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; + }; + }; +} diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index ab47217..a2c9233 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 + initContent = '' + eval "$(atuin init zsh)" + ''; }; }; } +