From 37173ae90523b496da4f9ea22fb1c44ac6cfeb3c Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 23 Mar 2025 18:30:15 +0100 Subject: [PATCH 1/5] revert 2ddbe9d227465ee12ed8d2fc01f7a517053e0ba0 revert TEMP remove lime3ds because of build failure --- modules/default/nixos/desktop/games/emulation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/nixos/desktop/games/emulation.nix b/modules/default/nixos/desktop/games/emulation.nix index c3ac6e3..dcc6714 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 From e8e3f0efe662c93a21408a72e31c5bf7ea9ec15f Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 23 Mar 2025 20:46:47 +0100 Subject: [PATCH 2/5] adapt vscode breaking naming change --- .../default/home-manager/desktop/vscodium.nix | 106 +++++++++--------- modules/default/home-manager/stylix.nix | 1 + 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/modules/default/home-manager/desktop/vscodium.nix b/modules/default/home-manager/desktop/vscodium.nix index 50e4175..c113d3e 100644 --- a/modules/default/home-manager/desktop/vscodium.nix +++ b/modules/default/home-manager/desktop/vscodium.nix @@ -6,59 +6,61 @@ enable = true; package = pkgs.vscodium; - userSettings = { - "[nix]"."editor.tabSize" = 2; - "explorer.confirmDragAndDrop" = false; - "cmake.showOptionsMovedNotification" = false; - "extensions.autoUpdate" = false; - "rust-analyzer.check.command" = "clippy"; - "editor.formatOnSave" = true; + 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="; + } + ]; }; - 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 6547895..755c4fc 100644 --- a/modules/default/home-manager/stylix.nix +++ b/modules/default/home-manager/stylix.nix @@ -65,6 +65,7 @@ in targets = { hyprland.hyprpaper.enable = false; starship.enable = false; + vscode.profileNames = [ "default" ]; }; }; From 10a69296d40d204a6f2723e89a76bf7c52a8d800 Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 23 Mar 2025 20:54:40 +0100 Subject: [PATCH 3/5] remove unnecessary home-manager configuration --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 1bd44e2..5f5e61b 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,6 @@ modules = [ inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -104,7 +103,6 @@ modules = [ inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -136,7 +134,6 @@ modules = [ inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri @@ -168,7 +165,6 @@ modules = [ inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } inputs.niri.nixosModules.niri From fd75282eb19a62625e1bbfdba3ce45ffcc1435f7 Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 23 Mar 2025 21:06:40 +0100 Subject: [PATCH 4/5] added required nixvim plugin --- modules/default/nixos/nixvim/neotree.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default/nixos/nixvim/neotree.nix b/modules/default/nixos/nixvim/neotree.nix index a3fa848..3c6e13a 100644 --- a/modules/default/nixos/nixvim/neotree.nix +++ b/modules/default/nixos/nixvim/neotree.nix @@ -37,6 +37,7 @@ }; }; }; + web-devicons.enable = true; }; }; } From 9134f73531b9b1b90d4a59707dd9950d97787205 Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 23 Mar 2025 21:13:12 +0100 Subject: [PATCH 5/5] move nixvim hmts to treesitter.nix --- modules/default/nixos/nixvim/lsp.nix | 2 -- modules/default/nixos/nixvim/treesitter.nix | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/default/nixos/nixvim/lsp.nix b/modules/default/nixos/nixvim/lsp.nix index fed4869..3a72ad3 100644 --- a/modules/default/nixos/nixvim/lsp.nix +++ b/modules/default/nixos/nixvim/lsp.nix @@ -3,8 +3,6 @@ programs.nixvim = { plugins = { - hmts.enable = true; - lsp-lines = { enable = true; }; lsp-format = { enable = true; }; lsp = { diff --git a/modules/default/nixos/nixvim/treesitter.nix b/modules/default/nixos/nixvim/treesitter.nix index 6b00293..0dfbd1c 100644 --- a/modules/default/nixos/nixvim/treesitter.nix +++ b/modules/default/nixos/nixvim/treesitter.nix @@ -8,6 +8,7 @@ highlight.enable = true; }; }; + hmts.enable = true; }; }