schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

update to NixOS 24.05

Browse source
This commit is contained in:
Trolli Schmittlauch 2024-06-11 07:36:07 +02:00
parent 732926fcd4
commit 563811c3ba
8 changed files with 51 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/default.nix
View file

@ -139,18 +139,20 @@ in
# FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver = {
services.xserver.layout = "de"; enable = true;
services.xserver.xkbOptions = "eurosign:e"; xkb.layout = "de";
xkb.options = "eurosign:e";
};
# Enable touchpad support. # Enable touchpad support.
services.xserver.libinput.enable = true; services.libinput.enable = true;
# while libinput also supports graphic tablets, enable more-specific wacom driver # while libinput also supports graphic tablets, enable more-specific wacom driver
services.xserver.wacom.enable = true; services.xserver.wacom.enable = true;
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.
services.xserver.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
# dconf required for several Gnome applications # dconf required for several Gnome applications

23
common/pipewire.nix
View file

@ -9,18 +9,17 @@
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
wireplumber.configPackages = [
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
'')
];
}; };
environment.systemPackages = [ pkgs.easyeffects ]; environment.systemPackages = [ pkgs.easyeffects ];
# TODO: can be done in a simpler way in 24.05, see wiki.nixos.org
environment.etc = {
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
'';
};
} }

52
flake.lock
View file

@ -117,16 +117,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706981411, "lastModified": 1717527182,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37", "rev": "845a5c4c073f74105022533907703441e0464bc3",
"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"
} }
@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713946171, "lastModified": 1717976995,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "rev": "315aa649ba307704db0b16c92f097a08a65ec955",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715148395, "lastModified": 1717995329,
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1717196966, "lastModified": 1717786204,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,27 +258,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1717159533, "lastModified": 1717952948,
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7",
"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"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1717452470, "lastModified": 1718051178,
"narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=", "narHash": "sha256-DFuR1xpIXuNjjBLbJ3wAZuITJDWDJctboTuEDNPOmNw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872", "rev": "c259254742217b3278f251c92945b49ac7f1d6a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710278050, "lastModified": 1717850719,
"narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=", "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "35791f76524086ab4b785a33e4abbedfda64bd22", "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -2,11 +2,11 @@
description = "NixOS system flake"; description = "NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
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";
}; };
lanzaboote = { lanzaboote = {

2
home/desktop.nix
View file

@ -70,7 +70,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
#enableSshSupport = true; #enableSshSupport = true;
pinentryFlavor = "qt"; pinentryPackage = pkgs.pinentry-qt;
}; };
programs.ssh = { programs.ssh = {

2
home/modules/fonts.nix
View file

@ -14,7 +14,7 @@
ubuntu_font_family ubuntu_font_family
twemoji-color-font twemoji-color-font
open-sans open-sans
(iosevka-bin.override { variant = "curly-slab"; }) (iosevka-bin.override { variant = "CurlySlab"; })
config.nur.repos.schmittlauch.vollkorn config.nur.repos.schmittlauch.vollkorn
# TODO: humor-sans # TODO: humor-sans

3
home/modules/vscodium.nix
View file

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
lib,
inputs, inputs,
config, config,
system, system,
@ -75,7 +76,7 @@
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
"editor.formatOnType" = false; "editor.formatOnType" = false;
}; };
"nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt"; "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"editor.fontSize" = 13; "editor.fontSize" = 13;
"editor.fontWeight" = "normal"; "editor.fontWeight" = "normal";
"git.detectSubmodulesLimit" = 30; "git.detectSubmodulesLimit" = 30;

12
packages/default.nix
View file

@ -1,11 +1 @@
final: prev: { final: prev: { }
power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs (old: {
patches = [
# patch for AMD pstate CPUs
(final.fetchpatch {
url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch";
sha256 = "sha256-CneqixlpZx9iZ0PM5MFIutsvnqKrLlM7FHOHUA/MK6g=";
})
];
});
}