diff --git a/flake.lock b/flake.lock index a184072..14f709b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,17 +8,17 @@ ] }, "locked": { - "lastModified": 1746449548, - "narHash": "sha256-FWoEhsZtzzYMkvcEXQG4bf89TYqBYJKcqzBuN9/kg3M=", - "owner": "Programvareverkstedet", - "repo": "dibbler", - "rev": "4a4f0e6947d220ca390ad4982ae0de32435d08a0", - "type": "github" + "lastModified": 1747505135, + "narHash": "sha256-kfDCvIbNKePKpJCXST2V1bwWHtsgFOL/E7DvQbBygsQ=", + "ref": "refs/heads/main", + "rev": "0844843e595be617f683fbc245c944edd2bc6aa8", + "revCount": 209, + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/dibbler.git" }, "original": { - "owner": "Programvareverkstedet", - "repo": "dibbler", - "type": "github" + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/dibbler.git" } }, "disko": { diff --git a/flake.nix b/flake.nix index c838ea9..20f1fc7 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ minecraft-data.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"; - dibbler.url = "github:Programvareverkstedet/dibbler"; + dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git"; dibbler.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix index 9cbcd20..4f0ccc2 100644 --- a/hosts/skrott/configuration.nix +++ b/hosts/skrott/configuration.nix @@ -2,10 +2,10 @@ { imports = [ # Include the results of the hardware scan. - # ./hardware-configuration.nix - (fp /base.nix) + ./hardware-configuration.nix + (fp /base) (fp /misc/metrics-exporters.nix) - ./services/dibbler.nix + # ./services/dibbler.nix ]; sops.defaultSopsFile = ../../secrets/skrott/skrott.yaml; diff --git a/hosts/skrott/hardware-configuration.nix b/hosts/skrott/hardware-configuration.nix new file mode 100644 index 0000000..c318673 --- /dev/null +++ b/hosts/skrott/hardware-configuration.nix @@ -0,0 +1,40 @@ +# 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 = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "hpsa" "ohci_pci" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/31a67903-dc00-448a-a24a-36e820318fe5"; + fsType = "ext4"; + }; + + fileSystems."/data" = + { device = "/dev/disk/by-uuid/79e93eed-ad95-45c9-b115-4ef92afcc8c0"; + fsType = "f2fs"; + }; + + swapDevices = [ ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0f0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0f1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0f2.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/skrott/services/dibbler.nix b/hosts/skrott/services/dibbler.nix index 0d0164d..ee13178 100644 --- a/hosts/skrott/services/dibbler.nix +++ b/hosts/skrott/services/dibbler.nix @@ -6,6 +6,23 @@ group = "dibbler"; }; }; - services.dibbler.package = inputs.dibbler.packages.dibbler; - services.dibbler.config = config.sops.secrets."dibbler/config".path; -} \ No newline at end of file + + services.dibbler = { + enable = true; + package = inputs.dibbler.packages.dibbler; + settings = { + quit_allowed = false; + stop_allowed = false; + show_tracebacks = true; + input_encoding = "utf8"; + + low_credit_warning_limit = -100; + user_recent_transaction_limit = 20; + + # See https://pypi.org/project/brother_ql/ for label types + # Set rotate to False for endless labels + label_type = "62"; + label_rotate = false; + }; + }; +}