From 781a03875c0585c0f0be94568750d89796caf103 Mon Sep 17 00:00:00 2001 From: fwastring Date: Wed, 17 Sep 2025 10:03:31 +0200 Subject: [PATCH 1/2] Added a new abbr --- flake.lock | 78 ++++++++++++++++++++--------------------- moduler/fish.nix | 4 +++ moduler/lsp.nix | 39 +++++++++++---------- moduler/uptime-kuma.nix | 2 +- 4 files changed, 64 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index b024ca1..2e7fade 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1757239681, - "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1757385184, - "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1756891319, - "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", + "lastModified": 1757542864, + "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", + "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757423991, - "narHash": "sha256-tL+b6WC4gJJSo6wjNVIZpQ0DsYg8RmoGHxYuk6jJKbU=", + "lastModified": 1757936652, + "narHash": "sha256-qQi/z2sfqFpVnDP+oqIBXRxwRCsmtk7HFOrQF08h6e8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "150d693fe794a01aab762a18d2d8a2c8bc54b43c", + "rev": "9e74d0aea7614eaf238ef07261129026572337e7", "type": "github" }, "original": { @@ -536,11 +536,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1757508108, + "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757376306, - "narHash": "sha256-xZ9agpXP92762wo6pEZd1gs1jJEjrd4WWGtzlpY3QaA=", + "lastModified": 1757894719, + "narHash": "sha256-sG0DIub/4dB4HK8CahQYm6rTcxT8LHS6QmQNwThIN6M=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b142f8f6336853ff325fe39c9f658e51e42c781b", + "rev": "2376288a3cf701a272d4b083d2e39a44d087f9e2", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1757369388, - "narHash": "sha256-nLc2Oi6N2DfZTVBl8plpSlx13DQGc087ziWymAyjkOI=", + "lastModified": 1757891857, + "narHash": "sha256-GWKvDTB+03uQGx1qzuBQCewPgZiD8HWX2rovynsBbt8=", "owner": "neovim", "repo": "neovim", - "rev": "acb99b8a6572d8ea8d917955a653945550923be0", + "rev": "7b8b9d270f6ede43661f54573d1f4f0ae49d4ff1", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757347588, - "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -771,11 +771,11 @@ ] }, "locked": { - "lastModified": 1757239681, - "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -802,11 +802,11 @@ ] }, "locked": { - "lastModified": 1757503115, - "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", + "lastModified": 1757847158, + "narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", + "rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab", "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/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..1c9131e 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -7,24 +7,25 @@ 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 + ]; } 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"; }; }; }; From 562970f62a4fb289fc478852b168f04ad8efdaaf Mon Sep 17 00:00:00 2001 From: fwastring Date: Wed, 17 Sep 2025 16:03:35 +0200 Subject: [PATCH 2/2] Added typstfmt --- maskiner/core/configuration.nix | 10 ---------- moduler/lsp.nix | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) 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/lsp.nix b/moduler/lsp.nix index 1c9131e..c052aa8 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -27,5 +27,6 @@ typescript-language-server lua-language-server marksman + typstfmt ]; }