diff --git a/home/dot_config/nvim/lua/keymaps/language.lua b/home/dot_config/nvim/lua/keymaps/language.lua index a2093b1..8e4203d 100644 --- a/home/dot_config/nvim/lua/keymaps/language.lua +++ b/home/dot_config/nvim/lua/keymaps/language.lua @@ -25,4 +25,12 @@ vim.api.nvim_create_autocmd("FileType", { end, }) +vim.api.nvim_create_autocmd("FileType", { + pattern = "nix", + callback = function() + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + end, +}) + return M diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index 21893be..818a002 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -59,6 +59,8 @@ in { + # This will automatically generate nixOS config for `nixosHosts' + # Include the module ./hosts/${hostname} by default. nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem; darwinConfigurations."zen" = nix-darwin.lib.darwinSystem { diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 44664ca..02b5a0e 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -37,8 +37,5 @@ boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; - boot.extraModprobeConfig = '' - options v4l2loopback devices=1 video_nr=2 card_label="OBS Virtual Camera" exclusive_caps=1 - ''; system.stateVersion = "25.05"; } diff --git a/nixcfgs/modules/home/dev/java.nix b/nixcfgs/modules/home/dev/java.nix index 3d313d5..052d2a1 100644 --- a/nixcfgs/modules/home/dev/java.nix +++ b/nixcfgs/modules/home/dev/java.nix @@ -8,4 +8,5 @@ vscjava.vscode-spring-initializr vscjava.vscode-java-pack ]; + programs.zed-editor.extensions = [ "java" ]; } diff --git a/nixcfgs/modules/home/dev/lua.nix b/nixcfgs/modules/home/dev/lua.nix new file mode 100644 index 0000000..87d587b --- /dev/null +++ b/nixcfgs/modules/home/dev/lua.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + luajit + lua-language-server + stylua + ]; + programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ + sumneko.lua + ]; + programs.zed-editor.extensions = [ "lua" ]; +} diff --git a/nixcfgs/modules/home/dev/nix.nix b/nixcfgs/modules/home/dev/nix.nix index fc8eaf1..579d455 100644 --- a/nixcfgs/modules/home/dev/nix.nix +++ b/nixcfgs/modules/home/dev/nix.nix @@ -8,4 +8,6 @@ kamadorueda.alejandra jnoortheen.nix-ide ]; + + programs.zed-editor.extensions = [ "nix" ]; } diff --git a/nixcfgs/modules/home/programs/zed-editor.nix b/nixcfgs/modules/home/programs/zed-editor.nix index 399a77a..b74fe9a 100644 --- a/nixcfgs/modules/home/programs/zed-editor.nix +++ b/nixcfgs/modules/home/programs/zed-editor.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { programs.zed-editor = { enable = true; - extensions = ["nix"]; }; } diff --git a/nixcfgs/modules/nixos/libvirt.nix b/nixcfgs/modules/nixos/libvirt.nix index 879e91f..a2bd438 100644 --- a/nixcfgs/modules/nixos/libvirt.nix +++ b/nixcfgs/modules/nixos/libvirt.nix @@ -26,4 +26,5 @@ extraGroups = ["libvirtd"]; }; networking.firewall.trustedInterfaces = ["virbr0"]; + virtualisation.spiceUSBRedirection.enable = true; } diff --git a/nixcfgs/modules/nixos/obs-studio.nix b/nixcfgs/modules/nixos/obs-studio.nix index d1bef34..07821dd 100644 --- a/nixcfgs/modules/nixos/obs-studio.nix +++ b/nixcfgs/modules/nixos/obs-studio.nix @@ -4,4 +4,7 @@ enable = true; enableVirtualCamera = true; }; + boot.extraModprobeConfig = '' + options v4l2loopback devices=1 video_nr=2 card_label="OBS Virtual Camera" exclusive_caps=1 + ''; } diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index c5fad27..aa266d1 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -1,5 +1,6 @@ # ~/.config/nix-config/common/packages-headless.nix -{pkgs, ...}: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ age aichat @@ -48,5 +49,6 @@ # Misc ta-lib ddgr + protonvpn-cli ]; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 25eb6a5..023da45 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -29,5 +29,8 @@ qutebrowser ryubing qbittorrent + protonvpn-gui + proton-pass + protonmail-bridge ]; } diff --git a/nixcfgs/users/js0ny/programs/shell.nix b/nixcfgs/users/js0ny/programs/shell.nix index 608f965..ca672c5 100644 --- a/nixcfgs/users/js0ny/programs/shell.nix +++ b/nixcfgs/users/js0ny/programs/shell.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let commonAliases = { v = "nvim"; g = "lazygit"; @@ -8,7 +9,8 @@ c = "code"; aic = "aichat -s"; }; -in { +in +{ programs.fish = { enable = true; interactiveShellInit = "set fish_greeting"; @@ -27,4 +29,5 @@ in { enable = true; shellAliases = commonAliases; }; + programs.zed-editor.extensions = [ "fish" ]; } diff --git a/nixcfgs/users/js0ny/programs/zed-editor.nix b/nixcfgs/users/js0ny/programs/zed-editor.nix new file mode 100644 index 0000000..acf8427 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/zed-editor.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + programs.zed-editor = { + enable = true; + extensions = [ + "dockerfile" + "catppuccin" + "toml" + "material-icon-theme" + "git-firefly" + "make" + ]; + }; +} diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 474da64..f712faa 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -20,10 +20,12 @@ ./programs/firefox.nix ./programs/distrobox.nix ./programs/mime.nix + ./programs/zed-editor.nix # ./programs/floorp.nix ../../modules/home/gnome-keyrings.nix ../../modules/home/dev/c.nix ../../modules/home/dev/java.nix + ../../modules/home/dev/lua.nix ../../modules/home/dev/nix.nix ../../modules/home/dev/python.nix ../../modules/home/programs/eza.nix @@ -32,7 +34,6 @@ ../../modules/home/programs/nvim.nix ../../modules/home/programs/starship.nix ../../modules/home/programs/zoxide.nix - ../../modules/home/programs/zed-editor.nix # ./flatpak.nix ];