From afb138aa94b28fa7d8f774c91a630abaae1f17aa Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 9 Jan 2025 17:33:08 +0000 Subject: [PATCH] fix nixos upgrade warnings - upgrade to 24.11 --- home/citadel.nix | 30 +++++++-------- home/common/core/default.nix | 4 +- home/common/core/nixvim/plugins/conform.nix | 38 ++++++++++--------- home/common/core/nixvim/plugins/lsp.nix | 2 +- home/common/core/nixvim/plugins/lualine.nix | 36 ++++++++++-------- .../optional/desktop/common/default.nix | 4 +- .../optional/desktop/common/wayland/mako.nix | 6 +-- home/common/optional/desktop/dwm/dunst.nix | 16 ++++---- .../optional/desktop/hyprland/default.nix | 4 +- home/semita.nix | 32 ++++++++-------- .../optional/nixos-containers/postgres.nix | 2 +- hosts/semita/default.nix | 10 ++--- 12 files changed, 93 insertions(+), 91 deletions(-) diff --git a/home/citadel.nix b/home/citadel.nix index c6efed7..440b32c 100644 --- a/home/citadel.nix +++ b/home/citadel.nix @@ -56,28 +56,28 @@ ! dwm dwm.borderpx: 6 dwm.font: monospace:size=14 - dwm.col_base00: #${config.colorScheme.colors.base00} - dwm.col_base03: #${config.colorScheme.colors.base03} - dwm.col_base04: #${config.colorScheme.colors.base04} - dwm.col_base05: #${config.colorScheme.colors.base05} - dwm.col_base08: #${config.colorScheme.colors.base08} - dwm.col_base0B: #${config.colorScheme.colors.base0B} + dwm.col_base00: #${config.colorScheme.palette.base00} + dwm.col_base03: #${config.colorScheme.palette.base03} + dwm.col_base04: #${config.colorScheme.palette.base04} + dwm.col_base05: #${config.colorScheme.palette.base05} + dwm.col_base08: #${config.colorScheme.palette.base08} + dwm.col_base0B: #${config.colorScheme.palette.base0B} ! dmenu dmenu.font: monospace:size=14 dmenu.font2: NotoColorEmoji:pixelsize=44:antialias=true:autohint=true dmenu.topbar: 1 - dmenu.normfgcolor: #${config.colorScheme.colors.base05} - dmenu.normbgcolor: #${config.colorScheme.colors.base03} - dmenu.selfgcolor: #${config.colorScheme.colors.base00} - dmenu.selbgcolor: #${config.colorScheme.colors.base0B} + dmenu.normfgcolor: #${config.colorScheme.palette.base05} + dmenu.normbgcolor: #${config.colorScheme.palette.base03} + dmenu.selfgcolor: #${config.colorScheme.palette.base00} + dmenu.selbgcolor: #${config.colorScheme.palette.base0B} - Nsxiv.window.background: #${config.colorScheme.colors.base03} - Nsxiv.window.foreground: #${config.colorScheme.colors.base05} - Nsxiv.mark.foreground: #${config.colorScheme.colors.base08} + Nsxiv.window.background: #${config.colorScheme.palette.base03} + Nsxiv.window.foreground: #${config.colorScheme.palette.base05} + Nsxiv.mark.foreground: #${config.colorScheme.palette.base08} - Nsxiv.bar.background: #${config.colorScheme.colors.base00} - Nsxiv.bar.foreground: #${config.colorScheme.colors.base05} + Nsxiv.bar.background: #${config.colorScheme.palette.base00} + Nsxiv.bar.foreground: #${config.colorScheme.palette.base05} Nsxiv.bar.font: monospace:size=12 diff --git a/home/common/core/default.nix b/home/common/core/default.nix index b3af8ab..6638cf7 100644 --- a/home/common/core/default.nix +++ b/home/common/core/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, outputs, lib, ... }: +{ pkgs, inputs, outputs, ... }: { imports = [ inputs.nix-colors.homeManagerModules.default @@ -7,7 +7,7 @@ ]; nixpkgs.overlays = [ - inputs.nur.overlay + inputs.nur.overlays.default outputs.overlays.additions outputs.overlays.unstable-packages ]; diff --git a/home/common/core/nixvim/plugins/conform.nix b/home/common/core/nixvim/plugins/conform.nix index 5c1bd48..3574907 100644 --- a/home/common/core/nixvim/plugins/conform.nix +++ b/home/common/core/nixvim/plugins/conform.nix @@ -1,24 +1,26 @@ { programs.nixvim.plugins.conform-nvim = { enable = true; - notifyOnError = true; - logLevel = "debug"; - formattersByFt = { - html = ["prettierd"]; - css = ["prettierd"]; - javascript = ["prettierd"]; - python = ["black"]; - lua = ["stylua"]; - nix = ["alejandra"]; - markdown = ["prettierd"]; - yaml = ["yamlfmt"]; - sql = ["sqlfmt"]; - #sql = ["sql-formatter"]; - bash = [ - "shellcheck" - "shellharden" - "shfmt" - ]; + settings = { + notifyOnError = true; + logLevel = "debug"; + formattersByFt = { + html = ["prettierd"]; + css = ["prettierd"]; + javascript = ["prettierd"]; + python = ["black"]; + lua = ["stylua"]; + nix = ["alejandra"]; + markdown = ["prettierd"]; + yaml = ["yamlfmt"]; + sql = ["sqlfmt"]; + #sql = ["sql-formatter"]; + bash = [ + "shellcheck" + "shellharden" + "shfmt" + ]; + }; }; # formatters = { # sql-formatter = { diff --git a/home/common/core/nixvim/plugins/lsp.nix b/home/common/core/nixvim/plugins/lsp.nix index 3386fa0..691d8c6 100644 --- a/home/common/core/nixvim/plugins/lsp.nix +++ b/home/common/core/nixvim/plugins/lsp.nix @@ -26,7 +26,7 @@ in marksman = {enable = true;}; ccls = {enable = true;}; cssls = {enable = true;}; - ts-ls = {enable = true;}; + ts_ls = {enable = true;}; }; keymaps = { lspBuf = { diff --git a/home/common/core/nixvim/plugins/lualine.nix b/home/common/core/nixvim/plugins/lualine.nix index f450ec9..54ef359 100644 --- a/home/common/core/nixvim/plugins/lualine.nix +++ b/home/common/core/nixvim/plugins/lualine.nix @@ -1,22 +1,26 @@ { programs.nixvim.plugins.lualine = { enable = true; - theme = "auto"; - componentSeparators = { - left = ""; - right = ""; - }; - sectionSeparators = { - left = ""; - right = ""; - }; - sections = { - lualine_a = [ "mode" ]; - lualine_b = [ "branch" "diff" "diagnostics" ]; - lualine_c = [ "filename" ]; - lualine_x = [ "encoding" "fileformat" "filetype" ]; - lualine_y = [ "progress" ]; - lualine_z = [ "locations" ]; + settings = { + options = { + theme = "auto"; + sectionSeparators = { + left = ""; + right = ""; + }; + componentSeparators = { + left = ""; + right = ""; + }; + }; + sections = { + lualine_a = ["mode"]; + lualine_b = ["branch" "diff" "diagnostics"]; + lualine_c = ["filename"]; + lualine_x = ["encoding" "fileformat" "filetype"]; + lualine_y = ["progress"]; + lualine_z = ["locations"]; + }; }; }; } diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix index 8b72c1e..f02ce34 100644 --- a/home/common/optional/desktop/common/default.nix +++ b/home/common/optional/desktop/common/default.nix @@ -14,9 +14,9 @@ pkgs.xfce.thunar pkgs.kcolorchooser pkgs.zotero - pkgs.transmission + pkgs.transmission_3 pkgs.mpv - pkgs.gnome.simple-scan + pkgs.simple-scan pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.libreoffice-fresh diff --git a/home/common/optional/desktop/common/wayland/mako.nix b/home/common/optional/desktop/common/wayland/mako.nix index 77db759..e94e0f9 100644 --- a/home/common/optional/desktop/common/wayland/mako.nix +++ b/home/common/optional/desktop/common/wayland/mako.nix @@ -2,11 +2,11 @@ { services.mako = { enable = true; - backgroundColor = "#${config.colorScheme.colors.base00}"; - borderColor = "#${config.colorScheme.colors.base0D}"; + backgroundColor = "#${config.colorScheme.palette.base00}"; + borderColor = "#${config.colorScheme.palette.base0D}"; borderRadius = 5; borderSize = 2; - textColor = "#${config.colorScheme.colors.base05}"; + textColor = "#${config.colorScheme.palette.base05}"; layer = "overlay"; }; } diff --git a/home/common/optional/desktop/dwm/dunst.nix b/home/common/optional/desktop/dwm/dunst.nix index dd08974..571f72d 100644 --- a/home/common/optional/desktop/dwm/dunst.nix +++ b/home/common/optional/desktop/dwm/dunst.nix @@ -131,7 +131,7 @@ offset = "15x60"; origin = "top-right"; - frame_color = "#${config.colorScheme.colors.base0B}"; + frame_color = "#${config.colorScheme.palette.base0B}"; frame_width = 2; # Browser for opening urls in context menu. @@ -157,21 +157,21 @@ }; urgency_low = { - background = "#${config.colorScheme.colors.base03}"; - foreground = "#${config.colorScheme.colors.base05}"; + background = "#${config.colorScheme.palette.base03}"; + foreground = "#${config.colorScheme.palette.base05}"; timeout = 15; }; urgency_normal = { - background = "#${config.colorScheme.colors.base03}"; - foreground = "#${config.colorScheme.colors.base05}"; + background = "#${config.colorScheme.palette.base03}"; + foreground = "#${config.colorScheme.palette.base05}"; timeout = 15; }; urgency_critical = { - background = "#${config.colorScheme.colors.base08}"; - foreground = "#${config.colorScheme.colors.base05}"; - frame_color = "#${config.colorScheme.colors.base05}"; + background = "#${config.colorScheme.palette.base08}"; + foreground = "#${config.colorScheme.palette.base05}"; + frame_color = "#${config.colorScheme.palette.base05}"; timeout = 0; }; }; diff --git a/home/common/optional/desktop/hyprland/default.nix b/home/common/optional/desktop/hyprland/default.nix index dd0c11e..4df0865 100644 --- a/home/common/optional/desktop/hyprland/default.nix +++ b/home/common/optional/desktop/hyprland/default.nix @@ -22,8 +22,8 @@ extraConfig = let monitor = "${toString (builtins.map (m: "monitor=${ m.name },${ toString( m.width ) }x${ toString( m.height ) }@${ toString( m.refreshRate ) },${ toString( m.x ) }x${ toString( m.y ) },${ toString( m.scale ) }\n") config.monitors)}"; - active = "rgba(${config.colorScheme.colors.base08}ee)"; - inactive = "rgba(${config.colorScheme.colors.base0C}ee)"; + active = "rgba(${config.colorScheme.palette.base08}ee)"; + inactive = "rgba(${config.colorScheme.palette.base0C}ee)"; in '' diff --git a/home/semita.nix b/home/semita.nix index e761f11..77af89c 100644 --- a/home/semita.nix +++ b/home/semita.nix @@ -17,7 +17,7 @@ ./common/optional/desktop/common/themes/standard-dark.nix ./common/optional/notes.nix ./common/optional/yazi.nix - ./common/optional/transmission.nix + ./common/optional/transmission_3.nix ./common/optional/desktop/common/xdg ]; @@ -58,28 +58,28 @@ ! dwm dwm.borderpx: 3 dwm.font: monospace:size=12 - dwm.col_base00: #${config.colorScheme.colors.base00} - dwm.col_base03: #${config.colorScheme.colors.base03} - dwm.col_base04: #${config.colorScheme.colors.base04} - dwm.col_base05: #${config.colorScheme.colors.base05} - dwm.col_base08: #${config.colorScheme.colors.base08} - dwm.col_base0B: #${config.colorScheme.colors.base0B} + dwm.col_base00: #${config.colorScheme.palette.base00} + dwm.col_base03: #${config.colorScheme.palette.base03} + dwm.col_base04: #${config.colorScheme.palette.base04} + dwm.col_base05: #${config.colorScheme.palette.base05} + dwm.col_base08: #${config.colorScheme.palette.base08} + dwm.col_base0B: #${config.colorScheme.palette.base0B} ! dmenu dmenu.font: monospace:size=12 dmenu.font2: NotoColorEmoji:pixelsize=22:antialias=true:autohint=true dmenu.topbar: 1 - dmenu.normfgcolor: #${config.colorScheme.colors.base05} - dmenu.normbgcolor: #${config.colorScheme.colors.base03} - dmenu.selfgcolor: #${config.colorScheme.colors.base00} - dmenu.selbgcolor: #${config.colorScheme.colors.base0B} + dmenu.normfgcolor: #${config.colorScheme.palette.base05} + dmenu.normbgcolor: #${config.colorScheme.palette.base03} + dmenu.selfgcolor: #${config.colorScheme.palette.base00} + dmenu.selbgcolor: #${config.colorScheme.palette.base0B} - Nsxiv.window.background: #${config.colorScheme.colors.base03} - Nsxiv.window.foreground: #${config.colorScheme.colors.base05} - Nsxiv.mark.foreground: #${config.colorScheme.colors.base08} + Nsxiv.window.background: #${config.colorScheme.palette.base03} + Nsxiv.window.foreground: #${config.colorScheme.palette.base05} + Nsxiv.mark.foreground: #${config.colorScheme.palette.base08} - Nsxiv.bar.background: #${config.colorScheme.colors.base00} - Nsxiv.bar.foreground: #${config.colorScheme.colors.base05} + Nsxiv.bar.background: #${config.colorScheme.palette.base00} + Nsxiv.bar.foreground: #${config.colorScheme.palette.base05} Nsxiv.bar.font: monospace:size=12 ''; } diff --git a/hosts/common/optional/nixos-containers/postgres.nix b/hosts/common/optional/nixos-containers/postgres.nix index ce80819..f48aadd 100644 --- a/hosts/common/optional/nixos-containers/postgres.nix +++ b/hosts/common/optional/nixos-containers/postgres.nix @@ -73,7 +73,7 @@ in { enable = true; enableJIT = true; package = pkgs.postgresql_16; - extraPlugins = with pkgs.postgresql_16.pkgs; [ postgis ]; + extensions = with pkgs.postgresql_16.pkgs; [postgis]; enableTCPIP = true; settings = { max_worker_processes = "12"; diff --git a/hosts/semita/default.nix b/hosts/semita/default.nix index 84d468b..fad8997 100644 --- a/hosts/semita/default.nix +++ b/hosts/semita/default.nix @@ -59,13 +59,9 @@ in { ../common/optional/restic-backup.nix ../common/optional/nixos-containers/backup-server.nix -<<<<<<< HEAD - # Build nix derivations on remote machine -======= - ->>>>>>> distributed-builds - ../common/optional/distributed_builds/local-machine.nix + # # Build nix derivations on remote machine + # ../common/optional/distributed_builds/local-machine.nix ]; fileSystems."/media/main-ssd" = { @@ -114,7 +110,7 @@ in { vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; }; - hardware.opengl = { + hardware.graphics = { enable = true; extraPackages = with pkgs; [ intel-media-driver