Compare commits

..

12 commits

15 changed files with 193 additions and 24 deletions

View file

@ -47,6 +47,132 @@ let
"media.ffmpeg.vaapi.enabled" = true; "media.ffmpeg.vaapi.enabled" = true;
}; };
commonSearch = {
force = true;
# TODO defaults don't work
default = "Qwant";
privateDefault = "Qwant";
order = [
"Qwant"
"Ecosia"
"DuckDuckGo"
"Startpage"
"kagi"
];
engines = {
# builtin
"Startpage".metaData.alias = "@s";
"DuckDuckGo".metaData.alias = "@d";
# extra
"Qwant" = {
urls = [ { template = "https://www.qwant.com/?q={searchTerms}"; } ];
iconURL = "https://www.qwant.com/favicon.ico";
definedAliases = [ "@q" ];
};
"Ecosia" = {
urls = [ { template = "https://www.ecosia.org/search?q={searchTerms}"; } ];
iconURL = "https://www.ecosia.org/favicon.ico";
definedAliases = [ "@e" ];
};
"kagi" = {
urls = [ { template = "https://kagi.com/search?q={searchTerms}"; } ];
iconURL = "https://kagi.com/favicon.ico";
definedAliases = [ "@k" ];
};
"GitHub" = {
urls = [ { template = "https://github.com/search?q={searchTerms}"; } ];
iconURL = "https://github.com/favicon.ico";
definedAliases = [ "@gh" ];
};
"GitLab" = {
urls = [ { template = "https://gitlab.com/search?search={searchTerms}"; } ];
iconURL = "https://gitlab.com/favicon.ico";
definedAliases = [ "@gl" ];
};
"Codeberg" = {
urls = [ { template = "https://codeberg.org/explore/repos?q={searchTerms}"; } ];
iconURL = "https://codeberg.org/favicon.ico";
definedAliases = [ "@cb" ];
};
"Nix Packages" = {
urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
};
"NixOS Options" = {
urls = [ { template = "https://search.nixos.org/options?query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@no" ];
};
"Nix Flakes: Packages" = {
urls = [ { template = "https://search.nixos.org/flakes?type=packages&query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nfp" ];
};
"Nix Flakes: Options" = {
urls = [ { template = "https://search.nixos.org/flakes?type=options&query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nfo" ];
};
"NixOS Wiki" = {
urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nw" ];
};
"Crates.io" = {
urls = [ { template = "https://crates.io/search?q={searchTerms}"; } ];
iconURL = "https://crates.io/favicon.ico";
definedAliases = [ "@rc" ];
};
"Docs.rs" = {
urls = [ { template = "https://docs.rs/releases/search?query={searchTerms}"; } ];
iconURL = "https://docs.rs/favicon.ico";
definedAliases = [ "@rd" ];
};
"Rust Book" = {
urls = [ { template = "https://doc.rust-lang.org/book/?search={searchTerms}"; } ];
iconURL = "https://doc.rust-lang.org/book/favicon.svg";
definedAliases = [ "@rb" ];
};
"Rust std" = {
urls = [ { template = "https://doc.rust-lang.org/stable/std/?search={searchTerms}"; } ];
iconURL = "https://www.rust-lang.org/static/images/favicon.svg";
definedAliases = [ "@rs" ];
};
"npm" = {
urls = [ { template = "https://www.npmjs.com/search?q={searchTerms}"; } ];
iconURL = "https://static-production.npmjs.com/da3ab40fb0861d15c83854c29f5f2962.png";
definedAliases = [ "@npm" ];
};
"PyPI" = {
urls = [ { template = "https://pypi.org/search/?q={searchTerms}"; } ];
iconURL = "https://pypi.org/favicon.ico";
definedAliases = [ "@pypi" ];
};
"Stack Overflow" = {
urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ];
iconURL = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
definedAliases = [ "@so" ];
};
"Wikipedia" = {
urls = [ { template = "https://en.wikipedia.org/wiki/{searchTerms}"; } ];
iconURL = "https://en.wikipedia.org/favicon.ico";
definedAliases = [ "@w" ];
};
"Wolfram Alpha" = {
urls = [ { template = "https://www.wolframalpha.com/input?i={searchTerms}"; } ];
iconURL = "https://www.wolframalpha.com/_next/static/images/favicon_1zbE9hjk.ico";
definedAliases = [ "@wa" ];
};
"Reddit" = {
urls = [ { template = "https://www.reddit.com/search/?q={searchTerms}"; } ];
iconURL = "https://www.reddit.com/favicon.ico";
definedAliases = [ "@r" ];
};
};
};
commonExtensions = with firefox-addons; [ commonExtensions = with firefox-addons; [
dictionary-german dictionary-german
proton-pass proton-pass
@ -64,11 +190,13 @@ in
private = { private = {
id = 0; id = 0;
settings = commonSettings; settings = commonSettings;
search = commonSearch;
extensions = commonExtensions; extensions = commonExtensions;
}; };
work = { work = {
id = 1; id = 1;
settings = commonSettings; settings = commonSettings;
search = commonSearch;
extensions = extensions =
commonExtensions commonExtensions
++ (with firefox-addons; [ ++ (with firefox-addons; [

View file

@ -63,6 +63,7 @@ with pkgs;
# gaphor # gaphor
# security & privacy # security & privacy
unstable.proton-pass
authenticator authenticator
collision collision
metadata-cleaner metadata-cleaner

View file

@ -46,17 +46,16 @@
''; '';
home.packages = with pkgs; [ home.packages = with pkgs; [
fh
# system # system
gparted gparted
gnome-firmware-updater gnome-firmware-updater
mission-center resources
# productivity # productivity
anytype anytype
libreoffice-fresh libreoffice-fresh
tabbed tabbed
curtail
# work # work
teams-for-linux teams-for-linux
@ -73,15 +72,16 @@
celluloid celluloid
spot spot
spotify spotify
pocket-casts
unstable.calibre unstable.calibre
foliate foliate
# security & privacy # security & privacy
unstable.proton-pass
authenticator authenticator
collision collision
metadata-cleaner metadata-cleaner
raider raider
gnome-obfuscate
yubikey-manager yubikey-manager
yubikey-manager-qt yubikey-manager-qt
# yubioath-flutter # TODO conflicts with fluffychat # yubioath-flutter # TODO conflicts with fluffychat
@ -89,12 +89,12 @@
warp warp
# onionshare-gui # onionshare-gui
transmission_4-gtk transmission_4-gtk
qbittorrent unstable.qbittorrent
fragments fragments
# other # other
ledger-live-desktop ledger-live-desktop
portfolio unstable.portfolio
bottles bottles
zotero zotero
newsflash newsflash

View file

@ -2,7 +2,7 @@
{ {
services.keybase.enable = true; services.keybase.enable = true;
services.kbfs.enable = true; # services.kbfs.enable = true;
home.packages = [ pkgs.keybase-gui ]; home.packages = [ pkgs.keybase-gui ];
} }

View file

@ -6,7 +6,7 @@
programs.zellij.enableZshIntegration = true; programs.zellij.enableZshIntegration = true;
programs.zellij.settings = { programs.zellij.settings = {
default_layout = "compact"; # or default default_layout = "compact"; # or default
default_mode = "locked"; default_mode = "normal";
ui.pane_frames = { ui.pane_frames = {
hide_session_name = true; hide_session_name = true;
}; };

View file

@ -2,11 +2,11 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
trayscale unstable.trayscale
(pkgs.makeAutostartItem { (makeAutostartItem {
name = "dev.deedles.Trayscale"; name = "dev.deedles.Trayscale";
package = pkgs.trayscale; package = unstable.trayscale;
# extraArgs = ["--hide-window"]; prependExtraArgs = [ "--hide-window" ];
}) })
]; ];
} }

View file

@ -19,6 +19,7 @@
../services/samba/home-pc.nix ../services/samba/home-pc.nix
../services/restic/home-pc.nix ../services/restic/home-pc.nix
../services/pcscd.nix ../services/pcscd.nix
../services/open-webui.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -103,7 +103,6 @@ in
"news.felschr.com" "news.felschr.com"
"etebase.felschr.com" "etebase.felschr.com"
"paperless.felschr.com" "paperless.felschr.com"
"boards.felschr.com"
]; ];
services.nginx = { services.nginx = {

View file

@ -1,8 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 OAZQhA 2ptce5tD9VWD7rfhCjLZbKzznVXLHFw1L5iXbwrAyUQ
egOD0xgvKyRsezgBCmaZrft/61TtS3fh4mHWf+taNjI
-> ssh-ed25519 72ij7w mVe1vE1rQT0t21xwwrLqEytD/1dwB2gwbzuNx6z/tEQ
ZxcOXVdxpxpvvU6ozhjJ41hIncxygJcV3icGFascFpw
--- 298y2yI6JRzmJq1If1v3NMjRKlCpH2kjUqhfL47n2ag
2Ý©TwÀÆV}ü“6­´϶A=è/w <þ½Ù­éÏÍ Ö[|Fïdåˆì$e^&
ªÐ<C2AA>°HÐüöaì&„߀vÒ]

View file

@ -35,6 +35,7 @@ in
START_SSH_SERVER = true; START_SSH_SERVER = true;
SSH_LISTEN_PORT = sshPort; SSH_LISTEN_PORT = sshPort;
BUILTIN_SSH_SERVER_USER = sshUser; BUILTIN_SSH_SERVER_USER = sshUser;
LANDING_PAGE = "explore";
}; };
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
ui = { ui = {
@ -45,11 +46,11 @@ in
DEFAULT_ACTIONS_URL = "https://${domain}"; DEFAULT_ACTIONS_URL = "https://${domain}";
}; };
mailer = { mailer = {
# TODO broken: https://github.com/NixOS/nixpkgs/issues/103446
ENABLED = true; ENABLED = true;
PROTOCOL = "sendmail"; PROTOCOL = "sendmail";
FROM = config.programs.msmtp.accounts.default.from; FROM = config.programs.msmtp.accounts.default.from;
SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
SENDMAIL_ARGS = "--";
}; };
}; };
}; };

View file

@ -1,9 +1,36 @@
{ pkgs, ... }: {
config,
inputs,
pkgs,
...
}:
{ {
disabledModules = [
"services/misc/ollama.nix"
"services/misc/open-webui.nix"
];
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/misc/ollama.nix"
"${inputs.nixpkgs-unstable}/nixos/modules/services/misc/open-webui.nix"
];
services.ollama = {
enable = true;
package = pkgs.unstable.ollama;
acceleration = "rocm";
rocmOverrideGfx = "10.3.1";
};
services.open-webui = { services.open-webui = {
enable = true; enable = true;
package = pkgs.unstable.open-webui; package = pkgs.unstable.open-webui;
host = "0.0.0.0";
port = 11111; port = 11111;
environment = {
WEBUI_AUTH = "False";
OLLAMA_API_BASE_URL = "http://127.0.0.1:${toString config.services.ollama.port}";
};
}; };
} }

View file

@ -35,6 +35,9 @@ in
"/var/lib/lxcfs" "/var/lib/lxcfs"
"/var/lib/docker" "/var/lib/docker"
"/var/lib/flatpak" "/var/lib/flatpak"
"/var/lib/ollama"
"/var/lib/open-webui"
"/var/lib/private/open-webui"
"/home/*/Downloads" "/home/*/Downloads"
"/home/*/Pictures" "/home/*/Pictures"
"/home/*/Videos" "/home/*/Videos"
@ -56,9 +59,11 @@ in
"/home/*/.templateengine" "/home/*/.templateengine"
"/home/*/.var" "/home/*/.var"
"/home/*/.wine" "/home/*/.wine"
"/home/*/.vagrant.d"
"/home/*/.local/share/containers" "/home/*/.local/share/containers"
"/home/*/.local/share/docker" "/home/*/.local/share/docker"
"/home/*/.local/share/flatpak" "/home/*/.local/share/flatpak"
"/home/*/.local/share/gnome-boxes"
"/home/*/.local/share/bottles" "/home/*/.local/share/bottles"
"/home/*/.local/share/Steam" "/home/*/.local/share/Steam"
"/home/*/.local/share/keybase" "/home/*/.local/share/keybase"
@ -73,6 +78,7 @@ in
"/home/*/.config/gatsby" "/home/*/.config/gatsby"
"/home/*/.config/heroic" "/home/*/.config/heroic"
"/home/*/.config/libvirt" "/home/*/.config/libvirt"
"/home/*/.config/Proton Pass"
"/home/*/.config/spotify/Users" "/home/*/.config/spotify/Users"
"/home/felschr/media" "/home/felschr/media"
"/home/felschr/keybase" "/home/felschr/keybase"

View file

@ -33,6 +33,8 @@ in
"/var/lib/lxcfs" "/var/lib/lxcfs"
"/var/lib/docker" "/var/lib/docker"
"/var/lib/flatpak" "/var/lib/flatpak"
"/var/lib/open-webui"
"/var/lib/private/open-webui"
"/home/*/ignore" "/home/*/ignore"
"/home/*/.cache" "/home/*/.cache"
"/home/*/.local/share/containers" "/home/*/.local/share/containers"

View file

@ -27,6 +27,18 @@
"hfp_hf" "hfp_hf"
"hfp_ag" "hfp_ag"
]; ];
# aptX HD causes problems with Sonos Ace
"bluez5.codecs" = [
"sbc"
"sbc_xq"
"aac"
"ldac"
"aptx"
"aptx_ll"
"aptx_ll_duplex"
"lc3"
"lc3plus_h3"
];
}; };
}; };
} }

View file

@ -23,7 +23,7 @@ in
extraUpFlags = [ extraUpFlags = [
"--reset" "--reset"
"--exit-node-allow-lan-access" "--exit-node-allow-lan-access"
"--exit-node=de-dus-wg-001.mullvad.ts.net" "--exit-node=de-fra-wg-106.mullvad.ts.net"
]; ];
}; };