felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: upgrade to NixOS 24.05

Browse source
This commit is contained in:
Felix Schröter 2024-05-26 11:31:08 +02:00
parent bf90bef6c0
commit a377290326
Signed by: felschr
GPG key ID: 671E39E6744C807D
13 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop/x11.nix
View file

@ -3,6 +3,6 @@
{ {
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.layout = "gb"; services.xserver.xkb.layout = "gb";
services.xserver.xkbOptions = "eurosign:e"; services.xserver.xkb.options = "eurosign:e";
} }

16
flake.lock
View file

@ -323,16 +323,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716711146, "lastModified": 1716716433,
"narHash": "sha256-CZ8vs7lX/qDqzJo/Vp/59q6yFxo99we2TSecUYJpeOc=", "narHash": "sha256-QNR7kydi+pnuSfCeVHjDJOId3YlRFYYQCRQ2rv2tuIU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "147c5eb5b39dee01c44feb6fca4632183e23e03b", "rev": "142d4365b53e3c0f967c1757fed4a26f9e1747f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -392,16 +392,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716361217, "lastModified": 1716542732,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

7
flake.nix
View file

@ -15,7 +15,7 @@ rec {
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -29,7 +29,7 @@ rec {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -116,12 +116,13 @@ rec {
src = ./.; src = ./.;
hooks = { hooks = {
nixfmt.enable = true; nixfmt.enable = true;
nixfmt.package = pkgs.nixfmt-classic;
shellcheck.enable = true; shellcheck.enable = true;
}; };
}; };
}; };
formatter = pkgs.nixfmt; formatter = pkgs.nixfmt-classic;
}; };
}; };
} }

2
home/browsers/firefoxAddons.nix
View file

@ -26,7 +26,7 @@ in {
meta = with lib; { meta = with lib; {
homepage = "https://www.zotero.org"; homepage = "https://www.zotero.org";
description = "Save references to Zotero from your web browser"; description = "Save references to Zotero from your web browser";
license = licenses.agpl3; license = licenses.agpl3Plus;
platforms = platforms.all; platforms = platforms.all;
}; };
}; };

2
home/editors/lsp.nix
View file

@ -29,7 +29,7 @@
nodePackages.eslint nodePackages.eslint
nodePackages.eslint_d nodePackages.eslint_d
statix statix
nixfmt nixfmt-rfc-style
buf buf
nodePackages.stylelint nodePackages.stylelint
nodePackages.prettier nodePackages.prettier

1
home/felschr-server.nix
View file

@ -13,7 +13,6 @@
sshKeys = [ "3C48489F3B0FBB44E72180D4B1D7541C201C9987" ]; sshKeys = [ "3C48489F3B0FBB44E72180D4B1D7541C201C9987" ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryFlavor = "curses";
}; };
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh

3
home/felschr-work.nix
View file

@ -23,7 +23,6 @@ with pkgs; {
sshKeys = [ "8A6213DCDAF86BD3A63549FCFDF71B2C92DAE02C" ]; sshKeys = [ "8A6213DCDAF86BD3A63549FCFDF71B2C92DAE02C" ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryFlavor = "gnome3";
}; };
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
@ -52,7 +51,7 @@ with pkgs; {
# dev & admin # dev & admin
pods pods
gaphor # gaphor
# security & privacy # security & privacy
authenticator authenticator

5
home/felschr.nix
View file

@ -29,7 +29,6 @@
]; ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryFlavor = "gnome3";
}; };
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
@ -63,7 +62,7 @@
# dev & admin # dev & admin
pods pods
gaphor # gaphor
# game dev # game dev
ldtk ldtk
@ -87,7 +86,7 @@
# yubioath-flutter # TODO conflicts with fluffychat # yubioath-flutter # TODO conflicts with fluffychat
magic-wormhole-rs magic-wormhole-rs
warp warp
onionshare-gui # onionshare-gui
transmission_4-gtk transmission_4-gtk
qbittorrent qbittorrent
fragments fragments

4
home/shell/zsh.nix
View file

@ -4,7 +4,9 @@ let shellAliases = import ./aliases.nix;
in { in {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true; # TODO is being renamed again in later 24.05 release
autosuggestion.enable = true;
# autosuggestions.enable = true;
autocd = true; autocd = true;
defaultKeymap = "viins"; defaultKeymap = "viins";
history.extended = true; history.extended = true;

4
modules/inadyn.nix
View file

@ -18,6 +18,10 @@ let
${ipCfg.extraConfig} ${ipCfg.extraConfig}
''; '';
in { in {
# NixOS 24.05 introduced an official module, but it works somewhat differently.
# For now I'll continue using my own module.
disabledModules = [ "services/networking/inadyn.nix" ];
options = { options = {
services.inadyn = { services.inadyn = {
enable = mkEnableOption (lib.mdDoc "inadyn DDNS client"); enable = mkEnableOption (lib.mdDoc "inadyn DDNS client");

2
system/networking.nix
View file

@ -8,7 +8,7 @@
services.resolved = { services.resolved = {
enable = true; enable = true;
# don't use fallback resolvers # don't use fallback resolvers
fallbackDns = config.networking.nameservers; fallbackDns = [ ];
}; };
services.nextdns = { services.nextdns = {

2
system/printing/default.nix
View file

@ -3,5 +3,5 @@
{ {
services.printing.enable = true; services.printing.enable = true;
services.avahi.enable = true; services.avahi.enable = true;
services.avahi.nssmdns = true; services.avahi.nssmdns4 = true;
} }

16
system/sound.nix
View file

@ -11,12 +11,12 @@
jack.enable = true; jack.enable = true;
}; };
environment.etc."wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' services.pipewire.wireplumber.extraConfig = {
bluez_monitor.properties = { "monitor.bluez.properties" = {
["bluez5.enable-sbc-xq"] = true, "bluez5.enable-sbc-xq" = true;
["bluez5.enable-msbc"] = true, "bluez5.enable-msbc" = true;
["bluez5.enable-hw-volume"] = true, "bluez5.enable-hw-volume" = true;
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
} };
''; };
} }