diff --git a/flake.lock b/flake.lock index 8654c50..a2f5d74 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770910218, - "narHash": "sha256-IyHoHbhLFuIgFG+n7dqHwJaXuNnRaEsxCfAsfudV1KY=", + "lastModified": 1773079031, + "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=", "owner": "abenz1267", "repo": "elephant", - "rev": "c354a596ec7a7e34e9c26478dc7ef9680bc23e6d", + "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1772380461, - "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", + "lastModified": 1774210133, + "narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", + "rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772473001, - "narHash": "sha256-vMhspzhj6M4hfqM/wLgPG81xQh2sN5x0N6a3rHp5ZRo=", + "lastModified": 1774253924, + "narHash": "sha256-5Zi+RYoRvax1gATaNC80MYR+6uBJ3F+uUZ2KL3HyTWg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "475eb9fc8d1ffa906ac215e78e758a29597fcd5e", + "rev": "36f3b7b93efde38c4c40daeaee80a62afb550812", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1772207631, - "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=", + "lastModified": 1773130184, + "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", "owner": "YaLTeR", "repo": "niri", - "rev": "e708f546153f74acf33eb183b3b2992587a701e5", + "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1772047000, - "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1771062828, - "narHash": "sha256-y1jBFFO0u+V21y3YldHZozrDwVJVrdC+o3c4M8/rasU=", + "lastModified": 1773675699, + "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=", "owner": "abenz1267", "repo": "walker", - "rev": "19b1104585305e0806b842af341630f72038a4b9", + "rev": "d2702235710da3d7daf55c912ca7534261cf20f5", "type": "github" }, "original": { @@ -436,11 +436,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1772429643, - "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", "type": "github" }, "original": { diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index 78f4fe0..52b6e3e 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -50,23 +50,7 @@ scrolling = true; }; locale.preset.theaninova.enable = true; - - networking.hosts = { - "127.0.0.1:57461" = [ "ai.local" ]; - }; services = { - ollama.enable = false; - open-webui = { - enable = false; - port = 57461; - environment = { - ANONYMIZED_TELEMETRY = "False"; - DO_NOT_TRACK = "True"; - SCARF_NO_ANALYTICS = "True"; - WEBUI_AUTH = "False"; - }; - }; - xserver.xkb.variant = "altgr-intl"; xserver.xkb.layout = "us"; diff --git a/hosts/MONSTER/home.nix b/hosts/MONSTER/home.nix index f268a60..132ef42 100644 --- a/hosts/MONSTER/home.nix +++ b/hosts/MONSTER/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, ... }: { theme.md3-evo = { enable = true; @@ -8,35 +8,12 @@ lon = 13.40; }; }; + xdg.userDirs = { + enable = true; + setSessionVariables = true; + extraConfig.PROJECTS = "${config.home.homeDirectory}/Projects"; + }; programs.zoxide.enable = true; - home.packages = with pkgs; [ - hyperhdr - /* - (hyperion-ng.overrideAttrs ( - final: prev: rec { - version = "2.1.1"; - src = fetchFromGitHub { - owner = "hyperion-project"; - repo = prev.pname; - rev = version; - hash = "sha256-lKLXgOrXp8DLmlpQe/33A30l4K9VX8P0q2LUA+lLYws="; - # needed for `dependencies/external/`: - # * rpi_ws281x` - not possible to use as a "system" lib - # * qmdnsengine - not in nixpkgs yet - fetchSubmodules = true; - }; - buildInputs = prev.buildInputs ++ [ - pkgs.libsForQt5.qtwebsockets - pkgs.libftdi1 - ]; - nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.git ]; - cmakeFlags = prev.cmakeFlags ++ [ - "-DUSE_SYSTEM_LIBFTDI_LIBS=ON" - ]; - } - )) - */ - ]; wayland.windowManager.hyprland.settings.device = let targetDPI = 1200; diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 07a0203..dbc00fe 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -110,7 +110,7 @@ in ghex gnome-disk-utility # fixes - xorg.xrandr + xrandr ]; gtk = { diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index ce3c234..d7e6fcd 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -3,6 +3,7 @@ programs.git = { enable = true; signing = { + format = "openpgp"; key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; signByDefault = true; }; diff --git a/modules/home-manager/theme/md3-evo.nix b/modules/home-manager/theme/md3-evo.nix index a5bb55c..e141278 100644 --- a/modules/home-manager/theme/md3-evo.nix +++ b/modules/home-manager/theme/md3-evo.nix @@ -299,8 +299,11 @@ in gtk = { gtk3.extraCss = # css "@import './theme.css';"; - gtk4.extraCss = # css - "@import './theme.css';"; + gtk4 = { + theme.name = "Adwaita"; + extraCss = # css + "@import './theme.css';"; + }; theme = { name = "Adwaita"; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index a82feb6..a9654a7 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -25,9 +25,10 @@ ./locales/theaninova.nix - ./usecases/gaming.nix ./usecases/3d-printing.nix ./usecases/development.nix + ./usecases/gaming.nix + ./usecases/localai.nix ./usecases/windows-vm.nix ./services/airprint.nix diff --git a/modules/nixos/usecases/localai.nix b/modules/nixos/usecases/localai.nix new file mode 100644 index 0000000..7280769 --- /dev/null +++ b/modules/nixos/usecases/localai.nix @@ -0,0 +1,36 @@ +{ + config, + lib, + ... +}: + +with lib; + +let + cfg = config.usecases.localai; +in +{ + options.usecases.localai = { + enable = mkEnableOption "Enable local LLM services"; + }; + + config = mkIf cfg.enable { + networking.hosts = { + "127.0.0.1:57461" = [ "ai.local" ]; + }; + + services = { + ollama.enable = true; + open-webui = { + enable = true; + port = 57461; + environment = { + ANONYMIZED_TELEMETRY = "False"; + DO_NOT_TRACK = "True"; + SCARF_NO_ANALYTICS = "True"; + WEBUI_AUTH = "False"; + }; + }; + }; + }; +}