diff options
| -rw-r--r-- | nixos/hosts/tente/monitoring.nix | 2 | ||||
| -rw-r--r-- | nixos/profiles/common/nixpkgs/overlays.nix | 13 | ||||
| -rw-r--r-- | nixos/profiles/common/sanix.nix | 2 | ||||
| -rw-r--r-- | nixos/profiles/workstation/create.nix | 6 | ||||
| -rw-r--r-- | user/sway/config | 7 |
5 files changed, 27 insertions, 3 deletions
diff --git a/nixos/hosts/tente/monitoring.nix b/nixos/hosts/tente/monitoring.nix index eaddacb..545ae24 100644 --- a/nixos/hosts/tente/monitoring.nix +++ b/nixos/hosts/tente/monitoring.nix @@ -57,6 +57,8 @@ in services.prometheus = { enable = true; + retentionTime = "1y"; + scrapeConfigs = [ { job_name = "node"; diff --git a/nixos/profiles/common/nixpkgs/overlays.nix b/nixos/profiles/common/nixpkgs/overlays.nix index 613338f..7bad946 100644 --- a/nixos/profiles/common/nixpkgs/overlays.nix +++ b/nixos/profiles/common/nixpkgs/overlays.nix @@ -1,4 +1,15 @@ # https://nixos.org/manual/nixpkgs/stable/#sec-overlays-definition +{ pkgs, ... }: [ - + (final: prev: { + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + patches = old.patches ++ [ + # https://github.com/swaywm/sway/pull/8761 + (pkgs.fetchpatch { + url = "https://github.com/swaywm/sway/commit/af7c6ec7b1daeeec67dd17e27fb75f1f1c347327.patch"; + hash = "sha256-DxN/3IdswZ6q/ksBVr+wgwGe7ScJeg8gFHYQdQAueww="; + }) + ]; + }); + }) ] diff --git a/nixos/profiles/common/sanix.nix b/nixos/profiles/common/sanix.nix index a20db24..bfbd531 100644 --- a/nixos/profiles/common/sanix.nix +++ b/nixos/profiles/common/sanix.nix @@ -2,7 +2,7 @@ # Use the Nixpkgs config and overlays from the local files for this NixOS build nixpkgs = { config = import ./nixpkgs/config.nix; - overlays = import ./nixpkgs/overlays.nix; + overlays = import ./nixpkgs/overlays.nix { inherit pkgs; }; }; # Makes commands default to the same Nixpkgs, config, overlays and NixOS configuration diff --git a/nixos/profiles/workstation/create.nix b/nixos/profiles/workstation/create.nix index b574b47..e902e7b 100644 --- a/nixos/profiles/workstation/create.nix +++ b/nixos/profiles/workstation/create.nix @@ -6,7 +6,11 @@ typst - inkscape + (inkscape-with-extensions.override { + inkscapeExtensions = [ + inkscape-extensions.inkstitch + ]; + }) gimp krita ]; diff --git a/user/sway/config b/user/sway/config index 2fafff8..fa7b39b 100644 --- a/user/sway/config +++ b/user/sway/config @@ -57,6 +57,13 @@ input "type:keyboard" { xkb_file "~/config/colematik/colematik.xkb" } +input "10429:2395:UGTABLET_Artist_Pro_16_(Gen2)" { + map_to_output "DP-1" +} +input "10429:514:Hanvon_Ugee_Shortcut_Remote_Keyboard" { + xkb_layout "us" +} + ### Key bindings # # Basics: |