alejandra and dwm xf86 keys

home-manager/features/cli/bash.nix

@@ -1,5 +1,6 @@
-let cli = import ./aliases.nix; in
+let
-{
+  cli = import ./aliases.nix;
+in {
   programs.bash = {
     enable = true;
     shellAliases = cli.myAliases;

home-manager/features/cli/zsh/default.nix

@@ -1,4 +1,8 @@
-{config, pkgs, ...}: let 
+{
+  config,
+  pkgs,
+  ...
+}: let
   cli = import ../aliases.nix;
 in {
   home.packages = with pkgs; [

home-manager/features/desktop/common/default.nix

@@ -1,6 +1,10 @@
-{lib, pkgs, config, ...}: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
   imports = [
-    
   ];
 
   # dconf.settings."org/gnome/desktop/interface".color-scheme =
@@ -11,5 +15,4 @@
   #   else "default";
 
   # xdg.portal.enable = true;
-
 }

home-manager/features/desktop/dwm/betterlockscreen.nix

@@ -2,6 +2,5 @@
   services.betterlockscreen = {
     enable = true;
     package = pkgs.unstable.betterlockscreen;
-
   };
 }

home-manager/features/desktop/dwm/theming.nix

@@ -1,4 +1,9 @@
-{lib, config, pkgs, ...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   # enable gtk
   gtk = {
     enable = true;

home-manager/features/neovim.nix

@@ -1,5 +1,8 @@
-{inputs, pkgs, ...}: {
+{
-
+  inputs,
+  pkgs,
+  ...
+}: {
   nixpkgs.overlays = [
     inputs.neovim-nightly-overlay.overlay
   ];

home-manager/home.nix

@@ -76,7 +76,7 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = (with pkgs; [
+  home.packages = with pkgs; [
     # > graphics <
     tuxpaint
     krita
@@ -143,7 +143,7 @@
 
     docker
     docker-compose
-  ]);
+  ];
 
   services.gnome-keyring = {
     enable = true;

hosts/common/default.nix

@@ -12,9 +12,9 @@
     ./services.nix
     ./users.nix
     ./docker.nix
+    ./x.nix
   ];
 
-
   nixpkgs = {
     # You can add overlays here
     overlays = [

hosts/common/packages.nix

@@ -19,7 +19,7 @@
     randomizedDelaySec = "45min";
   };
 
-  environment.systemPackages = (with pkgs; [
+  environment.systemPackages = with pkgs; [
     # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     # wget
     ntfs3g
@@ -27,7 +27,7 @@
     unstable.nh
     nix-output-monitor
     nvd
-  ]);
+  ];
 
   fonts.packages = with pkgs; [
     nerdfonts

hosts/common/services.nix

@@ -6,7 +6,6 @@
   pkgs,
   ...
 }: {
-
   # I use zsh btw
   environment.shells = with pkgs; [bash zsh];
   users.defaultUserShell = pkgs.zsh;

hosts/common/x.nix

@@ -0,0 +1,28 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  services.udisks2.enable = true;
+  security.polkit.enable = true;
+  services.upower.enable = config.powerManagement.enable;
+  services.gvfs.enable = true;
+
+  services.autorandr = {
+    enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    autorandr
+    xorg.xrandr
+    xorg.libX11
+    xorg.libX11.dev
+    xorg.libXft
+    xorg.libXinerama
+    xorg.xbacklight
+    pulseaudioFull
+  ];
+}

hosts/thor/gui.nix

@@ -11,6 +11,7 @@
     enable = true;
     layout = "pl";
     xkbVariant = "";
+    libinput.enable = true;
 
     displayManager = {
       lightdm = {
@@ -42,11 +43,6 @@
     };
   };
 
-  environment.systemPackages = (with pkgs; [
-    autorandr
-    xorg.xrandr
-  ]); 
-
   services.autorandr = {
     enable = true;
   };

hosts/thor/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
@@ -15,17 +19,22 @@
   boot.kernelParams = ["resume=/var/swapfile" "resume_offset=16230400"];
   boot.resumeDevice = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e";
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e";
+    device = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/09BA-3F6F";
+    device = "/dev/disk/by-uuid/09BA-3F6F";
     fsType = "vfat";
   };
 
-  swapDevices = [ { device = "/var/swapfile"; size = 32 * 1024; } ];
+  swapDevices = [
+    {
+      device = "/var/swapfile";
+      size = 32 * 1024;
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/zion/gui.nix

@@ -65,12 +65,6 @@
     ];
   };
 
-  environment.systemPackages = (with pkgs; [
-    autorandr
-    xorg.xrandr
-  ]); 
-
-
   services.autorandr = {
     enable = true;
     defaultTarget = "zion";

hosts/zion/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
@@ -13,18 +17,18 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/8af14034-1aec-4b6f-b8c4-de13e6987ac5";
+    device = "/dev/disk/by-uuid/8af14034-1aec-4b6f-b8c4-de13e6987ac5";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/CEC7-B082";
+    device = "/dev/disk/by-uuid/CEC7-B082";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/00a782e1-71c2-4121-8608-9ed1104d6aa5"; }
+    {device = "/dev/disk/by-uuid/00a782e1-71c2-4121-8608-9ed1104d6aa5";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/zion/nvidia.nix

@@ -17,7 +17,6 @@
   services.xserver.videoDrivers = ["nvidia"];
 
   hardware.nvidia = {
-
     # Modesetting is required.
     modesetting.enable = true;
 

pkgs/papyrus/default.nix

@@ -1,3 +1,2 @@
 {pkgs ? import <nixpkgs> {}}:
-
 pkgs.callPackage ./papyrus.nix {}

pkgs/papyrus/papyrus.nix

@@ -1,6 +1,19 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook, fontconfig, freetype, glib, gtk3, jdk17, lib, xorg, zlib, alsaLib }:
+{
-let
+  stdenv,
-
+  fetchurl,
+  makeDesktopItem,
+  makeWrapper,
+  autoPatchelfHook,
+  fontconfig,
+  freetype,
+  glib,
+  gtk3,
+  jdk17,
+  lib,
+  xorg,
+  zlib,
+  alsaLib,
+}: let
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
   version = "6.6.0";
@@ -23,8 +36,8 @@ let
     genericName = "SQL Integrated Development Environment";
     categories = ["Development"];
   };
-
+in
-in stdenv.mkDerivation {
+  stdenv.mkDerivation {
     pname = "papyrus";
     version = "6.6.0";
 
@@ -114,7 +127,6 @@ in stdenv.mkDerivation {
 #  #   url = "https://download.eclipse.org/modeling/mdt/papyrus/rcp/2023-12/6.6.0/papyrus-2023-12-6.6.0-linux64.tar.gz";
 #  #   sha512 = "ab1f1c0192fa7791550ef284c221a5445e02a699f4a82ec9b08f2c4b1f894b387751c37a6c5109f7709afea265126210682a266adb00fb26768057c0321ba802";
 #  # };
-
 #  # unpackPhase = "tar -xf $src -C $out/bin/papyrus --strip-components=1";
 #
 #  installPhase = ''
@@ -122,3 +134,4 @@ in stdenv.mkDerivation {
 #    tar -xf $src -C $out/bin --strip-components=1
 #  '';
 #
+

pkgs/tikz-uml/default.nix

@@ -1,4 +1,2 @@
 {pkgs ? import <nixpkgs> {}}:
-
 pkgs.callPackage ./tikzuml.nix {}
-

pkgs/tikz-uml/tikzuml.nix

@@ -1,5 +1,9 @@
-{ lib, stdenvNoCC, fetchurl, mkShell }:
+{
-let
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  mkShell,
+}: let
   pkgs = import <nixpkgs> {};
 
   version = "1.0";
@@ -18,8 +22,8 @@ let
     inherit (pkgs.texlive) scheme-full;
     inherit tikzuml;
   };
-
+in
-in stdenvNoCC.mkDerivation (finalAttrs: {
+  stdenvNoCC.mkDerivation (finalAttrs: {
     pname = "tikz-uml";
     inherit version;