Added VSCode back, additional small changes

This commit is contained in:
2025-09-18 09:35:45 -04:00
parent fec0c2a09f
commit 90a3875a90
7 changed files with 101 additions and 19 deletions

View File

@@ -8,7 +8,7 @@
./nvf.nix
./packages.nix
./plasma.nix
# ./vscode.nix
./vscode.nix
./zsh.nix
];
}

View File

@@ -20,6 +20,12 @@
wrap = false;
};
clipboard = {
enable = true;
providers.wl-copy.enable = true;
registers = "unnamedplus";
};
lsp = {
enable = true;
formatOnSave = true;
@@ -43,6 +49,9 @@
# File explorer
filetree.neo-tree = {
enable = true;
setupOpts = {
git_status_async = true;
};
};
# Formatting files
@@ -58,11 +67,48 @@
};
keymaps = [
{
key = "<A-e>";
mode = [ "n" ];
silent = true;
action = "<cmd>Neotree focus<CR>";
}
{
key = "<C-e>";
mode = [ "n" ];
silent = true;
action = "<cmd>Neotree toggle<CR>";
action = "<cmd>Neotree close<CR>";
}
{
key = "<C-s>";
mode = [
"n"
"i"
"v"
];
action = "<cmd>w<CR>";
}
# Window Navigation
{
key = "<C-w>LEFT";
mode = "";
action = "<C-w>h";
}
{
key = "<C-w>DOWN";
mode = "";
action = "<C-w>j";
}
{
key = "<C-w>UP";
mode = "";
action = "<C-w>k";
}
{
key = "<C-w>RIGHT";
mode = "";
action = "<C-w>l";
}
];
@@ -114,10 +160,41 @@
};
treesitter.enable = true;
};
markdown = {
enable = true;
extensions = {
markview-nvim.enable = true;
};
format = {
enable = true;
};
lsp = {
enable = true;
};
treesitter = {
enable = true;
};
};
html = {
enable = true;
treesitter = {
enable = true;
autotagHtml = true;
};
};
};
utility = {
sleuth.enable = true;
multicursors.enable = true;
preview = {
markdownPreview = {
enable = true;
autoClose = true;
};
};
};
};
};

View File

@@ -21,5 +21,6 @@
# CD Stuff
picard
heybrochecklog
rsgain
];
}

View File

@@ -1,11 +1,7 @@
{
pkgs,
# pkgs-stable,
...
}:
# let
# ms-python-stable = pkgs-stable.vscode-extensions.ms-python;
# in
{
programs.vscode = {
enable = true;
@@ -21,19 +17,21 @@
aaron-bond.better-comments
yzane.markdown-pdf
# Remote development
ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh-edit
ms-vscode.remote-explorer
# Nix
bbenoist.nix
jnoortheen.nix-ide
# Python
# ms-python-stable.python
# ms-python-stable.vscode-pylance
# ms-python-stable.debugpy
# ms-python-stable.black-formatter
# ms-python-stable.isort
# ms-python.python # Currently broken, need to manually install
# ms-python.black-formatter
# ms-python.isort
ms-python.python
ms-python.vscode-pylance
ms-python.debugpy
ms-python.black-formatter
ms-python.isort
# Rust
rust-lang.rust-analyzer
@@ -55,7 +53,10 @@
"source.organizeImports" = "explicit";
};
};
"isort.args" = [ "--profile" "black" ];
"isort.args" = [
"--profile"
"black"
];
"python.analysis.typeCheckingMode" = "strict";
"python.languageServer" = "Pylance";
};

View File

@@ -23,7 +23,8 @@ in
"credentials=${config.age.secrets.eclypsecloud-eclypse.path}"
"uid=${toString config.users.users.eclypse.uid}"
"rw"
] ++ automount_opts;
]
++ automount_opts;
};
"/mnt/Music" = {
device = "//100.78.212.35/music";
@@ -32,9 +33,10 @@ in
"credentials=${config.age.secrets.eclypsecloud-eclypse.path}"
"uid=${toString config.users.users.eclypse.uid}"
"rw"
] ++ automount_opts;
]
++ automount_opts;
};
};
environment.systemPackages = with pkgs; [ cifs-utils ];
}
}

View File

@@ -36,6 +36,7 @@
systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
git
sshfs
# (catppuccin-sddm.override {
# flavor = "mocha";
# accent = "pink";

View File

@@ -23,7 +23,7 @@
programs.home-manager.enable = true;
};
backupFileExtension = "backup3";
backupFileExtension = "backup5";
};
users.mutableUsers = false;