fix nixos upgrade warnings

- upgrade to 24.11
This commit is contained in:
Sam 2025-01-09 17:33:08 +00:00
parent 9550f8b704
commit afb138aa94
12 changed files with 93 additions and 91 deletions

View File

@ -56,28 +56,28 @@
! dwm ! dwm
dwm.borderpx: 6 dwm.borderpx: 6
dwm.font: monospace:size=14 dwm.font: monospace:size=14
dwm.col_base00: #${config.colorScheme.colors.base00} dwm.col_base00: #${config.colorScheme.palette.base00}
dwm.col_base03: #${config.colorScheme.colors.base03} dwm.col_base03: #${config.colorScheme.palette.base03}
dwm.col_base04: #${config.colorScheme.colors.base04} dwm.col_base04: #${config.colorScheme.palette.base04}
dwm.col_base05: #${config.colorScheme.colors.base05} dwm.col_base05: #${config.colorScheme.palette.base05}
dwm.col_base08: #${config.colorScheme.colors.base08} dwm.col_base08: #${config.colorScheme.palette.base08}
dwm.col_base0B: #${config.colorScheme.colors.base0B} dwm.col_base0B: #${config.colorScheme.palette.base0B}
! dmenu ! dmenu
dmenu.font: monospace:size=14 dmenu.font: monospace:size=14
dmenu.font2: NotoColorEmoji:pixelsize=44:antialias=true:autohint=true dmenu.font2: NotoColorEmoji:pixelsize=44:antialias=true:autohint=true
dmenu.topbar: 1 dmenu.topbar: 1
dmenu.normfgcolor: #${config.colorScheme.colors.base05} dmenu.normfgcolor: #${config.colorScheme.palette.base05}
dmenu.normbgcolor: #${config.colorScheme.colors.base03} dmenu.normbgcolor: #${config.colorScheme.palette.base03}
dmenu.selfgcolor: #${config.colorScheme.colors.base00} dmenu.selfgcolor: #${config.colorScheme.palette.base00}
dmenu.selbgcolor: #${config.colorScheme.colors.base0B} dmenu.selbgcolor: #${config.colorScheme.palette.base0B}
Nsxiv.window.background: #${config.colorScheme.colors.base03} Nsxiv.window.background: #${config.colorScheme.palette.base03}
Nsxiv.window.foreground: #${config.colorScheme.colors.base05} Nsxiv.window.foreground: #${config.colorScheme.palette.base05}
Nsxiv.mark.foreground: #${config.colorScheme.colors.base08} Nsxiv.mark.foreground: #${config.colorScheme.palette.base08}
Nsxiv.bar.background: #${config.colorScheme.colors.base00} Nsxiv.bar.background: #${config.colorScheme.palette.base00}
Nsxiv.bar.foreground: #${config.colorScheme.colors.base05} Nsxiv.bar.foreground: #${config.colorScheme.palette.base05}
Nsxiv.bar.font: monospace:size=12 Nsxiv.bar.font: monospace:size=12

View File

@ -1,4 +1,4 @@
{ pkgs, inputs, outputs, lib, ... }: { pkgs, inputs, outputs, ... }:
{ {
imports = [ imports = [
inputs.nix-colors.homeManagerModules.default inputs.nix-colors.homeManagerModules.default
@ -7,7 +7,7 @@
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.nur.overlay inputs.nur.overlays.default
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
]; ];

View File

@ -1,6 +1,7 @@
{ {
programs.nixvim.plugins.conform-nvim = { programs.nixvim.plugins.conform-nvim = {
enable = true; enable = true;
settings = {
notifyOnError = true; notifyOnError = true;
logLevel = "debug"; logLevel = "debug";
formattersByFt = { formattersByFt = {
@ -20,6 +21,7 @@
"shfmt" "shfmt"
]; ];
}; };
};
# formatters = { # formatters = {
# sql-formatter = { # sql-formatter = {
# command = "sql-formatter"; # command = "sql-formatter";

View File

@ -26,7 +26,7 @@ in
marksman = {enable = true;}; marksman = {enable = true;};
ccls = {enable = true;}; ccls = {enable = true;};
cssls = {enable = true;}; cssls = {enable = true;};
ts-ls = {enable = true;}; ts_ls = {enable = true;};
}; };
keymaps = { keymaps = {
lspBuf = { lspBuf = {

View File

@ -1,14 +1,17 @@
{ {
programs.nixvim.plugins.lualine = { programs.nixvim.plugins.lualine = {
enable = true; enable = true;
settings = {
options = {
theme = "auto"; theme = "auto";
sectionSeparators = {
left = "";
right = "";
};
componentSeparators = { componentSeparators = {
left = ""; left = "";
right = ""; right = "";
}; };
sectionSeparators = {
left = "";
right = "";
}; };
sections = { sections = {
lualine_a = ["mode"]; lualine_a = ["mode"];
@ -19,4 +22,5 @@
lualine_z = ["locations"]; lualine_z = ["locations"];
}; };
}; };
};
} }

View File

@ -14,9 +14,9 @@
pkgs.xfce.thunar pkgs.xfce.thunar
pkgs.kcolorchooser pkgs.kcolorchooser
pkgs.zotero pkgs.zotero
pkgs.transmission pkgs.transmission_3
pkgs.mpv pkgs.mpv
pkgs.gnome.simple-scan pkgs.simple-scan
pkgs.pandoc pkgs.pandoc
pkgs.texlive.combined.scheme-small pkgs.texlive.combined.scheme-small
pkgs.libreoffice-fresh pkgs.libreoffice-fresh

View File

@ -2,11 +2,11 @@
{ {
services.mako = { services.mako = {
enable = true; enable = true;
backgroundColor = "#${config.colorScheme.colors.base00}"; backgroundColor = "#${config.colorScheme.palette.base00}";
borderColor = "#${config.colorScheme.colors.base0D}"; borderColor = "#${config.colorScheme.palette.base0D}";
borderRadius = 5; borderRadius = 5;
borderSize = 2; borderSize = 2;
textColor = "#${config.colorScheme.colors.base05}"; textColor = "#${config.colorScheme.palette.base05}";
layer = "overlay"; layer = "overlay";
}; };
} }

View File

@ -131,7 +131,7 @@
offset = "15x60"; offset = "15x60";
origin = "top-right"; origin = "top-right";
frame_color = "#${config.colorScheme.colors.base0B}"; frame_color = "#${config.colorScheme.palette.base0B}";
frame_width = 2; frame_width = 2;
# Browser for opening urls in context menu. # Browser for opening urls in context menu.
@ -157,21 +157,21 @@
}; };
urgency_low = { urgency_low = {
background = "#${config.colorScheme.colors.base03}"; background = "#${config.colorScheme.palette.base03}";
foreground = "#${config.colorScheme.colors.base05}"; foreground = "#${config.colorScheme.palette.base05}";
timeout = 15; timeout = 15;
}; };
urgency_normal = { urgency_normal = {
background = "#${config.colorScheme.colors.base03}"; background = "#${config.colorScheme.palette.base03}";
foreground = "#${config.colorScheme.colors.base05}"; foreground = "#${config.colorScheme.palette.base05}";
timeout = 15; timeout = 15;
}; };
urgency_critical = { urgency_critical = {
background = "#${config.colorScheme.colors.base08}"; background = "#${config.colorScheme.palette.base08}";
foreground = "#${config.colorScheme.colors.base05}"; foreground = "#${config.colorScheme.palette.base05}";
frame_color = "#${config.colorScheme.colors.base05}"; frame_color = "#${config.colorScheme.palette.base05}";
timeout = 0; timeout = 0;
}; };
}; };

View File

@ -22,8 +22,8 @@
extraConfig = extraConfig =
let 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)}"; 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)"; active = "rgba(${config.colorScheme.palette.base08}ee)";
inactive = "rgba(${config.colorScheme.colors.base0C}ee)"; inactive = "rgba(${config.colorScheme.palette.base0C}ee)";
in in
'' ''

View File

@ -17,7 +17,7 @@
./common/optional/desktop/common/themes/standard-dark.nix ./common/optional/desktop/common/themes/standard-dark.nix
./common/optional/notes.nix ./common/optional/notes.nix
./common/optional/yazi.nix ./common/optional/yazi.nix
./common/optional/transmission.nix ./common/optional/transmission_3.nix
./common/optional/desktop/common/xdg ./common/optional/desktop/common/xdg
]; ];
@ -58,28 +58,28 @@
! dwm ! dwm
dwm.borderpx: 3 dwm.borderpx: 3
dwm.font: monospace:size=12 dwm.font: monospace:size=12
dwm.col_base00: #${config.colorScheme.colors.base00} dwm.col_base00: #${config.colorScheme.palette.base00}
dwm.col_base03: #${config.colorScheme.colors.base03} dwm.col_base03: #${config.colorScheme.palette.base03}
dwm.col_base04: #${config.colorScheme.colors.base04} dwm.col_base04: #${config.colorScheme.palette.base04}
dwm.col_base05: #${config.colorScheme.colors.base05} dwm.col_base05: #${config.colorScheme.palette.base05}
dwm.col_base08: #${config.colorScheme.colors.base08} dwm.col_base08: #${config.colorScheme.palette.base08}
dwm.col_base0B: #${config.colorScheme.colors.base0B} dwm.col_base0B: #${config.colorScheme.palette.base0B}
! dmenu ! dmenu
dmenu.font: monospace:size=12 dmenu.font: monospace:size=12
dmenu.font2: NotoColorEmoji:pixelsize=22:antialias=true:autohint=true dmenu.font2: NotoColorEmoji:pixelsize=22:antialias=true:autohint=true
dmenu.topbar: 1 dmenu.topbar: 1
dmenu.normfgcolor: #${config.colorScheme.colors.base05} dmenu.normfgcolor: #${config.colorScheme.palette.base05}
dmenu.normbgcolor: #${config.colorScheme.colors.base03} dmenu.normbgcolor: #${config.colorScheme.palette.base03}
dmenu.selfgcolor: #${config.colorScheme.colors.base00} dmenu.selfgcolor: #${config.colorScheme.palette.base00}
dmenu.selbgcolor: #${config.colorScheme.colors.base0B} dmenu.selbgcolor: #${config.colorScheme.palette.base0B}
Nsxiv.window.background: #${config.colorScheme.colors.base03} Nsxiv.window.background: #${config.colorScheme.palette.base03}
Nsxiv.window.foreground: #${config.colorScheme.colors.base05} Nsxiv.window.foreground: #${config.colorScheme.palette.base05}
Nsxiv.mark.foreground: #${config.colorScheme.colors.base08} Nsxiv.mark.foreground: #${config.colorScheme.palette.base08}
Nsxiv.bar.background: #${config.colorScheme.colors.base00} Nsxiv.bar.background: #${config.colorScheme.palette.base00}
Nsxiv.bar.foreground: #${config.colorScheme.colors.base05} Nsxiv.bar.foreground: #${config.colorScheme.palette.base05}
Nsxiv.bar.font: monospace:size=12 Nsxiv.bar.font: monospace:size=12
''; '';
} }

View File

@ -73,7 +73,7 @@ in {
enable = true; enable = true;
enableJIT = true; enableJIT = true;
package = pkgs.postgresql_16; package = pkgs.postgresql_16;
extraPlugins = with pkgs.postgresql_16.pkgs; [ postgis ]; extensions = with pkgs.postgresql_16.pkgs; [postgis];
enableTCPIP = true; enableTCPIP = true;
settings = { settings = {
max_worker_processes = "12"; max_worker_processes = "12";

View File

@ -59,13 +59,9 @@ in {
../common/optional/restic-backup.nix ../common/optional/restic-backup.nix
../common/optional/nixos-containers/backup-server.nix ../common/optional/nixos-containers/backup-server.nix
<<<<<<< HEAD
# Build nix derivations on remote machine # # Build nix derivations on remote machine
======= # ../common/optional/distributed_builds/local-machine.nix
>>>>>>> distributed-builds
../common/optional/distributed_builds/local-machine.nix
]; ];
fileSystems."/media/main-ssd" = { fileSystems."/media/main-ssd" = {
@ -114,7 +110,7 @@ in {
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
}; };
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-media-driver