diff --git a/modules/home/default.nix b/modules/home/default.nix index c2c43cb..a7334de 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -8,7 +8,7 @@ ./nvf.nix ./packages.nix ./plasma.nix - # ./vscode.nix + ./vscode.nix ./zsh.nix ]; } diff --git a/modules/home/nvf.nix b/modules/home/nvf.nix index 0dccde4..0d8caf8 100644 --- a/modules/home/nvf.nix +++ b/modules/home/nvf.nix @@ -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 = ""; + mode = [ "n" ]; + silent = true; + action = "Neotree focus"; + } { key = ""; mode = [ "n" ]; silent = true; - action = "Neotree toggle"; + action = "Neotree close"; + } + { + key = ""; + mode = [ + "n" + "i" + "v" + ]; + action = "w"; + } + + # Window Navigation + { + key = "LEFT"; + mode = ""; + action = "h"; + } + { + key = "DOWN"; + mode = ""; + action = "j"; + } + { + key = "UP"; + mode = ""; + action = "k"; + } + { + key = "RIGHT"; + mode = ""; + action = "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; + }; + }; }; }; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 7ddc3c6..9024c90 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -21,5 +21,6 @@ # CD Stuff picard heybrochecklog + rsgain ]; } diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index f68f215..489b4b9 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -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"; }; diff --git a/modules/system/fileSystems.nix b/modules/system/fileSystems.nix index 82769ba..60f9f9f 100644 --- a/modules/system/fileSystems.nix +++ b/modules/system/fileSystems.nix @@ -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 ]; -} \ No newline at end of file +} diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 603beba..ca52fb5 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -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"; diff --git a/modules/system/user.nix b/modules/system/user.nix index 633ada4..2b128ad 100644 --- a/modules/system/user.nix +++ b/modules/system/user.nix @@ -23,7 +23,7 @@ programs.home-manager.enable = true; }; - backupFileExtension = "backup3"; + backupFileExtension = "backup5"; }; users.mutableUsers = false;