Compare commits

..

2 commits

3 changed files with 31 additions and 41 deletions

View file

@ -77,9 +77,6 @@
"rpool".device = "/dev/nvme0n1p2"; "rpool".device = "/dev/nvme0n1p2";
}; };
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View file

@ -29,25 +29,31 @@
userEmail = "git@katherina.rocks"; userEmail = "git@katherina.rocks";
}; };
programs.vscode = let programs.vscode =
system = builtins.currentSystem; let
sources = import ../../npins; system = builtins.currentSystem;
extensions = (import sources.nix-vscode-extensions).extensions.${system}; sources = import ../../npins;
in { extensions = (import sources.nix-vscode-extensions).extensions.${system};
enable = true; in
package = pkgs.vscodium; {
extensions = (with pkgs.vscode-extensions; [ enable = true;
jnoortheen.nix-ide package = pkgs.vscodium;
]) ++ (with extensions.open-vsx; [ extensions = (with pkgs.vscode-extensions; [
robbowen.synthwave-vscode jnoortheen.nix-ide
]); ]) ++ (with extensions.open-vsx; [
userSettings = { robbowen.synthwave-vscode
"git.autofetch" = true; ]);
"nix.enableLanguageServer" = true; userSettings = {
"nix.serverPath" = "nil"; "git.autofetch" = true;
"workbench.colorTheme" = "SynthWave '84"; "nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"nix.serverSettings".nil = {
diagnostics.ignored = [ "unused_binding" "unused_with" ];
formatting.command = [ "nixpkgs-fmt" ];
};
"workbench.colorTheme" = "SynthWave '84";
};
}; };
};
home.stateVersion = "23.11"; home.stateVersion = "23.11";
}; };

View file

@ -1,12 +1,8 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -99,16 +95,12 @@
proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict"; proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
''; '';
virtualHosts = let virtualHosts = {
base = { "git.katherina.rocks" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/".proxyPass = "http://[::1]:3000/";
}; };
proxy = port: {
locations."/".proxyPass = "http://[::1]:${toString(port)}/";
};
in {
"git.katherina.rocks" = base // proxy 3000;
}; };
}; };
security.acme = { security.acme = {
@ -139,12 +131,7 @@
}; };
}; };
# Copy the NixOS configuration file and link it from the resulting system system.stateVersion = "23.11";
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
system.stateVersion = "23.11"; # Did you read the comment?
} }