diff --git a/hosts/work/home-config.nix b/hosts/work/home-config.nix index 733c542..0155435 100644 --- a/hosts/work/home-config.nix +++ b/hosts/work/home-config.nix @@ -38,7 +38,8 @@ laptop = true; gpuThermal.enable = false; cpuThermal = { - thermalZone = 9; + hwmonPathAbs = "/sys/devices/platform/coretemp.0/hwmon/"; + inputFilename = "temp1_input"; }; }; xdg.useDistributionPortals = true; diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix index c62c384..ee3302e 100644 --- a/modules/home-manager/cli/neovim/default.nix +++ b/modules/home-manager/cli/neovim/default.nix @@ -205,10 +205,7 @@ in type = "lua"; config = ( builtins.readFile ./files/plugins/nvim-k8s-lsp.lua ); } - { - plugin = helm-ls-nvim; - type = "lua"; - } + vim-helm ]; }; }; diff --git a/modules/home-manager/cli/neovim/files/lsp/helm.lua b/modules/home-manager/cli/neovim/files/lsp/helm.lua index 29e9e11..8086a4a 100644 --- a/modules/home-manager/cli/neovim/files/lsp/helm.lua +++ b/modules/home-manager/cli/neovim/files/lsp/helm.lua @@ -1,8 +1,7 @@ return { cmd = { 'helm_ls', 'serve' }, - filetypes = { 'helm', 'yaml.helm-values' }, - single_file_support = true, - root_markers = { 'values.yaml', 'Chart.yaml' }, + filetypes = { 'helm' }, + root_markers = { 'Chart.yaml' }, capabilities = { workspace = { didChangeWatchedFiles = { @@ -19,7 +18,9 @@ return { showdiagnosticsdirectly = false, path = "yaml-language-server", config = { - schemas = {}, + schemas = { + kubernetes = "template/**", + }, completion = true, hover = true, } diff --git a/modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua b/modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua index 400c8a1..a2176c6 100644 --- a/modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua +++ b/modules/home-manager/cli/neovim/files/plugins/nvim-k8s-lsp.lua @@ -1,6 +1,6 @@ require("nvim-k8s-lsp").setup({ - kubernetes_version = "v1.32.8", + kubernetes_version = "v1.32.2", integrations = { - lualine = true, + lualine = false, } }) diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index d8fa2ff..b3950e7 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -74,8 +74,8 @@ in cpuThermal = { thermalZone = mkOption { - type = types.int or null; - default = null; + type = types.str; + default = ""; description = "CPU thermal hwmon thermal Zone"; }; diff --git a/modules/home-manager/desktop/sway/includes/files/waybar-style.css b/modules/home-manager/desktop/sway/includes/files/waybar-style.css index d1dd1a2..f7cc59f 100644 --- a/modules/home-manager/desktop/sway/includes/files/waybar-style.css +++ b/modules/home-manager/desktop/sway/includes/files/waybar-style.css @@ -101,8 +101,7 @@ button:hover{ #battery.critical:not(.charging), #cpu.critical, -#memory.critical, -#temperature.critical{ +#memory.critical{ border-color: @color-critical; color: @color-critical; }