diff --git a/desktops/hyprland/alacritty.nix b/desktops/hyprland/alacritty.nix new file mode 100644 index 0000000..f6f4921 --- /dev/null +++ b/desktops/hyprland/alacritty.nix @@ -0,0 +1,14 @@ +{ + enable = true; + settings = { + shell = "fish"; + font = { + family = "JetBrainsMono NerdFont"; + size = 12; + }; + window = { + padding = { x = 16; y = 16; }; + opacity = 0.8; + }; + }; +} diff --git a/desktops/hyprland/foot.nix b/desktops/hyprland/foot.nix deleted file mode 100644 index e90b986..0000000 --- a/desktops/hyprland/foot.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - enable = true; - settings = { - main = { - shell = "fish"; - term = "foot"; - title = "Terminal"; - font = "JetBrainsMono NerdFont:size=12"; - pad = "25x25"; - }; - cursor = { - style = "beam"; - color = "191c1e e1e2e5"; - beam-thickness = 1.5; - }; - colors = { - alpha=0.8; - background = "191c1e"; - foreground = "e1e2e5"; - regular0 = "191c1e"; - regular1 = "ffb4a9"; - regular2 = "00668b"; - regular3 = "c3e7ff"; - regular4 = "c3e7ff"; - regular5 = "d1e5f4"; - regular6 = "79d0ff"; - regular7 = "c0c7cd"; - bright0 = "191c1e"; - bright1 = "ffb4a9"; - bright2 = "00668b"; - bright3 = "c3e7ff"; - bright4 = "c3e7ff"; - bright5 = "d1e5f4"; - bright6 = "79d0ff"; - bright7 = "c0c7cd"; - }; - key-bindings = { - scrollback-up-page = "Page_Up"; - scrollback-down-page = "Page_Down"; - clipboard-copy = "Control+c"; - clipboard-paste = "Control+v"; - search-start = "Control+f"; - }; - }; -} diff --git a/desktops/hyprland/hyprland.nix b/desktops/hyprland/hyprland.nix index 4ed7677..f933ec4 100644 --- a/desktops/hyprland/hyprland.nix +++ b/desktops/hyprland/hyprland.nix @@ -94,9 +94,7 @@ configDir = ./ags; }; programs.fuzzel = import ./fuzzel.nix; - # programs.alacritty.enable = true; - programs.fish.enable = true; - programs.foot = import ./foot.nix; + programs.alacritty = import ./alacritty.nix; programs.wofi = import ./wofi.nix; programs.swaylock = import ./swaylock.nix; diff --git a/desktops/hyprland/keybinds.nix b/desktops/hyprland/keybinds.nix index 4a95377..523bfb2 100644 --- a/desktops/hyprland/keybinds.nix +++ b/desktops/hyprland/keybinds.nix @@ -1,6 +1,6 @@ [ "SUPER,Q,killactive" - "SUPER,T,exec,foot" + "SUPER,T,exec,alacritty" "SUPER_SHIFT,C,exec,hyprpicker" "SUPER_SHIFT,S,exec,slurp | grim -g - - | wl-copy" "SUPER,P,pseudo," diff --git a/programs.nix b/programs.nix index 60b51b0..4578f9e 100644 --- a/programs.nix +++ b/programs.nix @@ -1,40 +1,19 @@ { pkgs }: { home-manager.enable = true; - zsh = import ./programs/zsh.nix { inherit pkgs; }; rbw = import ./programs/bitwarden.nix; git = import ./programs/git.nix; + lazygit.enable = true; nixvim = import ./programs/nixvim.nix { inherit pkgs; }; - - nushell = { + fish = { enable = true; - extraConfig = '' - let carapace_completer = { |spans| - carapace $spans.0 nushell $spans | from json - } - - $env.config = { - show_banner: false, - completions: { - case_sensitive: false - quick: true - partial: true - algorithm: "fuzzy" - external: { - enable: true - max_results: 100 - completer: $carapace_completer - } - } - } - - $env.PATH = ($env.PATH | split row (char esep) | append /usr/bin/env) - $env.EDITOR = nvim + interactiveShellInit = '' + set fish_greeting ''; }; - - carapace = { + oh-my-posh = { enable = true; - enableNushellIntegration = true; + useTheme = "pararussel"; + enableFishIntegration = true; }; }