diff --git a/hosts/katana.nix b/hosts/katana.nix index 8cb3981..4083813 100644 --- a/hosts/katana.nix +++ b/hosts/katana.nix @@ -95,6 +95,9 @@ nixpkgs = { config = { allowUnfree = true; + permittedInsecurePackages = [ + "electron-25.9.0" + ]; }; hostPlatform = lib.mkDefault "x86_64-linux"; }; @@ -122,6 +125,7 @@ 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 e6e3abc..a75c369 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -2,7 +2,6 @@ { imports = [ ./alacritty.nix - ./rio.nix ./direnv.nix ./git.nix ./ncspot.nix @@ -23,8 +22,7 @@ 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 = { @@ -46,10 +44,6 @@ 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 deleted file mode 100644 index adc05b2..0000000 --- a/modules/home-manager/rio.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ 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 a2c9233..ab47217 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -1,37 +1,26 @@ -{ 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 = "nvim"; - }; - - # This adds the atuin init line to your Zsh config - initContent = '' - eval "$(atuin init 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"; + }; }; }; } -