diff --git a/hosts/fw/modules/ai-mailer.nix b/hosts/fw/modules/ai-mailer.nix index 925b070..40b834d 100644 --- a/hosts/fw/modules/ai-mailer.nix +++ b/hosts/fw/modules/ai-mailer.nix @@ -18,10 +18,10 @@ imap: server: "imap.gmail.com" port: 993 - username: "tandem@paraclub.at" + username: "it@paraclub.at" password: "file://${config.sops.secrets.ai-mailer-imap-password.path}" mailbox_in: "INBOX" - draft_box: "%5BGmail%5D/Entw%C3%BCrfe" + draft_box: "[Gmail]/Entwürfe" processed_box: "INBOX/Done" use_tls: true @@ -45,10 +45,10 @@ - "https://paraclub.at/de/ausbildung/kosten/" polling: - interval: "30s" + interval: "300s" logging: - level: "debug" + level: "info" file_path: "/var/log/ai-mailer/ai-mailer.log" ''; }; @@ -96,5 +96,9 @@ RestrictSUIDSGID = true; CapabilityBoundingSet = ""; }; + + restartTriggers = [ + "/etc/ai-mailer/config.yaml" + ]; }; } diff --git a/hosts/fw/secrets.yaml b/hosts/fw/secrets.yaml index 356b940..1605aaa 100644 --- a/hosts/fw/secrets.yaml +++ b/hosts/fw/secrets.yaml @@ -7,7 +7,7 @@ wg_epicenter_works_key: ENC[AES256_GCM,data:LeLjfwfaz+loWyHYRgIMIPzHzlOnhl9tluKc wg_epicenter_works_psk: ENC[AES256_GCM,data:Den3NDWdP013Or6/2Vll1igUahuRSNW4hu+nDa5vkr93bbveQTaWFT4TD4U=,iv:r3UsD3+3lUIP2X3Grti7wpXTQBXtu1/MdrycEmpZfsI=,tag:ghbAcxmjGVOe9jCZsmFzjA==,type:str] wg_ghetto_at_key: ENC[AES256_GCM,data:OIHmoy3SpIi9aefZnZ1PzpyHbEso18ceoTULf2eQkx1rJbaxC6PD1lma7eQ=,iv:u0eFjHHOBzPTmBvBEQsYY5flcBayiAQKd6e7RyiPwJI=,tag:731C9wvv8bA5fuuQq+weVQ==,type:str] gitea-mailer-password: ENC[AES256_GCM,data:M4qCWNt1oQVJzxThIjocm2frwuVMyx+69TBpke25RwxJxEQnvHL1CM579OVroTm7+gGE/oOJqAwDIepfiDtyM1xm,iv:jayFZMbu3uDimS/rIKZSeoU0MsYwWp880iEMs1oQE4k=,tag:qGDncRkyuCWaELhcxUrqtQ==,type:str] -ai-mailer-imap-password: ENC[AES256_GCM,data:oGrfCimXQqb6qXo9P3PRc5jfUw==,iv:SH6Nh30+ipjJqULPZhw9gG9yqa28ABa7X7adGvkStjM=,tag:Gr2hnNRix5kSgYZ5Uqp/ww==,type:str] +ai-mailer-imap-password: ENC[AES256_GCM,data:kMxDPUK9rk7mbel5JDT03m3Y2w==,iv:cbnkNIVRXd7OLqueSrfYRzfaW9TzI+FauuQD8lgYIy0=,tag:63W7seIgt5TPVFQc84semQ==,type:str] ai-mailer-openrouter-key: ENC[AES256_GCM,data:PCe8kt/M+7g087AKzYMY2H5WO4L+NGkHLsh47fMK36kz+Ju5kd/kpmM4GQcDbI3LgWm/P+T0/mv7kGGOL6KLmBFaFmGV/88cGw==,iv:ruVftGvnv+PX1Zd92tfOezpyaMbYrqCrexelyPUYFMc=,tag:z4JVUCfz/frehar6y+fOlQ==,type:str] gitea-runner: ENC[AES256_GCM,data:NYG3qRLiMjmfA+oHYBXBbxpuX2ZjB/VgvLaS7yr5kJeDN/NukB/B3OZcEfsUWgbBS5IsLENESngWTFmK4W3htN4lSqdg/g4UsUr20beNov+pbyPN05rkBYmSCZZFwZ1L9POEE4GF4LuuoNpDlWIw0mrA8oV8MoI4W5QS2IGranBTIQQaYXU5TEGYa4XMVo4oC75iuH6DIq1KD6OgFAfMhm/wlbP8CP/Iaw2K8CNPxktk93pm3OSmggf22Z4JPEnvV25sc9iBkxLkDk9FXYFys0g=,iv:UzL5ncVOC/loJwcFSG1QJHnzLp3il4Hf3qDwLWxrIlo=,tag:w0Zn/E+02KyAsPXZdOLrew==,type:str] gitea-runner-token: ENC[AES256_GCM,data:HpBjLS10w78ihbnAUrlCRGvwrXLBYKH5v/P7XggoUSWLoAazSVQArABxaK7PJas=,iv:q3Y6jV0gmug06O0EYqGVyIJ4AvMGr2ydwY17YKxo0Qw=,tag:Ws5HLbdaeYGGXzDZW/FX4w==,type:str] @@ -62,8 +62,8 @@ sops: WXJpUUxadERyYUExRFMzNzBXaUVET3cKG9ZwWy5YvTr/BAw/i+ZJos5trwRvaW5j eV/SHiEteZZtCuCVFAp3iolE/mJyu97nA2yFwWaLN86h+/xkOJsdqA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-29T12:07:29Z" - mac: ENC[AES256_GCM,data:ehYAn2oG6nii3e9pCrHllNLXcQRccKKCWCAS9zr3lAh8IehJEp9UTMKJMqGqzMoUDHI+ZvPy2/nIDL6einLzhH0IGptitRm5V8BafKyGu4MdEh8kHXKEtZyMvtc/QWAisCzDYpGWgNXxxMvasEnzBFgYFEpX+z9Y2IOi11y8kBY=,iv:saUzOdT/dKOmwQh5w0DwWTtLqthDRqc8+gJIbYlIrWg=,tag:gLMofXp28tR3j0bfVVPeyA==,type:str] + lastmodified: "2025-05-29T18:23:13Z" + mac: ENC[AES256_GCM,data:19U1KlPoC/hj8sGRjO3j/ONYcFvmUTul6qP6CaRE0BhJfpeaVYq5OvqdErVnw8UA/zBJ+zpSX/N13jcsx8QVqTljMha2fbx7iZxMbpVgzGZ+fhwICLri6PwT/sNLXKFrv8VZqNUYR5q+PWSlKCu8QQarDPvGR6qj4gm7VN7tVsI=,iv:udieJwN63LEeCRhZrLpMN6VCHBzAYt8BeJhbbLVxwCM=,tag:M6iYQb/b7vMoM+9e5is3hw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4 diff --git a/hosts/nb/channel b/hosts/nb/channel index ced117e..93f5df5 100644 --- a/hosts/nb/channel +++ b/hosts/nb/channel @@ -1 +1 @@ -https://channels.nixos.org/nixos-24.11 +https://channels.nixos.org/nixos-25.05 diff --git a/hosts/nb/configuration.nix b/hosts/nb/configuration.nix index 6407546..0e2bb86 100644 --- a/hosts/nb/configuration.nix +++ b/hosts/nb/configuration.nix @@ -4,10 +4,6 @@ { config, lib, pkgs, ... }: let - unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { - config = { allowUnfree = true; }; - }; - impermanence = builtins.fetchTarball "https://github.com/nix-community/impermanence/archive/master.tar.gz"; in { nixpkgs.config.allowUnfree = true; diff --git a/hosts/nb/modules/coding.nix b/hosts/nb/modules/coding.nix index 92ba90d..af37c38 100644 --- a/hosts/nb/modules/coding.nix +++ b/hosts/nb/modules/coding.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: let - unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { - config = { allowUnfree = true; }; - }; + # unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { + # config = { allowUnfree = true; }; + # }; in { environment.systemPackages = with pkgs; [ - unstable.claude-code + claude-code ]; } diff --git a/hosts/nb/modules/nvim/config/utils.lua b/hosts/nb/modules/nvim/config/utils.lua index ec15d39..a026b3d 100644 --- a/hosts/nb/modules/nvim/config/utils.lua +++ b/hosts/nb/modules/nvim/config/utils.lua @@ -1,16 +1,16 @@ --- null-ls -local nb = require('null-ls').builtins +-- none-ls +local nb = require('none-ls').builtins -require('null-ls').setup({ - sources = { - nb.formatting.alejandra, - nb.code_actions.statix, - nb.diagnostics.cppcheck, - nb.diagnostics.deadnix, - nb.diagnostics.statix, - nb.diagnostics.eslint, - nb.completion.spell, - }, +require('none-ls').setup({ + sources = { + nb.formatting.alejandra, + nb.code_actions.statix, + nb.diagnostics.cppcheck, + nb.diagnostics.deadnix, + nb.diagnostics.statix, + nb.diagnostics.eslint, + nb.completion.spell, + }, }) require("gitsigns").setup() diff --git a/hosts/nb/modules/nvim/default.nix b/hosts/nb/modules/nvim/default.nix index c7509b3..233414f 100644 --- a/hosts/nb/modules/nvim/default.nix +++ b/hosts/nb/modules/nvim/default.nix @@ -1,14 +1,14 @@ { pkgs, ... }: let - unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { - config = { allowUnfree = true; }; - }; + # unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { + # config = { allowUnfree = true; }; + # }; in { environment.variables = { EDITOR = "vim"; }; nixpkgs.overlays = [ (import ./chatgpt.nix) - (import ./gitea.nix) + # (import ./gitea.nix) ]; environment.systemPackages = with pkgs; [ @@ -23,7 +23,7 @@ in ripgrep lua luaPackages.lyaml - unstable.aider-chat + aider-chat (neovim.override { vimAlias = true; configure = { @@ -33,7 +33,7 @@ in bufferline-nvim catppuccin-nvim chatgpt-nvim - gitea-nvim + # gitea-nvim cmp-buffer cmp-nvim-lsp cmp-path @@ -53,7 +53,7 @@ in lspkind-nvim mini-icons neogit - null-ls-nvim + none-ls-nvim nvim-autopairs nvim-cmp nvim-colorizer-lua @@ -75,7 +75,7 @@ in vim-sneak vim-vsnip which-key-nvim - unstable.pkgs.vimPlugins.rest-nvim + pkgs.vimPlugins.rest-nvim aider-nvim ]; opt = []; diff --git a/hosts/nb/modules/sway/sway.conf b/hosts/nb/modules/sway/sway.conf index 26769fd..4c34c4e 100644 --- a/hosts/nb/modules/sway/sway.conf +++ b/hosts/nb/modules/sway/sway.conf @@ -325,8 +325,7 @@ output DP-5 position 0 0 output DP-5 bg #282a36 solid_color output DP-5 bg ~/.wallpaper.png center -input * xkb_layout "de" -input * xkb_variant "colemak,,typewriter" +input * xkb_layout "de input * xkb_options "grp:win_space_toggle" input "MANUFACTURER1 Keyboard" xkb_model "pc101" diff --git a/hosts/nb/modules/sway/sway.nix b/hosts/nb/modules/sway/sway.nix index f63e7d6..0496af8 100644 --- a/hosts/nb/modules/sway/sway.nix +++ b/hosts/nb/modules/sway/sway.nix @@ -22,9 +22,9 @@ let sway-conf = builtins.readFile ./sway.conf + '' exec swaybg -m center -c 252525 -i ~/.wallpaper.png ''; - unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { - config = { allowUnfree = true; }; - }; + # unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { + # config = { allowUnfree = true; }; + # }; apache-ds-pin = import (builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/9aec01027f7ea2bca07bb51d5ed83e78088871c1.tar.gz"; }) {}; @@ -44,10 +44,7 @@ in { hardware.graphics.extraPackages = [ pkgs.amdvlk ]; environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; - hardware.pulseaudio.support32Bit = true; - hardware.sane.enable = true; - hardware.pulseaudio.enable = false; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "dominik" ]; @@ -79,13 +76,13 @@ in { apache-ds-pin.apache-directory-studio rofi-rbw-wayland # TODO: remove at 25.05 - unstable.cryptomator + cryptomator fontforge hypnotix - unstable.code-cursor - unstable.windsurf - unstable.codex + code-cursor + windsurf + codex # vscode-insiders # unstable.vscode-fhs @@ -97,7 +94,7 @@ in { freecad openscad - (unstable.where-is-my-sddm-theme.override { + (where-is-my-sddm-theme.override { themeConfig.General = { showUsersByDefault = true; background = "/nix/persist/system/wallpaper.png"; @@ -169,7 +166,7 @@ in { xorg.libXcursor xorg.libXi xorg.libXrandr - yubikey-manager-qt + yubioath-flutter ]; programs.light.enable = true; @@ -178,7 +175,8 @@ in { noto-fonts noto-fonts-cjk-sans noto-fonts-emoji - nerdfonts + nerd-fonts._0xproto + nerd-fonts.droid-sans-mono ]; security.rtkit.enable = true; diff --git a/utils/modules/autoupgrade.nix b/utils/modules/autoupgrade.nix index 1ff8002..aabfc06 100644 --- a/utils/modules/autoupgrade.nix +++ b/utils/modules/autoupgrade.nix @@ -3,5 +3,4 @@ { system.autoUpgrade.enable = true; system.autoUpgrade.allowReboot = false; - system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.11"; } diff --git a/utils/pkgs/ai-mailer.nix b/utils/pkgs/ai-mailer.nix index 40830d3..eb10d82 100644 --- a/utils/pkgs/ai-mailer.nix +++ b/utils/pkgs/ai-mailer.nix @@ -6,8 +6,8 @@ buildGoModule rec { src = fetchgit { url = "https://git.cloonar.com/Paraclub/ai-mailer.git"; - rev = "8903aa072a482e1e52170c840bf87d8da5d9d9e0"; - sha256 = "sha256-+YPB3tcy2+ZiiwYfg6QzPcrg1gf9ivlLaZRzviwWe90="; + rev = "56c9f764fcea2834fefac28f446b86c52f3274bd"; + sha256 = "sha256-zOabK0OWh0iHEL0kMC74i4rYnUlry57dGQE4k/wqDG0="; }; vendorHash = "sha256-h4RaB891GXAkgObZHYil6BOvbYp6yJSRxRj40Fhchmw=";