chore: format code

This commit is contained in:
Jacob Bachmann 2024-01-13 15:45:43 +01:00
parent db4c3408de
commit b77debd170
Signed by: bchmnn
GPG key ID: 732A612DAD28067D
9 changed files with 41 additions and 37 deletions

View file

@ -1,12 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config { config, lib, modulesPath, ... }:
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
@ -17,7 +12,8 @@
boot.resumeDevice = "/dev/disk/by-label/ROOT"; boot.resumeDevice = "/dev/disk/by-label/ROOT";
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/ROOT"; {
device = "/dev/disk/by-label/ROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
@ -25,25 +21,29 @@
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/b7a904b2-cceb-47fc-832a-701e386a95db"; boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/b7a904b2-cceb-47fc-832a-701e386a95db";
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-label/ROOT"; {
device = "/dev/disk/by-label/ROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" ]; options = [ "subvol=@home" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-label/ROOT"; {
device = "/dev/disk/by-label/ROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" ]; options = [ "subvol=@home" ];
}; };
fileSystems."/swap" = fileSystems."/swap" =
{ device = "/dev/disk/by-label/ROOT"; {
device = "/dev/disk/by-label/ROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" ]; options = [ "subvol=@home" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/EFI"; {
device = "/dev/disk/by-label/EFI";
fsType = "vfat"; fsType = "vfat";
}; };

View file

@ -1,3 +1,3 @@
{ config, ... }: { { config, ... }: {
programs.kdeconnect.enable = config.bchmnn.gui.enable; programs.kdeconnect.enable = config.bchmnn.gui.enable;
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: let { pkgs, ... }:
let
nav = { nav = {
h = "left"; h = "left";
j = "down"; j = "down";
@ -24,7 +25,8 @@
o = "Ö"; o = "Ö";
u = "Ü"; u = "Ü";
}; };
in { in
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
keyd keyd
]; ];

View file

@ -6,8 +6,8 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix {}).driver; mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix { }).driver;
mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix {}).cupswrapper; mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix { }).cupswrapper;
}) })
]; ];

View file

@ -1,12 +1,12 @@
{ lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) { { lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) {
/* /*
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;
}; };
programs.sway.enable = true; programs.sway.enable = true;
*/ */
} }

View file

@ -21,7 +21,8 @@ let
}; };
reldir = "opt/brother/Printers/${model}/"; reldir = "opt/brother/Printers/${model}/";
in rec { in
rec {
driver = pkgsi686Linux.stdenv.mkDerivation rec { driver = pkgsi686Linux.stdenv.mkDerivation rec {
inherit src version; inherit src version;
name = "${model}drv-${version}"; name = "${model}drv-${version}";
@ -31,18 +32,18 @@ in rec {
unpackPhase = "dpkg-deb -x $src $out"; unpackPhase = "dpkg-deb -x $src $out";
installPhase = '' installPhase = ''
dir="$out/${reldir}" dir="$out/${reldir}"
substituteInPlace $dir/lpd/filter_${model} \ substituteInPlace $dir/lpd/filter_${model} \
--replace /usr/bin/perl ${perl}/bin/perl \ --replace /usr/bin/perl ${perl}/bin/perl \
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #" --replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/lpd/filter_${model} \ wrapProgram $dir/lpd/filter_${model} \
--prefix PATH : ${lib.makeBinPath [ --prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which coreutils ghostscript gnugrep gnused which
]} ]}
# need to use i686 glibc here, these are 32bit proprietary binaries # need to use i686 glibc here, these are 32bit proprietary binaries
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$dir/lpd/brmfcl3750cdwfilter $dir/lpd/brmfcl3750cdwfilter
''; '';
meta = { meta = {

View file

@ -2,8 +2,8 @@
dconf.settings = lib.mkIf nixosConfig.bchmnn.virtualisation.enable { dconf.settings = lib.mkIf nixosConfig.bchmnn.virtualisation.enable {
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"]; autoconnect = [ "qemu:///system" ];
uris = ["qemu:///system"]; uris = [ "qemu:///system" ];
}; };
}; };

View file

@ -5,7 +5,8 @@ let
# common = (import ../common.nix) { pkgs = pkgs; lib = lib; }; # common = (import ../common.nix) { pkgs = pkgs; lib = lib; };
common = (import ../common.nix) { inherit pkgs; inherit lib; }; common = (import ../common.nix) { inherit pkgs; inherit lib; };
in { in
{
imports = [ imports = [
./autorandr.nix ./autorandr.nix

View file

@ -1,4 +1,4 @@
{ pkgs , cmake , qttools , qtsvg , kguiaddons , wrapQtAppsHook }: { pkgs, cmake, qttools, qtsvg, kguiaddons, wrapQtAppsHook }:
# https://ryantm.github.io/nixpkgs/using/overrides/ # https://ryantm.github.io/nixpkgs/using/overrides/
pkgs.flameshot.overrideAttrs (finalAttrs: previousAttrs: { pkgs.flameshot.overrideAttrs (finalAttrs: previousAttrs: {