diff --git a/hosts/T430/hardware.nix b/hosts/T430/hardware.nix index b3ee667..119ed85 100644 --- a/hosts/T430/hardware.nix +++ b/hosts/T430/hardware.nix @@ -1,12 +1,7 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; @@ -17,7 +12,8 @@ boot.resumeDevice = "/dev/disk/by-label/ROOT"; fileSystems."/" = - { device = "/dev/disk/by-label/ROOT"; + { + device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; options = [ "subvol=@" ]; }; @@ -25,25 +21,29 @@ boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/b7a904b2-cceb-47fc-832a-701e386a95db"; fileSystems."/home" = - { device = "/dev/disk/by-label/ROOT"; + { + device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; options = [ "subvol=@home" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-label/ROOT"; + { + device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; options = [ "subvol=@home" ]; }; fileSystems."/swap" = - { device = "/dev/disk/by-label/ROOT"; + { + device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; options = [ "subvol=@home" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-label/EFI"; + { + device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; diff --git a/modules/kdeconnect.nix b/modules/kdeconnect.nix index 4f9370e..4223e0c 100644 --- a/modules/kdeconnect.nix +++ b/modules/kdeconnect.nix @@ -1,3 +1,3 @@ -{ config, ... }: { +{ config, ... }: { programs.kdeconnect.enable = config.bchmnn.gui.enable; } diff --git a/modules/keyd.nix b/modules/keyd.nix index ae6db75..71185bd 100644 --- a/modules/keyd.nix +++ b/modules/keyd.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: let +{ pkgs, ... }: +let nav = { h = "left"; j = "down"; @@ -24,7 +25,8 @@ o = "Ö"; u = "Ü"; }; -in { +in +{ environment.systemPackages = with pkgs; [ keyd ]; diff --git a/modules/nix.nix b/modules/nix.nix index 5148996..34b92cd 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -6,8 +6,8 @@ nixpkgs.overlays = [ (self: super: { - mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix {}).driver; - mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix {}).cupswrapper; + mfcl3750cdwlpr = (super.callPackage ../overlays/mfcl3750cdw.nix { }).driver; + mfcl3750cdwcupswrapper = (super.callPackage ../overlays/mfcl3750cdw.nix { }).cupswrapper; }) ]; diff --git a/modules/sddm.nix b/modules/sddm.nix index 6fef4a5..33aa3b8 100644 --- a/modules/sddm.nix +++ b/modules/sddm.nix @@ -1,12 +1,12 @@ { lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) { /* - services.xserver.displayManager.sddm = { + services.xserver.displayManager.sddm = { enable = true; wayland.enable = true; - }; + }; - programs.sway.enable = true; + programs.sway.enable = true; */ } diff --git a/overlays/mfcl3750cdw.nix b/overlays/mfcl3750cdw.nix index f1c8249..8b2e5f7 100644 --- a/overlays/mfcl3750cdw.nix +++ b/overlays/mfcl3750cdw.nix @@ -21,7 +21,8 @@ let }; reldir = "opt/brother/Printers/${model}/"; -in rec { +in +rec { driver = pkgsi686Linux.stdenv.mkDerivation rec { inherit src version; name = "${model}drv-${version}"; @@ -31,18 +32,18 @@ in rec { unpackPhase = "dpkg-deb -x $src $out"; installPhase = '' - dir="$out/${reldir}" - substituteInPlace $dir/lpd/filter_${model} \ - --replace /usr/bin/perl ${perl}/bin/perl \ - --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ - --replace "PRINTER =~" "PRINTER = \"${model}\"; #" - wrapProgram $dir/lpd/filter_${model} \ - --prefix PATH : ${lib.makeBinPath [ - coreutils ghostscript gnugrep gnused which - ]} - # need to use i686 glibc here, these are 32bit proprietary binaries - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $dir/lpd/brmfcl3750cdwfilter + dir="$out/${reldir}" + substituteInPlace $dir/lpd/filter_${model} \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"${model}\"; #" + wrapProgram $dir/lpd/filter_${model} \ + --prefix PATH : ${lib.makeBinPath [ + coreutils ghostscript gnugrep gnused which + ]} + # need to use i686 glibc here, these are 32bit proprietary binaries + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $dir/lpd/brmfcl3750cdwfilter ''; meta = { diff --git a/users/gandalf/modules/dconf.nix b/users/gandalf/modules/dconf.nix index d5c1c19..742c36f 100644 --- a/users/gandalf/modules/dconf.nix +++ b/users/gandalf/modules/dconf.nix @@ -2,8 +2,8 @@ dconf.settings = lib.mkIf nixosConfig.bchmnn.virtualisation.enable { "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; }; }; diff --git a/users/gandalf/modules/gui/i3/default.nix b/users/gandalf/modules/gui/i3/default.nix index f1c8e2e..445ca52 100644 --- a/users/gandalf/modules/gui/i3/default.nix +++ b/users/gandalf/modules/gui/i3/default.nix @@ -5,7 +5,8 @@ let # common = (import ../common.nix) { pkgs = pkgs; lib = lib; }; common = (import ../common.nix) { inherit pkgs; inherit lib; }; -in { +in +{ imports = [ ./autorandr.nix diff --git a/users/gandalf/modules/gui/programs/flameshot/build.nix b/users/gandalf/modules/gui/programs/flameshot/build.nix index ce5e17f..f9dd37b 100644 --- a/users/gandalf/modules/gui/programs/flameshot/build.nix +++ b/users/gandalf/modules/gui/programs/flameshot/build.nix @@ -1,4 +1,4 @@ -{ pkgs , cmake , qttools , qtsvg , kguiaddons , wrapQtAppsHook }: +{ pkgs, cmake, qttools, qtsvg, kguiaddons, wrapQtAppsHook }: # https://ryantm.github.io/nixpkgs/using/overrides/ pkgs.flameshot.overrideAttrs (finalAttrs: previousAttrs: {