diff --git a/home/programs/kitty.nix b/home/programs/kitty.nix index 33ac942..bb76200 100644 --- a/home/programs/kitty.nix +++ b/home/programs/kitty.nix @@ -1,12 +1,12 @@ -{ +{ lib, ... }: { programs.kitty = { enable = true; font = { - name = "FiraCode Nerd Font"; + name = lib.mkForce "FiraCode Nerd Font"; size = 12; }; - themeFile = "Rose Pine"; + themeFile = "rose-pine"; settings = { confirm_os_window_close = 0; diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 6f18472..8f08bb1 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -4,7 +4,7 @@ }: { programs.neovim = { enable = true; - package = pkgs.neovim; + # package = pkgs.neovim; viAlias = true; vimAlias = true; diff --git a/home/programs/shell.nix b/home/programs/shell.nix index adf8139..6cc8888 100644 --- a/home/programs/shell.nix +++ b/home/programs/shell.nix @@ -56,7 +56,9 @@ in # } # ]; - enableAutosuggestions = true; + autosuggestion = { + enable = true; + }; syntaxHighlighting = { enable = true; @@ -67,12 +69,7 @@ in }; initExtra = '' - # [[ ! -f ${./p10k.zsh} ]] || source ${./p10k.zsh} eval "$(zoxide init --cmd cd zsh)" - # if [ -x "$(command -v tmux)" ] && [ -n "$DISPLAY" ] && [ -z "$TMUX" ]; then - # exec tmux new-session -A -s $USER >/dev/null 2>&1 - # exec tmux new-session -t $USER >/dev/null 2>&1 | tmux new-session -A -s $USER >/dev/null 2>&1 - # fi ''; }; }; diff --git a/home/programs/vscodium.nix b/home/programs/vscodium.nix index 021a6a2..efed0aa 100644 --- a/home/programs/vscodium.nix +++ b/home/programs/vscodium.nix @@ -1,19 +1,25 @@ { pkgs, ... }: { programs.vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.vscodium-fhs; extensions = with pkgs.vscode-extensions; [ ms-python.python ms-python.debugpy jnoortheen.nix-ide mvllow.rose-pine + github.copilot + github.copilot-chat + ms-vsliveshare.vsliveshare + rust-lang.rust-analyzer ]; userSettings = { - "editor.fontSize" = 18; + "editor.fontSize" = 16; + "editor.fontFamily" = "FiraCode Nerd Font"; "explorer.confirmDelete" = false; + "disable-hardware-acceleration" = true; "explorer.confirmDragAndDrop" = true; "git.openRepositoryInParentFolders" = "never"; @@ -47,7 +53,7 @@ "editor.formatOnPaste" = true; "editor.minimap.enabled" = false; - "symbols.hidesExplorerArrows" = false; + # "symbols.hidesExplorerArrows" = false; "workbench.iconTheme" = "rose-pine-icons"; "workbench.colorTheme" = "Rosé Pine"; diff --git a/home/system/hyprland.nix b/home/system/hyprland.nix index d141fb7..a0f726f 100644 --- a/home/system/hyprland.nix +++ b/home/system/hyprland.nix @@ -353,6 +353,8 @@ # SSH Agents env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket + env = NIXOS_OZONE_WL,1 + ##################### ### LOOK AND FEEL ### #####################