diff --git a/flake.nix b/flake.nix index 5f5e61b..1bd44e2 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,7 @@ modules = [ inputs.home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -103,6 +104,7 @@ modules = [ inputs.home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -134,6 +136,7 @@ modules = [ inputs.home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -165,6 +168,7 @@ modules = [ inputs.home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri diff --git a/modules/default/home-manager/desktop/vscodium.nix b/modules/default/home-manager/desktop/vscodium.nix index c113d3e..50e4175 100644 --- a/modules/default/home-manager/desktop/vscodium.nix +++ b/modules/default/home-manager/desktop/vscodium.nix @@ -6,61 +6,59 @@ enable = true; package = pkgs.vscodium; - profiles.default = { - userSettings = { - "[nix]"."editor.tabSize" = 2; - "explorer.confirmDragAndDrop" = false; - "cmake.showOptionsMovedNotification" = false; - "extensions.autoUpdate" = false; - "rust-analyzer.check.command" = "clippy"; - "editor.formatOnSave" = true; - }; - extensions = with pkgs.vscode-extensions; [ - # System - arrterian.nix-env-selector - bbenoist.nix - #fireblast.hyprlang-vscode - #eww-yuck.yuck - - #Rust - rust-lang.rust-analyzer - serayuzgur.crates - bungcip.better-toml - #vadimcn.vscode-lldb - usernamehw.errorlens - - #C/C++ - ms-vscode.cpptools - twxs.cmake - ms-vscode.cmake-tools - - #Shell - timonwong.shellcheck - mads-hartmann.bash-ide-vscode - - #Git - #phil294.git-log--graph - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "hyprlang-vscode"; - publisher = "fireblast"; - version = "0.0.1"; - sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4="; - } - { - name = "yuck"; - publisher = "eww-yuck"; - version = "0.0.3"; - sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; - } - { - name = "git-log--graph"; - publisher = "phil294"; - version = "0.1.15"; - sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0="; - } - ]; + userSettings = { + "[nix]"."editor.tabSize" = 2; + "explorer.confirmDragAndDrop" = false; + "cmake.showOptionsMovedNotification" = false; + "extensions.autoUpdate" = false; + "rust-analyzer.check.command" = "clippy"; + "editor.formatOnSave" = true; }; + extensions = with pkgs.vscode-extensions; [ + # System + arrterian.nix-env-selector + bbenoist.nix + #fireblast.hyprlang-vscode + #eww-yuck.yuck + + #Rust + rust-lang.rust-analyzer + serayuzgur.crates + bungcip.better-toml + #vadimcn.vscode-lldb + usernamehw.errorlens + + #C/C++ + ms-vscode.cpptools + twxs.cmake + ms-vscode.cmake-tools + + #Shell + timonwong.shellcheck + mads-hartmann.bash-ide-vscode + + #Git + #phil294.git-log--graph + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "hyprlang-vscode"; + publisher = "fireblast"; + version = "0.0.1"; + sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4="; + } + { + name = "yuck"; + publisher = "eww-yuck"; + version = "0.0.3"; + sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; + } + { + name = "git-log--graph"; + publisher = "phil294"; + version = "0.1.15"; + sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0="; + } + ]; }; }; } diff --git a/modules/default/home-manager/stylix.nix b/modules/default/home-manager/stylix.nix index 755c4fc..6547895 100644 --- a/modules/default/home-manager/stylix.nix +++ b/modules/default/home-manager/stylix.nix @@ -65,7 +65,6 @@ in targets = { hyprland.hyprpaper.enable = false; starship.enable = false; - vscode.profileNames = [ "default" ]; }; }; diff --git a/modules/default/nixos/desktop/games/emulation.nix b/modules/default/nixos/desktop/games/emulation.nix index dcc6714..c3ac6e3 100644 --- a/modules/default/nixos/desktop/games/emulation.nix +++ b/modules/default/nixos/desktop/games/emulation.nix @@ -3,7 +3,7 @@ lib.mkIf config.desktop.emulation.enable { environment.systemPackages = with pkgs; [ melonDS dolphin-emu - lime3ds + #lime3ds cemu yuzu steam-rom-manager diff --git a/modules/default/nixos/nixvim/lsp.nix b/modules/default/nixos/nixvim/lsp.nix index 3a72ad3..fed4869 100644 --- a/modules/default/nixos/nixvim/lsp.nix +++ b/modules/default/nixos/nixvim/lsp.nix @@ -3,6 +3,8 @@ programs.nixvim = { plugins = { + hmts.enable = true; + lsp-lines = { enable = true; }; lsp-format = { enable = true; }; lsp = { diff --git a/modules/default/nixos/nixvim/neotree.nix b/modules/default/nixos/nixvim/neotree.nix index 3c6e13a..a3fa848 100644 --- a/modules/default/nixos/nixvim/neotree.nix +++ b/modules/default/nixos/nixvim/neotree.nix @@ -37,7 +37,6 @@ }; }; }; - web-devicons.enable = true; }; }; } diff --git a/modules/default/nixos/nixvim/treesitter.nix b/modules/default/nixos/nixvim/treesitter.nix index 0dfbd1c..6b00293 100644 --- a/modules/default/nixos/nixvim/treesitter.nix +++ b/modules/default/nixos/nixvim/treesitter.nix @@ -8,7 +8,6 @@ highlight.enable = true; }; }; - hmts.enable = true; }; }