diff --git a/builds/printer.nix b/builds/printer.nix index f84c8a8..d687af8 100644 --- a/builds/printer.nix +++ b/builds/printer.nix @@ -3,17 +3,18 @@ { services.printing.drivers = [ pkgs.epson-escpr ]; hardware.printers = { - ensurePrinters = [{ - name = "Epson-XP-520"; - location = "Home"; - deviceUri = "http://192.168.178.34:631/ipp/print"; - model = - "epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd"; - ppdOptions = { - PageSize = "A4"; - Ink = "Color"; - }; - }]; + ensurePrinters = [ + { + name = "Epson-XP-520"; + location = "Home"; + deviceUri = "usb://EPSON/XP-520%20Series?serial=554656593133323698&interface=1"; + model = "epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd"; + ppdOptions = { + PageSize = "A4"; + Ink = "Color"; + }; + } + ]; ensureDefaultPrinter = "Epson-XP-520"; }; } diff --git a/home/programs/nixvim/plugins/conform.nix b/home/programs/nixvim/plugins/conform.nix index 8abe1a7..f975beb 100644 --- a/home/programs/nixvim/plugins/conform.nix +++ b/home/programs/nixvim/plugins/conform.nix @@ -50,6 +50,12 @@ tex = [ "tex-fmt" ]; + openscad = [ + "squeeze_blanks" + "trim_whitespace" + "trim_newlines" + "scadstyle" + ]; "_" = [ "squeeze_blanks" "trim_whitespace" @@ -97,6 +103,15 @@ tex-fmt = { command = "tex-fmt"; }; + scadstyle = { + "inherit" = true; + prepend_args = [ + "--indent-type" + "Spaces" + "--indent-width" + "2" + ]; + }; }; }; }; diff --git a/home/programs/river/default.nix b/home/programs/river/default.nix index 7f33a6b..ba727bd 100644 --- a/home/programs/river/default.nix +++ b/home/programs/river/default.nix @@ -67,8 +67,6 @@ map = { normal = { "Super+Shift Return" = "spawn alacritty"; - # Messages - "Control+Super W" = "spawn 'printf \"Hello from Wayland!\" | dunstify -'"; # System "Super P" = "spawn 'rofi -show drun'"; "Super+Shift C" = "close";