patching migration

This commit is contained in:
2024-11-06 21:51:22 +01:00
parent 46dcd0753e
commit 91d567d5a5
5 changed files with 18 additions and 13 deletions

View File

@@ -1,12 +1,12 @@
{ { lib, ... }: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = { font = {
name = "FiraCode Nerd Font"; name = lib.mkForce "FiraCode Nerd Font";
size = 12; size = 12;
}; };
themeFile = "Rose Pine"; themeFile = "rose-pine";
settings = { settings = {
confirm_os_window_close = 0; confirm_os_window_close = 0;

View File

@@ -4,7 +4,7 @@
}: { }: {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.neovim; # package = pkgs.neovim;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;

View File

@@ -56,7 +56,9 @@ in
# } # }
# ]; # ];
enableAutosuggestions = true; autosuggestion = {
enable = true;
};
syntaxHighlighting = { syntaxHighlighting = {
enable = true; enable = true;
@@ -67,12 +69,7 @@ in
}; };
initExtra = '' initExtra = ''
# [[ ! -f ${./p10k.zsh} ]] || source ${./p10k.zsh}
eval "$(zoxide init --cmd cd 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
''; '';
}; };
}; };

View File

@@ -1,19 +1,25 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium-fhs;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy
jnoortheen.nix-ide jnoortheen.nix-ide
mvllow.rose-pine mvllow.rose-pine
github.copilot
github.copilot-chat
ms-vsliveshare.vsliveshare
rust-lang.rust-analyzer
]; ];
userSettings = { userSettings = {
"editor.fontSize" = 18; "editor.fontSize" = 16;
"editor.fontFamily" = "FiraCode Nerd Font";
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;
"disable-hardware-acceleration" = true;
"explorer.confirmDragAndDrop" = true; "explorer.confirmDragAndDrop" = true;
"git.openRepositoryInParentFolders" = "never"; "git.openRepositoryInParentFolders" = "never";
@@ -47,7 +53,7 @@
"editor.formatOnPaste" = true; "editor.formatOnPaste" = true;
"editor.minimap.enabled" = false; "editor.minimap.enabled" = false;
"symbols.hidesExplorerArrows" = false; # "symbols.hidesExplorerArrows" = false;
"workbench.iconTheme" = "rose-pine-icons"; "workbench.iconTheme" = "rose-pine-icons";
"workbench.colorTheme" = "Rosé Pine"; "workbench.colorTheme" = "Rosé Pine";

View File

@@ -353,6 +353,8 @@
# SSH Agents # SSH Agents
env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket
env = NIXOS_OZONE_WL,1
##################### #####################
### LOOK AND FEEL ### ### LOOK AND FEEL ###
##################### #####################