From 9620db73005cfb13fda3d535b9376de6df7cb18d Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Sat, 30 Nov 2024 23:46:01 +0300 Subject: [PATCH] flake.lock: nixpkgs 24.05 -> 24.11 --- flake.lock | 16 ++++++++-------- flake.nix | 7 +++---- hosts/home/users/jan.nix | 2 +- hosts/tatos/services/wireguard/default.nix | 8 ++++---- .../home-manager/programs/terminals/wezterm.nix | 1 + modules/nixos/configs/fonts.nix | 2 +- modules/nixos/configs/sound.nix | 9 ++++----- modules/nixos/programs/pass.nix | 2 +- modules/nixos/services/vpn/wireguard/client.nix | 12 ++++++------ users/jan/default.nix | 2 ++ 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index bdfbf6d..85c1b4a 100644 --- a/flake.lock +++ b/flake.lock @@ -199,16 +199,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -358,16 +358,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3787549..372f68a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; hardware.url = "github:NixOS/nixos-hardware/master"; impermanence.url = "github:nix-community/impermanence"; @@ -19,7 +19,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager-unstable = { @@ -178,8 +178,7 @@ ] ++ extraModules ++ [ ./modules/nixos ] - ++ [ ./hosts/${hostname}/configuration.nix ] - ++ [ "${inputs.nixpkgs-unstable}/nixos/modules/services/misc/renovate.nix" ]; + ++ [ ./hosts/${hostname}/configuration.nix ]; }) (import ./hosts inputs); diskoConfigurations = { diff --git a/hosts/home/users/jan.nix b/hosts/home/users/jan.nix index 8351aad..b59b055 100644 --- a/hosts/home/users/jan.nix +++ b/hosts/home/users/jan.nix @@ -49,7 +49,7 @@ in # See: https://github.com/NixOS/nixpkgs/issues/325896 # it's too old in the nixpkgs! # See: https://github.com/NixOS/nixpkgs/issues/186570 - pkgs.cura + # pkgs.cura ## electronics # kicad-small diff --git a/hosts/tatos/services/wireguard/default.nix b/hosts/tatos/services/wireguard/default.nix index f0f2a3e..a53293c 100644 --- a/hosts/tatos/services/wireguard/default.nix +++ b/hosts/tatos/services/wireguard/default.nix @@ -43,14 +43,14 @@ in # This allows the wireguard server to route your traffic to the internet and hence be like a VPN # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients postUp = '' - interface=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` + interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -o $interface -j MASQUERADE - ${pkgs.iproute}/bin/ip rule add from ${tatosData.addr} table main + ${pkgs.iproute2}/bin/ip rule add from ${tatosData.addr} table main ''; preDown = '' - interface=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` + interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -o $interface -j MASQUERADE - ${pkgs.iproute}/bin/ip rule del from ${tatosData.addr} table main + ${pkgs.iproute2}/bin/ip rule del from ${tatosData.addr} table main ''; # Path to the private key file. diff --git a/modules/home-manager/programs/terminals/wezterm.nix b/modules/home-manager/programs/terminals/wezterm.nix index bfb583d..095acb8 100644 --- a/modules/home-manager/programs/terminals/wezterm.nix +++ b/modules/home-manager/programs/terminals/wezterm.nix @@ -58,6 +58,7 @@ in return { font = wezterm.font("monospace"), font_size = ${toString cfg.fontSize}, + front_end = "WebGpu", color_scheme = "myCoolTheme", hide_tab_bar_if_only_one_tab = true, -- https://github.com/wez/wezterm/issues/4483 diff --git a/modules/nixos/configs/fonts.nix b/modules/nixos/configs/fonts.nix index 5f835b3..32b81ed 100644 --- a/modules/nixos/configs/fonts.nix +++ b/modules/nixos/configs/fonts.nix @@ -12,7 +12,7 @@ fira-code-symbols (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf mplus-outline-fonts.githubRelease diff --git a/modules/nixos/configs/sound.nix b/modules/nixos/configs/sound.nix index 6242f7e..eaafe58 100644 --- a/modules/nixos/configs/sound.nix +++ b/modules/nixos/configs/sound.nix @@ -10,19 +10,18 @@ in }; config = lib.mkIf cfg.enable { - sound = { - enable = true; - mediaKeys.enable = true; - }; + services.pipewire.enable = false; + + environment.systemPackages = [ pkgs.alsa-utils ]; hardware.pulseaudio = lib.mkMerge [ { enable = true; package = pkgs.pulseaudioFull; + support32Bit = true; } (lib.mkIf cfg.systemWide { systemWide = true; - support32Bit = true; tcp = { enable = true; anonymousClients.allowedIpRanges = [ "127.0.0.1" ]; diff --git a/modules/nixos/programs/pass.nix b/modules/nixos/programs/pass.nix index 5efcdfd..d130e64 100644 --- a/modules/nixos/programs/pass.nix +++ b/modules/nixos/programs/pass.nix @@ -15,6 +15,6 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ pass ]; - services.passSecretService.enable = true; + # services.passSecretService.enable = true; }; } diff --git a/modules/nixos/services/vpn/wireguard/client.nix b/modules/nixos/services/vpn/wireguard/client.nix index 32661ec..4cea85e 100644 --- a/modules/nixos/services/vpn/wireguard/client.nix +++ b/modules/nixos/services/vpn/wireguard/client.nix @@ -51,18 +51,18 @@ in privateKeyFile = cfg.privateKeyFile; postUp = '' - addr=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` - interface=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` + addr=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` + interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` '' + lib.concatLines (map - (addr: "${pkgs.iproute}/bin/ip route add ${addr} via $addr dev $interface || true") + (addr: "${pkgs.iproute2}/bin/ip route add ${addr} via $addr dev $interface || true") addrsViaDefaultInterface ); preDown = '' - addr=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` - interface=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` + addr=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` + interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'` '' + lib.concatLines (map - (addr: "${pkgs.iproute}/bin/ip route del ${addr} via $addr dev $interface || true") + (addr: "${pkgs.iproute2}/bin/ip route del ${addr} via $addr dev $interface || true") addrsViaDefaultInterface ); diff --git a/users/jan/default.nix b/users/jan/default.nix index d20ed93..0cd9800 100644 --- a/users/jan/default.nix +++ b/users/jan/default.nix @@ -137,10 +137,12 @@ }; }; + /* services.pass-secret-service = lib.mkIf config.local.programs.pass.enable { enable = true; storePath = config.home-manager.users.jan.home.sessionVariables.PASSWORD_STORE_DIR; }; + */ home.sessionVariables = lib.mkIf config.local.programs.pass.enable { PASSWORD_STORE_DIR = "${config.home-manager.users.jan.xdg.dataHome}/pass/store"; };