mynix/system
1
1
Fork 0
Code Issues 1 Pull requests Activity

flake.lock: nixpkgs 24.05 -> 24.11

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2024-11-30 23:46:01 +03:00
parent 500ee7c2f7
commit 9620db7300
Signed by: pleshevskiy
GPG key ID: 17041163DA10A9A2
10 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -199,16 +199,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1732466619,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -358,16 +358,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1729044727, "lastModified": 1732824227,
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

7
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; 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"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
hardware.url = "github:NixOS/nixos-hardware/master"; hardware.url = "github:NixOS/nixos-hardware/master";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
@ -19,7 +19,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-unstable = { home-manager-unstable = {
@ -178,8 +178,7 @@
] ]
++ extraModules ++ extraModules
++ [ ./modules/nixos ] ++ [ ./modules/nixos ]
++ [ ./hosts/${hostname}/configuration.nix ] ++ [ ./hosts/${hostname}/configuration.nix ];
++ [ "${inputs.nixpkgs-unstable}/nixos/modules/services/misc/renovate.nix" ];
}) })
(import ./hosts inputs); (import ./hosts inputs);
diskoConfigurations = { diskoConfigurations = {

2
hosts/home/users/jan.nix
View file

@ -49,7 +49,7 @@ in
# See: https://github.com/NixOS/nixpkgs/issues/325896 # See: https://github.com/NixOS/nixpkgs/issues/325896
# it's too old in the nixpkgs! # it's too old in the nixpkgs!
# See: https://github.com/NixOS/nixpkgs/issues/186570 # See: https://github.com/NixOS/nixpkgs/issues/186570
pkgs.cura # pkgs.cura
## electronics ## electronics
# kicad-small # kicad-small

8
hosts/tatos/services/wireguard/default.nix
View file

@ -43,14 +43,14 @@ in
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN # 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 # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
postUp = '' 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.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 = '' 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.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. # Path to the private key file.

1
modules/home-manager/programs/terminals/wezterm.nix
View file

@ -58,6 +58,7 @@ in
return { return {
font = wezterm.font("monospace"), font = wezterm.font("monospace"),
font_size = ${toString cfg.fontSize}, font_size = ${toString cfg.fontSize},
front_end = "WebGpu",
color_scheme = "myCoolTheme", color_scheme = "myCoolTheme",
hide_tab_bar_if_only_one_tab = true, hide_tab_bar_if_only_one_tab = true,
-- https://github.com/wez/wezterm/issues/4483 -- https://github.com/wez/wezterm/issues/4483

2
modules/nixos/configs/fonts.nix
View file

@ -12,7 +12,7 @@
fira-code-symbols fira-code-symbols
(nerdfonts.override { fonts = [ "FiraCode" ]; }) (nerdfonts.override { fonts = [ "FiraCode" ]; })
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
liberation_ttf liberation_ttf
mplus-outline-fonts.githubRelease mplus-outline-fonts.githubRelease

9
modules/nixos/configs/sound.nix
View file

@ -10,19 +10,18 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
sound = { services.pipewire.enable = false;
enable = true;
mediaKeys.enable = true; environment.systemPackages = [ pkgs.alsa-utils ];
};
hardware.pulseaudio = lib.mkMerge [ hardware.pulseaudio = lib.mkMerge [
{ {
enable = true; enable = true;
package = pkgs.pulseaudioFull; package = pkgs.pulseaudioFull;
support32Bit = true;
} }
(lib.mkIf cfg.systemWide { (lib.mkIf cfg.systemWide {
systemWide = true; systemWide = true;
support32Bit = true;
tcp = { tcp = {
enable = true; enable = true;
anonymousClients.allowedIpRanges = [ "127.0.0.1" ]; anonymousClients.allowedIpRanges = [ "127.0.0.1" ];

2
modules/nixos/programs/pass.nix
View file

@ -15,6 +15,6 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ pass ]; environment.systemPackages = [ pass ];
services.passSecretService.enable = true; # services.passSecretService.enable = true;
}; };
} }

12
modules/nixos/services/vpn/wireguard/client.nix
View file

@ -51,18 +51,18 @@ in
privateKeyFile = cfg.privateKeyFile; privateKeyFile = cfg.privateKeyFile;
postUp = '' postUp = ''
addr=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` addr=`${pkgs.iproute2}/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}'` interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'`
'' + lib.concatLines (map '' + 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 addrsViaDefaultInterface
); );
preDown = '' preDown = ''
addr=`${pkgs.iproute}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $3; exit}'` addr=`${pkgs.iproute2}/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}'` interface=`${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}'`
'' + lib.concatLines (map '' + 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 addrsViaDefaultInterface
); );

2
users/jan/default.nix
View file

@ -137,10 +137,12 @@
}; };
}; };
/*
services.pass-secret-service = lib.mkIf config.local.programs.pass.enable { services.pass-secret-service = lib.mkIf config.local.programs.pass.enable {
enable = true; enable = true;
storePath = config.home-manager.users.jan.home.sessionVariables.PASSWORD_STORE_DIR; storePath = config.home-manager.users.jan.home.sessionVariables.PASSWORD_STORE_DIR;
}; };
*/
home.sessionVariables = lib.mkIf config.local.programs.pass.enable { home.sessionVariables = lib.mkIf config.local.programs.pass.enable {
PASSWORD_STORE_DIR = "${config.home-manager.users.jan.xdg.dataHome}/pass/store"; PASSWORD_STORE_DIR = "${config.home-manager.users.jan.xdg.dataHome}/pass/store";
}; };