Queen is broken but this might update bcachefs and fix those headaches

This commit is contained in:
Lillian Violet 2024-06-21 23:59:28 +02:00
parent d8965c551c
commit 6776dd3740
7 changed files with 710 additions and 285 deletions

File diff suppressed because it is too large Load diff

View file

@ -5,13 +5,24 @@
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# Disko for declaratively setting disk formatting
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
bcachefs-tools.url = "github:koverstreet/bcachefs-tools";
bcachefs-tools = {
url = "github:koverstreet/bcachefs-tools";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
flake-parts = {
url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
inputs.nixpkgs-lib.follows = "nixpkgs";
};
# Nixos generators for creating ISOs
nixos-generators = {
@ -86,6 +97,7 @@
outputs = {
self,
nixpkgs,
nixpkgs-edge,
nixos-generators,
catppuccin,
disko,
@ -102,14 +114,21 @@
...
} @ inputs: let
inherit (self) outputs;
inherit (inputs) nixpkgs-edge;
# Supported systems for your flake packages, shell, etc.
systems = [
"armv7l-linux"
"x86_64-linux"
];
# This is a function that generates an attribute by calling a function you
# pass to it, with each system as an argument
forAllSystems = nixpkgs.lib.genAttrs systems;
pkgs-edge = import nixpkgs-edge {
system = "x86_64-linux";
config = {
allowUnfree = true;
allowUnfreePredicate = _: true;
};
};
in {
# Your custom packages
# Accessible through 'nix build', 'nix shell', etc
@ -139,6 +158,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
nixos-hardware.nixosModules.dell-xps-13-7390
# > Our main nixos configuration file <
./nixos/hosts/EDI/configuration.nix
@ -161,6 +181,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
# > Our main nixos configuration file <
./nixos/hosts/GLaDOS/configuration.nix
sops-nix.nixosModules.sops
@ -182,6 +203,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
# > Our main nixos configuration file <
./nixos/hosts/queen/configuration.nix
sops-nix.nixosModules.sops
@ -200,6 +222,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
# > Our main nixos configuration file <
./nixos/hosts/shodan/configuration.nix
sops-nix.nixosModules.sops
@ -221,6 +244,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./nixos/hosts/iso/configuration.nix
@ -241,6 +265,7 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
{_module.args = {inherit pkgs-edge;};}
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./nixos/hosts/iso_server/configuration.nix

View file

@ -6,6 +6,7 @@
lib,
config,
pkgs,
pkgs-edge,
...
}: {
imports = [
@ -17,15 +18,7 @@
# You can add overlays here
overlays = [
(final: prev: {
bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs.overrideAttrs (oldAttrs: {
patches = [
(pkgs.fetchpatch {
# FIXME: remove when https://github.com/koverstreet/bcachefs-tools/pull/263 is merged
url = "https://github.com/koverstreet/bcachefs-tools/pull/263.patch";
hash = "sha256-M5FhW5ZWQdfXbLzb/Rr+rNtLLPRIdlOBnxQzDpnoyyw=";
})
];
});
bcachefs-tools = pkgs-edge.bcachefs-tools;
})
# Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions
@ -42,58 +35,63 @@
programs.nix-index.enable = true;
programs.nix-index-database.comma.enable = true;
environment.systemPackages = with pkgs; [
# Custom tools
dvd
dvt
servo
restart
environment.systemPackages =
(with pkgs; [
# Custom tools
dvd
dvt
servo
restart
# System tools
aha
bcachefs-tools
clinfo
comma
direnv
git-filter-repo
gnupg
pciutils
podman
podman-compose
sbctl
tpm2-tools
tpm2-tss
virtualgl
vulkan-tools
waydroid
waypipe
wayland-utils
xwaylandvideobridge
yubikey-personalization
zsh
# System tools
aha
bcachefs-tools
clinfo
comma
direnv
git-filter-repo
gnupg
pciutils
podman
podman-compose
sbctl
tpm2-tools
tpm2-tss
virtualgl
vulkan-tools
waydroid
waypipe
wayland-utils
xwaylandvideobridge
yubikey-personalization
zsh
# KDE/QT
krunner-translator
kdePackages.discover
kdePackages.kcalc
kdePackages.kdepim-addons
kdePackages.kirigami
kdePackages.kdeconnect-kde
# kdePackages.krunner-ssh
# kdePackages.krunner-symbols
kdePackages.packagekit-qt
kdePackages.plasma-pa
kdePackages.sddm-kcm
kdePackages.dolphin-plugins
libportal-qt5
libportal
# KDE/QT
krunner-translator
kdePackages.discover
kdePackages.kcalc
kdePackages.kdepim-addons
kdePackages.kirigami
kdePackages.kdeconnect-kde
# kdePackages.krunner-ssh
# kdePackages.krunner-symbols
kdePackages.packagekit-qt
kdePackages.plasma-pa
kdePackages.sddm-kcm
kdePackages.dolphin-plugins
libportal-qt5
libportal
# User tools
noisetorch
qjackctl
wireplumber
rustdesk
];
# User tools
noisetorch
qjackctl
wireplumber
rustdesk
])
++ (with pkgs-edge; [
# list of latest packages from nixpkgs master
# Can be used to install latest version of some packages
]);
programs.direnv = {
enable = true;
@ -108,7 +106,7 @@
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
extest.enable = true;
};
hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses
# Set your time zone.
time.timeZone = "Europe/Amsterdam";

View file

@ -38,11 +38,11 @@
services.xserver.videoDrivers = ["amdgpu"];
# Add vulkan support to GPU
hardware.opengl.extraPackages = with pkgs; [
hardware.graphics.extraPackages = with pkgs; [
amdvlk
];
# For 32 bit applications
hardware.opengl.extraPackages32 = with pkgs; [
hardware.graphics.extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];

View file

@ -75,8 +75,8 @@
onlyoffice-documentserver
phanpy
postgresql_16
python3
python311Packages.nbconvert
python310
python310Packages.nbconvert
jupyter
rabbitmq-server
roundcube

View file

@ -4,6 +4,7 @@
lib,
config,
pkgs,
pkgs-edge,
...
}: {
imports = [

View file

@ -4,6 +4,7 @@
lib,
config,
pkgs,
pkgs-edge,
...
}: {
nixpkgs = {
@ -15,34 +16,40 @@
];
};
environment.systemPackages = with pkgs; [
# Custom tools
rebuild
rebuild-no-inhibit
install-nix
update
upgrade
simple-completion-language-server
environment.systemPackages =
(with pkgs; [
# Custom tools
rebuild
rebuild-no-inhibit
install-nix
update
upgrade
simple-completion-language-server
# System tools
age
alejandra
e2fsprogs
git
git-filter-repo
helix
home-manager
htop
killall
oh-my-zsh
rsync
tre-command
wget
zsh
tldr
# System tools
age
alejandra
e2fsprogs
git
git-filter-repo
helix
home-manager
htop
killall
oh-my-zsh
rsync
tre-command
wget
zsh
tldr
# System libraries
])
++ (with pkgs-edge; [
# list of latest packages from nixpkgs master
# Can be used to install latest version of some packages
]);
# System libraries
];
fonts = {
packages = with pkgs; [
cantarell-fonts