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

Compare commits

base: schmittlauch:67d34046316a39ef12f71195e2606b1163a12546
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:1619415a1b7e0a5a9faa16eeee3be38aa6dc8217
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "67d34046316a39ef12f71195e2606b1163a12546" and "1619415a1b7e0a5a9faa16eeee3be38aa6dc8217" have entirely different histories.
67d3404631 ... 1619415a1b

10 changed files with 59 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/default.nix
View file

@ -139,20 +139,18 @@ 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 = { services.xserver.enable = true;
enable = true; services.xserver.layout = "de";
xkb.layout = "de"; services.xserver.xkbOptions = "eurosign:e";
xkb.options = "eurosign:e";
};
# Enable touchpad support. # Enable touchpad support.
services.libinput.enable = true; services.xserver.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.displayManager.sddm.enable = true; services.xserver.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,17 +9,18 @@
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 generated
View file

@ -117,16 +117,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1706981411,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717976995, "lastModified": 1713946171,
"narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "315aa649ba307704db0b16c92f097a08a65ec955", "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717995329, "lastModified": 1715148395,
"narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1718160348, "lastModified": 1717196966,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,27 +258,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718208800, "lastModified": 1717159533,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1718307570, "lastModified": 1717452470,
"narHash": "sha256-Wkw/8Lkyd14op+zPx8XC/CRNyMMGC64m98aOWSEFmU4=", "narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ab6a53f69d8baa1b454fecffb271015588466e51", "rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717850719, "lastModified": 1710278050,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "rev": "35791f76524086ab4b785a33e4abbedfda64bd22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1705309234,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
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-24.05"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lanzaboote = { lanzaboote = {

6
home/common.nix
View file

@ -146,10 +146,4 @@
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
home.activation.reportChanges = config.lib.dag.entryAnywhere ''
if [[ -v oldGenPath ]]; then
run nix store diff-closures $oldGenPath $newGenPath
fi
'';
} }

2
home/desktop.nix
View file

@ -70,7 +70,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
#enableSshSupport = true; #enableSshSupport = true;
pinentryPackage = pkgs.pinentry-qt; pinentryFlavor = "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 = "CurlySlab"; }) (iosevka-bin.override { variant = "curly-slab"; })
config.nur.repos.schmittlauch.vollkorn config.nur.repos.schmittlauch.vollkorn
# TODO: humor-sans # TODO: humor-sans

1
home/modules/packages.nix
View file

@ -122,7 +122,6 @@ let
]; ];
pythonTools = with python3Packages; [ pythonTools = with python3Packages; [
python3 # to shadow old macOS python
notebook notebook
ipython ipython
pip pip

3
home/modules/vscodium.nix
View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
lib,
inputs, inputs,
config, config,
system, system,
@ -76,7 +75,7 @@
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
"editor.formatOnType" = false; "editor.formatOnType" = false;
}; };
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
"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 +1,11 @@
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=";
})
];
});
}