Keith: Add NAPS2 for scanning

this fixed some annyoing issues with multiple audio outputs

modules/factory/mount-cifs.nix

@@ -1,13 +1,14 @@
 {
   config.flake.factory.mount-cifs =
-    { host
+    {
-    , resource
+      host,
-    , destination
+      resource,
-    , credentials_path
+      destination,
-    , UID
+      credentials_path,
-    , GID
+      UID,
-    ,
+      GID,
-    }: { pkgs, ... }: {
+    }:
+    { pkgs, ... }: {
       environment.systemPackages = with pkgs; [
         cifs-utils
       ];

modules/factory/user.nix

@@ -1,10 +1,12 @@
 { self, ... }: {
   config.flake.factory.user = username: isAdmin: {
     nixos."${username}" =
-      { lib
+      {
-      , pkgs
+        lib,
-      , ...
+        pkgs,
-      }: {
+        ...
+      }:
+      {
         users.users."${username}" = {
           isNormalUser = true;
           home = "/home/${username}";

modules/factory/zsa-moonlander.nix

@@ -0,0 +1,6 @@
+{
+  config.flake.factory.zsa-moonlander = user: { pkgs, ... }: {
+    users.users.${user}.extraGroups = [ "plugdev" ];
+    hardware.keyboard.zsa.enable = true;
+  };
+}

modules/fmt.nix

@@ -0,0 +1,5 @@
+{
+  perSystem = { pkgs, ... }: {
+    formatter = pkgs.nixfmt-tree;
+  };
+}

modules/hosts/keith/configuration.nix

@@ -1,13 +1,17 @@
 { inputs, ... }: {
   flake.modules.nixos.keith = {
-    imports = with inputs.self.modules.nixos;
+    imports =
-      with inputs.self.factory; [
+      with inputs.self.modules.nixos;
+      with inputs.self.factory;
+      [
         system-desktop
         (autologin "weckyy702")
         (grub-boot "/dev/nvme0n1")
         development-tools
         i18n-de
         mount-duke-smb
+        keith-devtools
+        #       (sunshine "weckyy702")
 
         #TODO: moar aspects
       ];

modules/hosts/keith/devtools.nix

@@ -0,0 +1,11 @@
+{ inputs, ... }: {
+  flake.modules.nixos.keith-devtools = {
+    imports =
+      with inputs.self.modules.nixos;
+      with inputs.self.factory;
+      [
+        development-tools
+        rust-dev
+      ];
+  };
+}

modules/hosts/keith/hardware.nix

@@ -5,7 +5,14 @@
       amd-gpu
     ];
 
-    boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    boot.initrd.availableKernelModules = [
+      "nvme"
+      "xhci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
 
     nixpkgs.hostPlatform = "x86_64-linux";
     hardware.cpu.amd.updateMicrocode = true;

modules/hosts/keith/ups.nix

@@ -1,7 +1,9 @@
-{ self
+{
-, inputs
+  self,
-, ...
+  inputs,
-}: {
+  ...
+}:
+{
   flake.modules.nixos.keith = { config, ... }: {
     age.secrets.upsmon.file = "${inputs.secrets}/upsmon.age";
 

modules/hosts/keith/users/weckyy702/git.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.keith-weckyy702-git = {
+    programs.git.signing.key = "/home/weckyy702/.ssh/id_ed25519";
+  };
+}

modules/hosts/keith/users/weckyy702/weckyy702.nix

@@ -4,22 +4,25 @@
       weckyy702
       steam
       mullvad
+      naps2
     ];
 
     home-manager.users.weckyy702 = { config, ... }: {
-      imports = with inputs.self.modules.homeManager;
+      imports =
-        with inputs.self.factory; [
+        with inputs.self.modules.homeManager;
+        with inputs.self.factory;
+        [
           (wpaperd {
             default = {
               path = "${inputs.assets}/horizontal_16x9.png";
             };
           })
+          ashell
+          keith-weckyy702-git
 
           vesktop
-          spicetify
           borgmatic
 
-          qbittorrent
           prusa-slicer
         ];
     };

modules/hosts/tux/devtools.nix

@@ -1,7 +1,9 @@
 { inputs, ... }: {
   flake.modules.nixos.tux-devtools = {
-    imports = with inputs.self.modules.nixos;
+    imports =
-      with inputs.self.factory; [
+      with inputs.self.modules.nixos;
+      with inputs.self.factory;
+      [
         development-tools
         rust-dev
 

modules/hosts/tux/filesystems.nix

@@ -8,7 +8,10 @@
     fileSystems."/boot" = {
       device = "/dev/disk/by-uuid/15FA-55CF";
       fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
     };
 
     swapDevices = [

modules/hosts/tux/flake-parts.nix

@@ -1,3 +1,3 @@
-{ inputs, ...}: {
+{ inputs, ... }: {
-	flake.nixosConfigurations = inputs.self.lib.mkNixos "x86_64-linux" "tux";
+  flake.nixosConfigurations = inputs.self.lib.mkNixos "x86_64-linux" "tux";
 }

modules/hosts/tux/hardware.nix

@@ -4,9 +4,17 @@
       intel-gpu
     ];
 
-    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+    boot.initrd.availableKernelModules = [
-    boot.initrd.luks.devices."luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a".device = "/dev/disk/by-uuid/9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
+      "xhci_pci"
-    boot.initrd.luks.devices."luks-46e78828-ab23-48b8-8e2a-de7a21adbe24".device = "/dev/disk/by-uuid/46e78828-ab23-48b8-8e2a-de7a21adbe24";
+      "nvme"
+      "usb_storage"
+      "sd_mod"
+      "sdhci_pci"
+    ];
+    boot.initrd.luks.devices."luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a".device =
+      "/dev/disk/by-uuid/9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
+    boot.initrd.luks.devices."luks-46e78828-ab23-48b8-8e2a-de7a21adbe24".device =
+      "/dev/disk/by-uuid/46e78828-ab23-48b8-8e2a-de7a21adbe24";
 
     nixpkgs.hostPlatform = "x86_64-linux";
 

modules/hosts/tux/tux.nix

@@ -1,7 +1,9 @@
 { inputs, ... }: {
   flake.modules.nixos.tux = {
-    imports = with inputs.self.modules.nixos;
+    imports =
-      with inputs.self.factory; [
+      with inputs.self.modules.nixos;
+      with inputs.self.factory;
+      [
         system-desktop
         systemd-boot
         bluetooth

modules/hosts/tux/users/weckyy702/weckyy702.nix

@@ -7,8 +7,10 @@
     ];
 
     home-manager.users.weckyy702 = {
-      imports = with inputs.self.modules.homeManager;
+      imports =
-        with inputs.self.factory; [
+        with inputs.self.modules.homeManager;
+        with inputs.self.factory;
+        [
           borgmatic
           obsidian
           vesktop
@@ -18,6 +20,7 @@
           blueman-applet
           prusa-slicer
           backlight
+          syncthing
 
           tux-weckyy702-git
         ];

modules/nix/flake-parts/lib.nix

@@ -1,7 +1,9 @@
-{ inputs
+{
-, lib
+  inputs,
-, ...
+  lib,
-}: {
+  ...
+}:
+{
   # Helper functions for creating system / home-manager configurations
 
   options.flake.lib = lib.mkOption {

modules/nix/tools/home-manager.nix

@@ -1,7 +1,9 @@
-{ inputs
+{
-, config
+  inputs,
-, ...
+  config,
-}: {
+  ...
+}:
+{
   # Add home-manager input
   flake-file.inputs = {
     home-manager.url = "github:nix-community/home-manager/release-26.05";

modules/programs/appimage.nix

@@ -1,8 +1,8 @@
 {
-    flake.modules.nixos.appimage = { pkgs, ...}: {
+  flake.modules.nixos.appimage = { pkgs, ... }: {
-        programs.appimage = {
+    programs.appimage = {
-            enable = true;
+      enable = true;
-            binfmt = true;
+      binfmt = true;
-        };
     };
+  };
 }

modules/programs/ashell.nix

@@ -1,9 +1,11 @@
 {
   flake.modules.homeManager.ashell =
-    { config
+    {
-    , lib
+      config,
-    , ...
+      lib,
-    }: {
+      ...
+    }:
+    {
       programs.ashell = {
         enable = true;
         systemd.enable = true;
@@ -12,17 +14,33 @@
           modules = {
             left = [ "Workspaces" ];
             center = [ "Clock" ];
-            right = [ "Tray" [ "SystemInfo" "Settings" ] ];
+            right = [
+              "Tray"
+              [
+                "SystemInfo"
+                "Settings"
+              ]
+            ];
           };
 
-          system_info.indicators = [ "Cpu" "Memory" "Temperature" "DownloadSpeed" "UploadSpeed" ];
+          system_info.indicators = [
+            "Cpu"
+            "Memory"
+            "Temperature"
+            "DownloadSpeed"
+            "UploadSpeed"
+          ];
 
           settings.indicators = [ "Battery" ];
 
           appearance = lib.mkIf config.catppuccin.enable {
             success_color = "#a6e3a1";
             text_color = "#cdd6f4";
-            workspace_colors = [ "#fab387" "#b4befe" "#cba6f7" ];
+            workspace_colors = [
+              "#fab387"
+              "#b4befe"
+              "#cba6f7"
+            ];
 
             primary_color = {
               base = "#fab387";

modules/programs/browser.nix

@@ -7,9 +7,10 @@
   };
 
   flake.modules.homeManager.browser =
-    { pkgs
+    {
-    , lib
+      pkgs,
-    , ...
+      lib,
+      ...
     }:
     let
       mkExtension = shortId: guid: {
@@ -19,8 +20,7 @@
           installation_mode = "normal_installed";
         };
       };
-      zen-pkg =
+      zen-pkg = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped;
-        inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped;
 
       prefs = {
         "zen.tabs.vertical.right-side" = true;
@@ -55,35 +55,30 @@
     in
     {
       home.packages = [
-        (
+        (pkgs.wrapFirefox zen-pkg {
-          pkgs.wrapFirefox zen-pkg
+          extraPrefs = lib.concatLines (
-            {
+            lib.mapAttrsToList (
-              extraPrefs = lib.concatLines (
+              name: value: "lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});"
-                lib.mapAttrsToList
+            ) prefs
-                  (
+          );
-                    name: value: ''lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});''
-                  )
-                  prefs
-              );
 
-              extraPolicies = {
+          extraPolicies = {
-                DisableTelemetry = true;
+            DisableTelemetry = true;
-                ExtensionSettings = builtins.listToAttrs extensions;
+            ExtensionSettings = builtins.listToAttrs extensions;
 
-                SearchEngines = {
+            SearchEngines = {
-                  Default = "ddg";
+              Default = "ddg";
-                  Add = [
+              Add = [
-                    {
+                {
-                      Name = "nixpkgs packages";
+                  Name = "nixpkgs packages";
-                      URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                  URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
-                      IconURL = "https://wiki.nixos.org/favicon.ico";
+                  IconURL = "https://wiki.nixos.org/favicon.ico";
-                      Alias = "@np";
+                  Alias = "@np";
-                    }
+                }
-                  ];
+              ];
-                };
+            };
-              };
+          };
-            }
+        })
-        )
       ];
     };
 }

modules/programs/catppuccin.nix

@@ -38,9 +38,9 @@
         hyprcursor.size = size;
       };
 
-#   wayland.windowManager.hyprland.settings.exec-once = [
+    #   wayland.windowManager.hyprland.settings.exec-once = [
-#     "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
+    #     "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
-#   ];
+    #   ];
 
     catppuccin.enable = true;
     # Required for QT apps to use the catppuccin colors

modules/programs/development-tools/development-tools.nix

@@ -5,6 +5,10 @@
       gnumake
       clang
       gcc
+      gdb
+      perf
+      python3
+      libqalculate
 
       man-pages
       man-pages-posix

modules/programs/docker.nix

@@ -4,11 +4,8 @@
       enable = true;
       autoPrune.enable = true;
     };
-    users.users =
+    users.users = lib.genAttrs users (_: {
-      lib.genAttrs
+      extraGroups = [ "docker" ];
-        users
+    });
-        (_: {
-          extraGroups = [ "docker" ];
-        });
   };
 }

modules/programs/funny-wallpaper.nix

@@ -10,7 +10,8 @@
     };
   };
 
-  flake.modules.homeManager.randomized-aghpb-wallpaper = { pkgs, ... }:
+  flake.modules.homeManager.randomized-aghpb-wallpaper =
+    { pkgs, ... }:
     let
       combined_wallpapers = pkgs.symlinkJoin {
         name = "joined-wallpapers";

modules/programs/hyprland/config.lua

@@ -63,6 +63,10 @@ hl.bind(mod .. " + H",  hl.dsp.focus({ direction = "left" }))
 hl.bind(mod .. " + L", hl.dsp.focus({ direction = "right" }))
 hl.bind(mod .. " + K",    hl.dsp.focus({ direction = "up" }))
 hl.bind(mod .. " + J",  hl.dsp.focus({ direction = "down" }))
+hl.bind(mod .. " + SHIFT + H",  hl.dsp.window.move({ direction = "left", group_aware = true, }))
+hl.bind(mod .. " + SHIFT + L", hl.dsp.window.move({ direction = "right", group_aware = true, }))
+hl.bind(mod .. " + SHIFT + K",    hl.dsp.window.move({ direction = "up", group_aware = true, }))
+hl.bind(mod .. " + SHIFT + J",  hl.dsp.window.move({ direction = "down", group_aware = true, }))
 hl.bind(mod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
 hl.bind(mod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
 
@@ -79,6 +83,9 @@ hl.gesture({
     action = "workspace"
 })
 
+hl.bind(mod .. " + CTRL + H",  hl.dsp.workspace.move({ monitor = "l" }))
+hl.bind(mod .. " + CTRL + L", hl.dsp.workspace.move({ monitor = "r" }))
+
 --- Media handling
 hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
 hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),      { locked = true, repeating = true })

modules/programs/naps2.nix

@@ -0,0 +1,10 @@
+{ self, ... }: {
+  flake.modules.nixos.naps2 = { pkgs, ... }: {
+    imports = with self.modules.nixos; [
+      sane
+    ];
+    environment.systemPackages = with pkgs; [
+      naps2
+    ];
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/lsp.nix

@@ -23,6 +23,7 @@
 
       basedpyright.enable = true;
       emmet_ls.enable = true;
+      tinymist.enable = true;
     };
 
     keymaps = [
@@ -36,4 +37,7 @@
 
   plugins.lspconfig.enable = true;
   plugins.clangd-extensions.enable = true;
+  plugins.typst-vim = {
+    enable = true;
+  };
 }

modules/services/backlight.nix

@@ -1,5 +1,6 @@
 { inputs, ... }: {
-  flake.modules.homeManager.backlight = { pkgs, ... }:
+  flake.modules.homeManager.backlight =
+    { pkgs, ... }:
     let
       brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
     in

modules/services/borgmatic.nix

@@ -1,10 +1,11 @@
 {
   flake.modules.homeManager.borgmatic =
-    { config
+    {
-    , osConfig
+      config,
-    , pkgs
+      osConfig,
-    , lib
+      pkgs,
-    , ...
+      lib,
+      ...
     }:
     let
       hostname = osConfig.networking.hostName;

modules/services/networkmanager.nix

@@ -1,7 +1,7 @@
 {
-	flake.modules.nixos.networkmanager = {
+  flake.modules.nixos.networkmanager = {
-		networking.networkmanager = {
+    networking.networkmanager = {
-			enable = true;
+      enable = true;
-		};
+    };
-	};
+  };
 }

modules/services/pipewire.nix

@@ -1,8 +1,13 @@
 {
   flake.modules.nixos.pipewire = {
+    # See https://nixos.wiki/wiki/NixOS_Wiki:Audio
+    hardware.alsa.enable = false;
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true;
     services.pipewire = {
-      alsa.enable = true;
       enable = true;
+      audio.enable = true;
+      alsa.enable = true;
       wireplumber.enable = true;
     };
   };

modules/services/sane.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.nixos.sane = {
+    hardware.sane.enable = true;
+  };
+}

modules/services/sunshine.nix

@@ -0,0 +1,25 @@
+{
+  config.flake.factory.sunshine = user: {
+    services.sunshine = {
+      enable = true;
+      autoStart = true;
+      capSysAdmin = true;
+      applications = {
+        apps = [
+          {
+            name = "Steam Big Picture";
+            detached = [
+              "sudo -u ${user} setsid steam steam://open/bigpicture"
+            ];
+            prep-cmd = [
+              {
+                do = "";
+                undo = "sudo -u ${user} setsid steam steam://close/bigpicture";
+              }
+            ];
+          }
+        ];
+      };
+    };
+  };
+}

modules/services/syncthing.nix

@@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.syncthing = {
+    services.syncthing = {
+      enable = true;
+      overrideDevices = false;
+      overrideFolders = false;
+      settings.options.localAnnounceEnabled = true;
+    };
+  };
+}

modules/system-settings/intel-gpu.nix

@@ -1,15 +1,15 @@
 {
-	flake.modules.nixos.intel-gpu = {pkgs, ...}: {
+  flake.modules.nixos.intel-gpu = { pkgs, ... }: {
-		boot.kernelModules = [ "kvm-intel" ];
+    boot.kernelModules = [ "kvm-intel" ];
 
-		hardware.graphics = {
+    hardware.graphics = {
-			enable = true;
+      enable = true;
-			extraPackages = with pkgs; [
+      extraPackages = with pkgs; [
-				intel-media-driver
+        intel-media-driver
-				intel-compute-runtime
+        intel-compute-runtime
-			];
+      ];
-		};
+    };
 
-		environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD";
+    environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD";
-	};
+  };
 }

modules/system-settings/systemd-boot.nix

@@ -1,6 +1,6 @@
 {
-	flake.modules.nixos.systemd-boot = {
+  flake.modules.nixos.systemd-boot = {
-		boot.loader.systemd-boot.enable = true;
+    boot.loader.systemd-boot.enable = true;
-		boot.loader.efi.canTouchEfiVariables = true;
+    boot.loader.efi.canTouchEfiVariables = true;
-	};
+  };
 }

modules/system-types/desktop/desktop.nix

@@ -3,6 +3,8 @@
     imports = with inputs.self.modules.nixos; [
       system-base
       hyprland
+      pipewire
+      sane
 
       #TODO: moar aspects
     ];

modules/users/weckyy702/weckyy702.nix

@@ -1,20 +1,30 @@
-{ inputs
+{
-, self
+  inputs,
-, lib
+  self,
-, ...
+  lib,
-}: {
+  ...
+}:
+{
   flake.homeConfigurations = inputs.self.lib.mkHomeManager "x86_64-linux" "weckyy702";
 
   flake.modules = lib.mkMerge [
     (self.factory.user "weckyy702" true)
     {
       nixos.weckyy702 = {
-        imports = with self.modules.nixos; [
+        imports =
-          kanata
+          with self.modules.nixos;
-          catppuccin
+          with self.factory;
-        ];
+          [
+            kanata
+            catppuccin
+            (zsa-moonlander "weckyy702")
+          ];
 
-        users.users.weckyy702.extraGroups = [ "networkmanager" "dialout" ];
+        users.users.weckyy702.extraGroups = [
+          "networkmanager"
+          "dialout"
+          "scanner"
+        ];
       };
 
       homeManager.weckyy702 = { pkgs, ... }: {

secrets/secrets.nix

@@ -4,7 +4,10 @@ let
 
   keith = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrauXP79zUm2FlVj3HRm+C8ufYAABiIoe68OCGbIm+2";
   tux = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFB7bh6ioZrTSR0AkKvJ1qxVWX0kwcM8yeHghTYFGpqZ";
-  systems = [ keith tux ];
+  systems = [
+    keith
+    tux
+  ];
 in
 {
   "nas-creds.age" = {