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

desktop-2024-11-15-19-54-07

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-11-15 19:54:07 +01:00
parent 5cd58df5cc
commit 4af5f12181
9 changed files with 135 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backup/pantheon.nix
View File

@ -5,7 +5,7 @@
... ...
}: { }: {
programs = { programs = {
pantheon-tweaks.enable = true; # pantheon-tweaks.enable = true;
evolution.enable = true; evolution.enable = true;
}; };
@ -61,11 +61,12 @@
environment.pathsToLink = ["/libexec"]; environment.pathsToLink = ["/libexec"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome-online-accounts gnome-online-accounts
gnome.gnome-control-center gnome-control-center
gnome.gnome-system-monitor gnome-system-monitor
indicator-application-gtk3 indicator-application-gtk3
monitor monitor
gnome.eog pantheon-tweaks
eog
]; ];
environment.pantheon.excludePackages = with pkgs.pantheon; [ environment.pantheon.excludePackages = with pkgs.pantheon; [

12
configs/browser.nix
View File

@ -1,14 +1,6 @@
{ {pkgs, ...}: {
config,
pkgs,
lib,
...
}: {
programs.firefox = {
enable = true;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
firefox
brave brave
librewolf librewolf
tor-browser-bundle-bin tor-browser-bundle-bin

14
configs/plasma-wayland.nix → configs/plasma.nix
View File

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
inputs,
lib, lib,
... ...
}: { }: {
@ -24,7 +25,7 @@
environment = { environment = {
sessionVariables = { sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1"; # KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1";
}; };
plasma6.excludePackages = with pkgs.kdePackages; [ plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration plasma-browser-integration
@ -34,6 +35,7 @@
]; ];
systemPackages = with pkgs; [ systemPackages = with pkgs; [
inputs.kwin-effects-forceblur.packages.${pkgs.system}.default
kdePackages.ksshaskpass kdePackages.ksshaskpass
kdePackages.kde-gtk-config kdePackages.kde-gtk-config
kdePackages.breeze-gtk kdePackages.breeze-gtk
@ -57,6 +59,16 @@
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;
}; };
# defaultSession = "plasmax11";
};
xserver = {
enable = true;
excludePackages = [pkgs.xterm];
# xkb.layout = "us";
# # Enable touchpad support.
# updateDbusEnvironment = true;
}; };
libinput.enable = true; libinput.enable = true;

2
configs/user-gui.nix
View File

@ -27,7 +27,7 @@
noto-fonts-emoji noto-fonts-emoji
noto-fonts-extra noto-fonts-extra
inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd # inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
open-sans open-sans
stix-two stix-two

176
flake.lock generated
View File

@ -1,31 +1,5 @@
{ {
"nodes": { "nodes": {
"apple-fonts": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs-unstable"
],
"ny": "ny",
"sf-arabic": "sf-arabic",
"sf-compact": "sf-compact",
"sf-mono": "sf-mono",
"sf-pro": "sf-pro"
},
"locked": {
"lastModified": 1727490842,
"narHash": "sha256-SbEZEoBRHFf8dXyi72/zOsOYt+B5M2hHtVgkkmjt7tw=",
"owner": "Lyndeno",
"repo": "apple-fonts.nix",
"rev": "e30d6bb334e726db586a50f8b8ea0ac4cb61361f",
"type": "github"
},
"original": {
"owner": "Lyndeno",
"repo": "apple-fonts.nix",
"type": "github"
}
},
"chaotic": { "chaotic": {
"inputs": { "inputs": {
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
@ -34,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1731000594, "lastModified": 1731549423,
"narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=", "narHash": "sha256-856g6/DYtrC+O9yRlksrKaEWP3jDgJQ9UMmQx/twxBc=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef", "rev": "c37212a15dd0dc472d75df4c21c092d1cc9df897",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,24 +52,6 @@
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fw-fanctrl": { "fw-fanctrl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -126,11 +82,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1731535640,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1731535640,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +118,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1730403150, "lastModified": 1731242966,
"narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730962714, "lastModified": 1731227601,
"narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "93b525229c99fec0016db72a174f43b9d6237714", "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +199,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730919458, "lastModified": 1731403644,
"narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +215,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731139594,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +247,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731319897,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,21 +261,8 @@
"type": "github" "type": "github"
} }
}, },
"ny": {
"flake": false,
"locked": {
"narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
}
},
"root": { "root": {
"inputs": { "inputs": {
"apple-fonts": "apple-fonts",
"chaotic": "chaotic", "chaotic": "chaotic",
"fw-fanctrl": "fw-fanctrl", "fw-fanctrl": "fw-fanctrl",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -330,54 +273,6 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
"sf-arabic": {
"flake": false,
"locked": {
"narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
}
},
"sf-compact": {
"flake": false,
"locked": {
"narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
}
},
"sf-mono": {
"flake": false,
"locked": {
"narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
}
},
"sf-pro": {
"flake": false,
"locked": {
"narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=",
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
},
"original": {
"type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -386,11 +281,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1731213149, "lastModified": 1731364708,
"narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,24 +309,9 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,

8
flake.nix
View File

@ -19,10 +19,10 @@
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
apple-fonts = { # apple-fonts = {
url = "github:Lyndeno/apple-fonts.nix"; # url = "github:Lyndeno/apple-fonts.nix";
inputs.nixpkgs.follows = "nixpkgs-unstable"; # inputs.nixpkgs.follows = "nixpkgs-unstable";
}; # };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";

95
machine/desktop/configuration.nix
View File

@ -9,30 +9,44 @@
in { in {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
(self: super: { outputs.overlays.additions
linuxPackages_cachyos-rc = super.linuxPackages_cachyos-rc.extend (lpself: lpsuper: { outputs.overlays.modifications
xone = super.linuxPackages_cachyos-rc.xone.overrideAttrs (oldAttrs: rec { # (final: prev: {
version = "0-unstable-latest"; # pythonPackagesExtensions =
patches = [ # prev.pythonPackagesExtensions
# Fix build on kernel 6.11 # ++ [
# https://github.com/medusalix/xone/pull/48 # (python-final: python-prev: {
(pkgs.fetchpatch { # # sphinx = python-prev.sphinx.overridePythonAttrs (oldAttrs: {
name = "kernel-6.11.patch"; # # disabledTests =
url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch"; # # oldAttrs.disabledTests
hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8="; # # ++ [
}) # # "test_linkcheck_request_headers_default"
# # ]; # stupid timeout failure on busy machine
(pkgs.fetchpatch { # # });
name = "kernel-6.12.patch"; # # mechanize = python-prev.mechanize.overridePythonAttrs (oldAttrs: {
url = "https://github.com/medusalix/xone/commit/d88ea1e8b430d4b96134e43ca1892ac48334578e.patch"; # # disabledTests =
hash = "sha256-zQK1tuxu2ZmKxPO0amkfcT/RFBSkU2pWD0qhGyCCHXI="; # # oldAttrs.disabledTests
}) # # ++ [
# # "test/test_urllib2.py::HandlerTests::test_ftp"
# # "HandlerTests::test_ftp"
# # "test_ftp"
# # ];
# # });
# numpy = python-prev.numpy.overridePythonAttrs (oldAttrs: {
# disabledTests =
# oldAttrs.disabledTests
# ++ [
# "test_umath_accuracy"
# "TestAccuracy::test_validate_transcendentals"
# "test_validate_transcendentals"
# "test_structured_object_item_setting"
# "TestStructuredObjectRefcounting::test_structured_object_item_setting"
# ];
# });
# })
# ];
# })
]; ];
});
});
})
];
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -46,7 +60,7 @@ in {
../../configs/games.nix ../../configs/games.nix
../../configs/develop.nix ../../configs/develop.nix
../../configs/virtualisation.nix ../../configs/virtualisation.nix
../../configs/plasma-wayland.nix ../../configs/plasma.nix
../../configs/user-gui.nix ../../configs/user-gui.nix
../../configs/user.nix ../../configs/user.nix
]; ];
@ -82,12 +96,15 @@ in {
"big-parallel" "big-parallel"
"kvm" "kvm"
"gccarch-znver3" "gccarch-znver3"
# "gccarch-x86-64-v3"
]; ];
max-jobs = 4;
trusted-substituters = ["https://ai.cachix.org"]; trusted-substituters = ["https://ai.cachix.org"];
trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="]; trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="];
}; };
chaotic.nyx.cache.enable = false; # chaotic.nyx.cache.enable = false;
# nixpkgs.localSystem = { # nixpkgs.localSystem = {
# gcc.arch = "znver3"; # gcc.arch = "znver3";
@ -109,20 +126,13 @@ in {
tmp.useTmpfs = false; tmp.useTmpfs = false;
supportedFilesystems = ["btrfs"]; supportedFilesystems = ["btrfs"];
kernelPackages = pkgs.pkgs.linuxPackages_cachyos; kernelPackages = pkgs.linuxPackages_cachyos;
kernelParams = [ "clearcpuid=514" ];
kernelModules = ["nct6775"]; kernelModules = ["nct6775"];
extraModulePackages = with pkgs.pkgs.linuxPackages_cachyos; [ryzen-smu]; extraModulePackages = with pkgs.linuxPackages_cachyos; [ryzen-smu];
# kernelParams = [ "clearcpuid=514" ];
# kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
# kernelPatches = [{
# name = "fix problems with netfilter in 6.11.4";
# patch = ../../kernelpatches/fix-netfilter-6.11.4.patch;
# }];
initrd = { initrd = {
luks.devices = { luks.devices = {
root = { root = {
# Use https://nixos.wiki/wiki/Full_Disk_Encryption
device = "/dev/disk/by-uuid/cc43f1eb-49c3-41a6-9279-6766de3659e7"; device = "/dev/disk/by-uuid/cc43f1eb-49c3-41a6-9279-6766de3659e7";
allowDiscards = true; allowDiscards = true;
preLVM = true; preLVM = true;
@ -188,17 +198,13 @@ in {
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
inputs.kwin-effects-forceblur.packages.${pkgs.system}.default
lact lact
amdgpu_top amdgpu_top
# python3
python3 # python311Packages.tkinter
python311Packages.tkinter # snapraid
# mergerfs
snapraid
mergerfs
gimp gimp
clinfo clinfo
gparted gparted
mission-center mission-center
@ -206,9 +212,6 @@ in {
stressapptest stressapptest
ryzen-monitor-ng ryzen-monitor-ng
qdiskinfo qdiskinfo
# fan2go
# unigine-superposition
jdk jdk
]; ];
persistence."/persist" = { persistence."/persist" = {

2
machine/framework/configuration.nix
View File

@ -28,7 +28,7 @@ in {
../../configs/docker.nix ../../configs/docker.nix
../../configs/games.nix ../../configs/games.nix
../../configs/virtualisation.nix ../../configs/virtualisation.nix
../../configs/plasma-wayland.nix ../../configs/plasma.nix
../../configs/user-gui.nix ../../configs/user-gui.nix
../../configs/user.nix ../../configs/user.nix
]; ];

32
overlays/default.nix
View File

@ -7,6 +7,38 @@
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev: {
# pythonPackagesExtensions =
# prev.pythonPackagesExtensions
# ++ [
# (
# python-final: python-prev: {
# numpy = python-prev.numpy.overridePythonAttrs (oldAttrs: {
# # disabledTests = oldAttrs.disabledTests ++ ["test_validate_transcendentals"];
# postPatch = ''
# rm numpy/core/tests/test_cython.py
# rm numpy/core/tests/test_umath_accuracy.py
# rm numpy/core/tests/test_*.py
# '';
# doCheck = false;
# doInstallCheck = false;
# dontCheck = true;
# disabledTests = [
# "test_math"
# "test_umath_accuracy"
# "test_validate_transcendentals"
# ];
# });
# }
# )
# ];
# python = prev.python.override {
# packageOverrides = python-final: python-prev: {
# numpy = python-prev.numpy.overridePythonAttrs (oldAttrs: {
# disabledTests = oldAttrs.disabledTests ++ ["test_umath_accuracy" "TestAccuracy::test_validate_transcendentals" "test_validate_transcendentals"];
# });
# };
# };
# example = prev.example.overrideAttrs (oldAttrs: rec { # example = prev.example.overrideAttrs (oldAttrs: rec {
# ... # ...
# }); # });