diff --git a/flake.lock b/flake.lock index a103fc4..2e7fade 100644 --- a/flake.lock +++ b/flake.lock @@ -443,11 +443,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757811161, - "narHash": "sha256-laCB71qgn9Eht7bH1nobIzEiR5r7WRHAB7XHHxLTiLQ=", + "lastModified": 1757936652, + "narHash": "sha256-qQi/z2sfqFpVnDP+oqIBXRxwRCsmtk7HFOrQF08h6e8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "559024c3314e4b1180b10b80fce4e9f20bad14c8", + "rev": "9e74d0aea7614eaf238ef07261129026572337e7", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757360005, - "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", + "lastModified": 1757956156, + "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", "owner": "nix-community", "repo": "stylix", - "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", + "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", "type": "github" }, "original": { diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index 22e00b9..50b43a5 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -31,16 +31,6 @@ in kubernetes-tools.enable = true; - - sops.defaultSopsFile = ../../secrets/sops.yaml; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - sops.secrets.gandi_key = { - # This path is where the *decrypted* secret will be placed at runtime - path = "/run/secrets/gandi_key"; - owner = "root"; - mode = "0440"; - }; - stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; diff --git a/moduler/fish.nix b/moduler/fish.nix index ee34526..eeacbd0 100644 --- a/moduler/fish.nix +++ b/moduler/fish.nix @@ -44,6 +44,10 @@ setCursor = "%"; expansion = "cha https://search.wastring.com/search?q=%"; }; + tw = { + setCursor = "%"; + expansion = "typst watch % --open zathura /tmp/zathura.pdf"; + }; c = { setCursor = "%"; expansion = "ssh 'fw:%@gateway.internalifacts.se' -p 2222"; diff --git a/moduler/lsp.nix b/moduler/lsp.nix index a6bb043..c052aa8 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -7,24 +7,26 @@ pkgs, myhostname, ... -}: { +}: +{ - environment.systemPackages = with pkgs; [ - nixd - gopls - omnisharp-roslyn - nodePackages.vscode-json-languageserver - tailwindcss-language-server - dockerfile-language-server-nodejs - nodejs_22 - bash-language-server - helm-ls - yaml-language-server - vue-language-server - vtsls - typescript - typescript-language-server - lua-language-server - marksman - ]; + environment.systemPackages = with pkgs; [ + nixd + gopls + omnisharp-roslyn + nodePackages.vscode-json-languageserver + tailwindcss-language-server + dockerfile-language-server + nodejs_22 + bash-language-server + helm-ls + yaml-language-server + vue-language-server + vtsls + typescript + typescript-language-server + lua-language-server + marksman + typstfmt + ]; } diff --git a/moduler/uptime-kuma.nix b/moduler/uptime-kuma.nix index 8815dfd..3be2e29 100644 --- a/moduler/uptime-kuma.nix +++ b/moduler/uptime-kuma.nix @@ -14,7 +14,7 @@ in enable = true; settings = { PORT = "4000"; - HOST = "192.168.1.227"; + HOST = "100.64.0.4"; }; }; };