Merge branch 'main' of github.com:fwastring/nix

This commit is contained in:
fwastring 2025-09-18 11:46:35 +02:00
commit 8ae96e9f6a
5 changed files with 32 additions and 36 deletions

12
flake.lock generated
View file

@ -443,11 +443,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1757811161, "lastModified": 1757936652,
"narHash": "sha256-laCB71qgn9Eht7bH1nobIzEiR5r7WRHAB7XHHxLTiLQ=", "narHash": "sha256-qQi/z2sfqFpVnDP+oqIBXRxwRCsmtk7HFOrQF08h6e8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "559024c3314e4b1180b10b80fce4e9f20bad14c8", "rev": "9e74d0aea7614eaf238ef07261129026572337e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,11 +836,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1757360005, "lastModified": 1757956156,
"narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -31,16 +31,6 @@ in
kubernetes-tools.enable = true; 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 = { stylix = {
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";

View file

@ -44,6 +44,10 @@
setCursor = "%"; setCursor = "%";
expansion = "cha https://search.wastring.com/search?q=%"; expansion = "cha https://search.wastring.com/search?q=%";
}; };
tw = {
setCursor = "%";
expansion = "typst watch % --open zathura /tmp/zathura.pdf";
};
c = { c = {
setCursor = "%"; setCursor = "%";
expansion = "ssh 'fw:%@gateway.internalifacts.se' -p 2222"; expansion = "ssh 'fw:%@gateway.internalifacts.se' -p 2222";

View file

@ -7,7 +7,8 @@
pkgs, pkgs,
myhostname, myhostname,
... ...
}: { }:
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nixd nixd
@ -15,7 +16,7 @@
omnisharp-roslyn omnisharp-roslyn
nodePackages.vscode-json-languageserver nodePackages.vscode-json-languageserver
tailwindcss-language-server tailwindcss-language-server
dockerfile-language-server-nodejs dockerfile-language-server
nodejs_22 nodejs_22
bash-language-server bash-language-server
helm-ls helm-ls
@ -26,5 +27,6 @@
typescript-language-server typescript-language-server
lua-language-server lua-language-server
marksman marksman
typstfmt
]; ];
} }

View file

@ -14,7 +14,7 @@ in
enable = true; enable = true;
settings = { settings = {
PORT = "4000"; PORT = "4000";
HOST = "192.168.1.227"; HOST = "100.64.0.4";
}; };
}; };
}; };