diff options
| -rw-r--r-- | hosts/meowbook/default.nix | 2 | ||||
| -rw-r--r-- | hosts/the-meowchine/default.nix | 10 | ||||
| -rw-r--r-- | modules/doas.nix | 16 | ||||
| -rw-r--r-- | modules/user/default.nix | 7 | ||||
| -rw-r--r-- | modules/user/desktop/apps/librewolf.nix | 12 | ||||
| -rw-r--r-- | modules/user/editors/kakoune/default.nix | 42 |
6 files changed, 62 insertions, 27 deletions
diff --git a/hosts/meowbook/default.nix b/hosts/meowbook/default.nix index 9da8e62..779bd31 100644 --- a/hosts/meowbook/default.nix +++ b/hosts/meowbook/default.nix @@ -42,7 +42,7 @@ }; systemd.network = { - enable = true; + enable = true; netdevs."90-evilvpn".enable = true; networks."90-evilvpn".address = [ "10.6.6.4/24" ]; }; diff --git a/hosts/the-meowchine/default.nix b/hosts/the-meowchine/default.nix index 1288fca..c198699 100644 --- a/hosts/the-meowchine/default.nix +++ b/hosts/the-meowchine/default.nix @@ -5,7 +5,7 @@ ... }: { - boot.loader.systemd-boot.consoleMode = "max"; + boot.loader.systemd-boot.consoleMode = "max"; environment.systemPackages = with pkgs; [ wireguard-tools ]; @@ -70,12 +70,12 @@ }; users.users.rosa = { - enable = true; - extraGroups = [ "libvirtd" ]; + enable = true; + extraGroups = [ "libvirtd" ]; }; virtualisation.libvirtd = { - enable = true; - qemu.swtpm.enable = true; + enable = true; + qemu.swtpm.enable = true; }; } diff --git a/modules/doas.nix b/modules/doas.nix index 16a6dc6..5a99756 100644 --- a/modules/doas.nix +++ b/modules/doas.nix @@ -8,14 +8,14 @@ { security = { doas.extraRules = [ - { - groups = [ "wheel" ]; - } - { - cmd = "mount"; - groups = [ "wheel" ]; - noPass = true; - } + { + groups = [ "wheel" ]; + } + { + cmd = "mount"; + groups = [ "wheel" ]; + noPass = true; + } ]; sudo.enable = lib.mkDefault (!config.security.doas.enable); diff --git a/modules/user/default.nix b/modules/user/default.nix index ed7c5b2..efe8517 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { imports = [ ./desktop diff --git a/modules/user/desktop/apps/librewolf.nix b/modules/user/desktop/apps/librewolf.nix index 91f86f5..2b55dc9 100644 --- a/modules/user/desktop/apps/librewolf.nix +++ b/modules/user/desktop/apps/librewolf.nix @@ -1,5 +1,15 @@ -{ config, ... }: { + config, + lib, + pkgs, + ... +}: +{ + nixpkgs.config.permittedInsecurePackages = [ + "librewolf-151.0.2-1" + "librewolf-unwrapped-151.0.2-1" + ]; + programs.librewolf = { profiles = let diff --git a/modules/user/editors/kakoune/default.nix b/modules/user/editors/kakoune/default.nix index e4f4aa5..f519c5b 100644 --- a/modules/user/editors/kakoune/default.nix +++ b/modules/user/editors/kakoune/default.nix @@ -22,13 +22,33 @@ { commands = "lsp-enable-window"; name = "WinSetOption"; - option = "filetype=(css|html|java|zig)"; + option = "filetype=(css|html|java|json|zig)"; } { - commands = "set window filetype json"; - name = "WinCreate"; + commands = "set buffer filetype json"; + name = "BufCreate"; option = ".*\.mcmeta"; } + { + commands = '' + set buffer lsp_servers %{ + [vscode-json-language-server] + args = ["--stdio"] + root_globs = [".git"] + settings_section = "_" + [[vscode-json-language-server.settings._]] + provideFormatter = true + json.format.enable = true + json.validate.enabble = true + + [[vscode-json-language-server.settings._.json.schemas]] + fileMatch = ["fabric.mod.json"] + url = "https://www.schemastore.org/fabric.mod.json" + } + ''; + name = "BufSetOption"; + option = "filetype=json"; + } ]; indentWidth = 0; @@ -52,16 +72,16 @@ mode = "normal"; } { - docstring = "Rename the symbol below the cursor"; - effect = ":lsp-rename-prompt<ret>"; - key = "<a-r>"; - mode = "normal"; + docstring = "Rename the symbol below the cursor"; + effect = ":lsp-rename-prompt<ret>"; + key = "<a-r>"; + mode = "normal"; } { - docstring = "Create a new file"; - effect = ":e %sh{${(pkgs.writeShellScript "newfile" (builtins.readFile ./newfile.sh))}}<ret>"; - key = "<c-a-n>"; - mode = "normal"; + docstring = "Create a new file"; + effect = ":e %sh{${(pkgs.writeShellScript "newfile" (builtins.readFile ./newfile.sh))}}<ret>"; + key = "<c-a-n>"; + mode = "normal"; } ]; |