diff --git a/hosts/work/bluetooth.nix b/hosts/work/bluetooth.nix index 4f0700e..4fb811e 100644 --- a/hosts/work/bluetooth.nix +++ b/hosts/work/bluetooth.nix @@ -1,15 +1,15 @@ _: { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - + services.blueman.enable = true; services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = { - "monitor.bluez.properties" = { + "monitor.bluez.properties" = { "bluez5.enable-sbc-xq" = true; "bluez5.enable-msbc" = true; "bluez5.enable-hw-volume" = true; - "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ]; + "bluez5.roles" = ["hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag"]; + }; }; -}; -} \ No newline at end of file +} diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix index 5086992..39982cb 100644 --- a/modules/apps/vscode.nix +++ b/modules/apps/vscode.nix @@ -5,13 +5,9 @@ lib, ... }: let - # stable = inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace-release; - nix-vscode-extensions = (inputs.nix-vscode-extensions.overlays.default pkgs pkgsUnstable); - # vscode-extensions = nix-vscode-extensions.extensions.${pkgs.system}; vscodePackage = pkgsUnstable.vscode; - vscodeMarketplace = nix-vscode-extensions.vscode-marketplace; - vscodeMarketplaceRelease = nix-vscode-extensions.vscode-marketplace-release; - vscodePkgs = vscodeMarketplace // vscodeMarketplaceRelease; # Prefer release over pre-release + vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system}; + vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release mkFormatter = formatter: languages: { "[${lib.concatStringsSep "][" languages}]" = { @@ -19,6 +15,9 @@ "editor.formatOnSave" = true; }; }; + + # I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround + allowUnfree = ext: ext.override {meta.license = [];}; in { fireproof.home-manager = { programs.vscode = { @@ -59,11 +58,11 @@ in { ]; extensions = with vscodePkgs; [ # Remote - ms-vscode-remote.remote-ssh + (allowUnfree ms-vscode-remote.remote-ssh) # AI - github.copilot - github.copilot-chat + (allowUnfree github.copilot) + (allowUnfree github.copilot-chat) # Python ms-pyright.pyright diff --git a/modules/shell/neovim.nix b/modules/shell/neovim.nix index 18e8424..b457e6d 100644 --- a/modules/shell/neovim.nix +++ b/modules/shell/neovim.nix @@ -1,61 +1,61 @@ _: { config = { - programs.neovim = { - enable = true; - vimAlias = true; - defaultEditor = true; - }; - - programs.nvf = { - enable = true; - - settings.vim = { - viAlias = true; + programs.neovim = { + enable = true; vimAlias = true; + defaultEditor = true; + }; - lineNumberMode = "number"; + programs.nvf = { + enable = true; - lsp = { - enable = true; - lightbulb.enable = true; - }; + settings.vim = { + viAlias = true; + vimAlias = true; - languages = { - enableLSP = true; - enableFormat = true; - enableTreesitter = true; + lineNumberMode = "number"; - nix.enable = true; - markdown.enable = true; - rust.enable = true; - sql.enable = true; - ts.enable = true; - html.enable = true; - python.enable = true; - }; + lsp = { + enable = true; + lightbulb.enable = true; + }; - git.enable = true; + languages = { + enableLSP = true; + enableFormat = true; + enableTreesitter = true; - telescope.enable = true; - autopairs.nvim-autopairs.enable = true; - autocomplete.blink-cmp.enable = true; - statusline.lualine.enable = true; + nix.enable = true; + markdown.enable = true; + rust.enable = true; + sql.enable = true; + ts.enable = true; + html.enable = true; + python.enable = true; + }; - utility = { - ccc.enable = false; - vim-wakatime.enable = false; - icon-picker.enable = false; - motion.leap.enable = true; - }; - ui = { - borders.enable = true; - colorizer.enable = true; - }; + git.enable = true; - binds = { - whichKey.enable = true; + telescope.enable = true; + autopairs.nvim-autopairs.enable = true; + autocomplete.blink-cmp.enable = true; + statusline.lualine.enable = true; + + utility = { + ccc.enable = false; + vim-wakatime.enable = false; + icon-picker.enable = false; + motion.leap.enable = true; + }; + ui = { + borders.enable = true; + colorizer.enable = true; + }; + + binds = { + whichKey.enable = true; + }; }; }; }; -}; }