Compare commits
1 commit
prod
...
jupyter_di
Author | SHA1 | Date | |
---|---|---|---|
fruchti | 6ed502d51c |
|
@ -3,7 +3,7 @@
|
||||||
config = lib.mkDefault {
|
config = lib.mkDefault {
|
||||||
i18n.defaultLocale = "en_GB.UTF-8";
|
i18n.defaultLocale = "en_GB.UTF-8";
|
||||||
console.keyMap = "us";
|
console.keyMap = "us";
|
||||||
services.xserver.xkb.layout = "us-fruchti";
|
services.xserver.layout = "us-fruchti";
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
changeColorScheme-vim
|
changeColorScheme-vim
|
||||||
vim-dispatch
|
vim-dispatch
|
||||||
vimtex
|
vimtex
|
||||||
vim-suda
|
suda-vim
|
||||||
];
|
];
|
||||||
opt = [];
|
opt = [];
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,8 +5,7 @@
|
||||||
tmux zellij
|
tmux zellij
|
||||||
wget
|
wget
|
||||||
rsync
|
rsync
|
||||||
magic-wormhole
|
git
|
||||||
git git-lfs
|
|
||||||
gnupg
|
gnupg
|
||||||
file
|
file
|
||||||
ripgrep
|
ripgrep
|
||||||
|
@ -14,7 +13,7 @@
|
||||||
htop
|
htop
|
||||||
ncdu
|
ncdu
|
||||||
killall
|
killall
|
||||||
ranger nnn # joshuto
|
ranger nnn joshuto
|
||||||
hexyl
|
hexyl
|
||||||
rink
|
rink
|
||||||
|
|
||||||
|
@ -38,7 +37,7 @@
|
||||||
xsel
|
xsel
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
vollkorn
|
vollkorn
|
||||||
alegreya alegreya-sans
|
alegreya alegreya-sans
|
||||||
b612
|
b612
|
||||||
|
|
|
@ -24,7 +24,7 @@ in
|
||||||
groups = [ "wheel" ];
|
groups = [ "wheel" ];
|
||||||
commands = [
|
commands = [
|
||||||
{
|
{
|
||||||
command = "/run/current-system/sw/bin/nixos-rebuild";
|
command = "${pkgs.nixos-rebuild}/bin/nixos-rebuild *";
|
||||||
options = [ "NOPASSWD" ];
|
options = [ "NOPASSWD" ];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
services.xserver.xkb.extraLayouts = {
|
services.xserver.extraLayouts = {
|
||||||
de-x270 = {
|
de-x270 = {
|
||||||
description = "DE layout with some small changes for Thinkpad X270";
|
description = "DE layout with some small changes for Thinkpad X270";
|
||||||
languages = [ "deu" ];
|
languages = [ "deu" ];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./development.nix
|
./development.nix
|
||||||
./xfce.nix
|
./gnome.nix
|
||||||
./x270.nix
|
./x270.nix
|
||||||
./scanner.nix
|
./scanner.nix
|
||||||
./printer.nix
|
./printer.nix
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
console.keyMap = "de";
|
console.keyMap = "de";
|
||||||
services.xserver.xkb.layout = "de-x270";
|
services.xserver.layout = "de-x270";
|
||||||
i18n.defaultLocale = "de_DE.UTF-8";
|
i18n.defaultLocale = "de_DE.UTF-8";
|
||||||
networking.hostName = "Disco";
|
networking.hostName = "Disco";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
@ -63,16 +63,13 @@
|
||||||
|
|
||||||
zathura
|
zathura
|
||||||
inkscape
|
inkscape
|
||||||
vlc mpv a52dec
|
vlc
|
||||||
gthumb
|
gthumb
|
||||||
gimp
|
gimp
|
||||||
tenacity
|
tenacity
|
||||||
|
|
||||||
openscad
|
openscad
|
||||||
freecad
|
freecad
|
||||||
solvespace
|
solvespace
|
||||||
(pkgs.callPackage ../packages/dune3d.nix {})
|
|
||||||
|
|
||||||
vscodium
|
vscodium
|
||||||
marktext
|
marktext
|
||||||
tor-browser-bundle-bin
|
tor-browser-bundle-bin
|
||||||
|
@ -175,16 +172,6 @@
|
||||||
LidSwitchIgnoreInhibited = no
|
LidSwitchIgnoreInhibited = no
|
||||||
'';
|
'';
|
||||||
|
|
||||||
services.earlyoom = {
|
|
||||||
enable = true;
|
|
||||||
enableNotifications = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [{
|
|
||||||
device = "/swapfile";
|
|
||||||
size = 16 * 1024;
|
|
||||||
}];
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./forgejo.nix
|
./gitea.nix
|
||||||
./tls_sni.nix
|
./tls_sni.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
boot.loader.grub.device = "/dev/sda";
|
boot.loader.grub.device = "/dev/vda";
|
||||||
|
|
||||||
networking.hostName = "Emitter";
|
networking.hostName = "Emitter";
|
||||||
|
|
||||||
|
@ -14,12 +14,12 @@
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
networking = {
|
networking = {
|
||||||
defaultGateway = {
|
defaultGateway = {
|
||||||
address = "176.96.139.1";
|
address = "2.59.133.1";
|
||||||
interface = "ens18";
|
interface = "ens3";
|
||||||
};
|
};
|
||||||
defaultGateway6 = {
|
defaultGateway6 = {
|
||||||
address = "2a0d:5940:80:4e::1";
|
address = "2a0d:5940:7::1";
|
||||||
interface = "ens18";
|
interface = "ens3";
|
||||||
};
|
};
|
||||||
nameservers = [
|
nameservers = [
|
||||||
"9.9.9.10"
|
"9.9.9.10"
|
||||||
|
@ -27,38 +27,38 @@
|
||||||
"2606:4700:4700::1111"
|
"2606:4700:4700::1111"
|
||||||
"2001:4860:4860::8888"
|
"2001:4860:4860::8888"
|
||||||
];
|
];
|
||||||
interfaces.ens18 = {
|
interfaces.ens3 = {
|
||||||
ipv4 = {
|
ipv4 = {
|
||||||
addresses = [
|
addresses = [
|
||||||
{
|
{
|
||||||
address = "176.96.139.54";
|
address = "2.59.133.12";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
address = "176.96.139.0";
|
address = "2.59.133.0";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
via = "176.96.139.1";
|
via = "2.59.133.1";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
ipv6 = {
|
ipv6 = {
|
||||||
addresses = [
|
addresses = [
|
||||||
{
|
{
|
||||||
address = "2a0d:5940:80:4e::2";
|
address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
|
||||||
prefixLength = 64;
|
prefixLength = 64;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
address = "fe80::4874:40ff:fe38:7a45";
|
address = "fe80::216:3cff:fe63:9a54";
|
||||||
prefixLength = 64;
|
prefixLength = 64;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
address = "2a0d:5940:80:4e::2";
|
address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
|
||||||
prefixLength = 64;
|
prefixLength = 64;
|
||||||
via = "2a0d:5940:80:4e::1";
|
via = "2a0d:5940:7::1";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -98,12 +98,9 @@
|
||||||
cat > $out/sbin/burp <<-EOF
|
cat > $out/sbin/burp <<-EOF
|
||||||
#!/${pkgs.bash}/bin/bash
|
#!/${pkgs.bash}/bin/bash
|
||||||
set -e
|
set -e
|
||||||
echo "Ensuring rupert.gvfr.de is up."
|
|
||||||
${pkgs.dig}/bin/nslookup rupert.gvfr.de
|
${pkgs.dig}/bin/nslookup rupert.gvfr.de
|
||||||
${pkgs.unixtools.ping}/bin/ping -c1 rupert.gvfr.de >/dev/null
|
${pkgs.unixtools.ping}/bin/ping -c1 rupert.gvfr.de >/dev/null
|
||||||
echo "Opening SSH tunnel."
|
|
||||||
${pkgs.openssh}/bin/ssh -i /secrets/id_burp_remote -o IdentitiesOnly=yes -o ExitOnForwardFailure=yes -L 4971:localhost:4971 burp-remote@rupert.gvfr.de -f true
|
${pkgs.openssh}/bin/ssh -i /secrets/id_burp_remote -o IdentitiesOnly=yes -o ExitOnForwardFailure=yes -L 4971:localhost:4971 burp-remote@rupert.gvfr.de -f true
|
||||||
echo "Beginning backup operation."
|
|
||||||
$out/sbin/burp-untunneled \$@
|
$out/sbin/burp-untunneled \$@
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/sbin/burp
|
chmod +x $out/sbin/burp
|
||||||
|
@ -134,11 +131,7 @@
|
||||||
};
|
};
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
|
|
||||||
RestartSec = retryDelay;
|
RestartSec = retryDelay;
|
||||||
# Skip transitions through failed state, i.e. don’t send a e-mail
|
|
||||||
# before the maximum number of retries is exhausted
|
|
||||||
RestartMode = "direct";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,24 +21,6 @@ in
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.kernelParams = [ "acpi=force" "reboot=bios" ];
|
boot.kernelParams = [ "acpi=force" "reboot=bios" ];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "i915" ];
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
|
||||||
};
|
|
||||||
hardware.opengl = {
|
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
(if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
|
|
||||||
libvdpau-va-gl
|
|
||||||
vaapiVdpau
|
|
||||||
# intel-media-driver
|
|
||||||
];
|
|
||||||
};
|
|
||||||
environment.variables = {
|
|
||||||
VDPAU_DRIVER = "va_gl";
|
|
||||||
};
|
|
||||||
hardware.cpu.intel.updateMicrocode = true;
|
|
||||||
|
|
||||||
networking.hostName = "Rupert";
|
networking.hostName = "Rupert";
|
||||||
|
|
||||||
users.users = {
|
users.users = {
|
||||||
|
@ -74,7 +56,6 @@ in
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||||
xdg.portal.enable = true;
|
xdg.portal.enable = true;
|
||||||
xdg.portal.config.common.default = "*";
|
|
||||||
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -146,11 +127,6 @@ in
|
||||||
SUBSYSTEM=="video4linux", ATTRS{idProduct}=="0002", ATTRS{idVendor}=="1d6b", SYMLINK+="hdmi_capture"
|
SUBSYSTEM=="video4linux", ATTRS{idProduct}=="0002", ATTRS{idVendor}=="1d6b", SYMLINK+="hdmi_capture"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
swapDevices = [{
|
|
||||||
device = "/swapfile";
|
|
||||||
size = 8 * 1024;
|
|
||||||
}];
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -4,14 +4,12 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
windowManager.bspwm.enable = true;
|
windowManager.bspwm.enable = true;
|
||||||
displayManager = {
|
displayManager = {
|
||||||
|
defaultSession = "none+bspwm";
|
||||||
lightdm.enable = true;
|
lightdm.enable = true;
|
||||||
|
autoLogin.enable = true;
|
||||||
|
autoLogin.user = "waldi";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.displayManager = {
|
|
||||||
defaultSession = "none+bspwm";
|
|
||||||
autoLogin.enable = true;
|
|
||||||
autoLogin.user = "waldi";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.unclutter-xfixes = {
|
services.unclutter-xfixes = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="0660", GROUP="plugdev"
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="0660", GROUP="plugdev"
|
||||||
|
|
||||||
# WCH-LinkE
|
# WCH-LinkE
|
||||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", MODE="0660", GROUP="plugdev"
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", MODE="0660", GROUP="plugdev"
|
||||||
|
|
||||||
# Glasgow
|
# Glasgow
|
||||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="20b7", ATTRS{idProduct}=="9db1", MODE="0660", GROUP="plugdev"
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="20b7", ATTRS{idProduct}=="9db1", MODE="0660", GROUP="plugdev"
|
||||||
|
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
@ -2,17 +2,18 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
domain = "git.25120.org";
|
domain = "git.25120.org";
|
||||||
forgejoCustom = pkgs.callPackage ../packages/directory.nix {
|
giteaCustom = pkgs.callPackage ../packages/directory.nix {
|
||||||
name = "forgejo-custom";
|
name = "gitea-custom";
|
||||||
source = ./forgejo-custom;
|
source = ./gitea-custom;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.forgejo = {
|
services.gitea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
appName = "${domain}";
|
||||||
database = {
|
database = {
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
passwordFile = "/secrets/forgejo_db_password";
|
passwordFile = "/secrets/gitea_db_password";
|
||||||
createDatabase = false;
|
createDatabase = false;
|
||||||
};
|
};
|
||||||
repositoryRoot = "/data/git/repositories";
|
repositoryRoot = "/data/git/repositories";
|
||||||
|
@ -41,7 +42,7 @@ in
|
||||||
input_file="$1"
|
input_file="$1"
|
||||||
|
|
||||||
command="${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic"
|
command="${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic"
|
||||||
cache_directory="${config.services.forgejo.stateDir}/markup_cache/jupyter"
|
cache_directory="${config.services.gitea.stateDir}/markup_cache/jupyter"
|
||||||
max_cache_file_count="${toString max_cached_jupyter_notebooks}"
|
max_cache_file_count="${toString max_cached_jupyter_notebooks}"
|
||||||
|
|
||||||
cache_file="$cache_directory/$(md5sum "$input_file" | cut -d' ' -f1)"
|
cache_file="$cache_directory/$(md5sum "$input_file" | cut -d' ' -f1)"
|
||||||
|
@ -64,7 +65,6 @@ in
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
DEFAULT.APP_NAME = "${domain}";
|
|
||||||
server = {
|
server = {
|
||||||
SSH_PORT = lib.head config.services.openssh.ports;
|
SSH_PORT = lib.head config.services.openssh.ports;
|
||||||
ROOT_URL = "https://${domain}/";
|
ROOT_URL = "https://${domain}/";
|
||||||
|
@ -73,43 +73,42 @@ in
|
||||||
};
|
};
|
||||||
service.DISABLE_REGISTRATION = true;
|
service.DISABLE_REGISTRATION = true;
|
||||||
session.COOKIE_SECURE = true;
|
session.COOKIE_SECURE = true;
|
||||||
UI.DEFAULT_THEME = "forgejo-auto";
|
|
||||||
"markup.restructuredtext" = {
|
"markup.restructuredtext" = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
FILE_EXTENSIONS = ".rst";
|
FILE_EXTENSIONS = ".rst";
|
||||||
RENDER_COMMAND = "${docutils}/bin/rst2html.py";
|
RENDER_COMMAND = "${docutils}/bin/rst2html.py";
|
||||||
IS_INPUT_FILE = false;
|
IS_INPUT_FILE = false;
|
||||||
};
|
};
|
||||||
"markup.jupyter" = {
|
# "markup.jupyter" = {
|
||||||
ENABLED = true;
|
# ENABLED = true;
|
||||||
FILE_EXTENSIONS = ".ipynb";
|
# FILE_EXTENSIONS = ".ipynb";
|
||||||
# RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
|
# # RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
|
||||||
RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
|
# RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
|
||||||
IS_INPUT_FILE = true;
|
# IS_INPUT_FILE = true;
|
||||||
# RENDER_CONTENT_MODE = "iframe";
|
# # RENDER_CONTENT_MODE = "iframe";
|
||||||
};
|
# };
|
||||||
"markup.sanitizer.jupyter.div" = { ELEMENT = "div"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.div" = { ELEMENT = "div"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.span" = { ELEMENT = "span"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.span" = { ELEMENT = "span"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.img" = { ELEMENT = "img"; ALLOW_ATTR = "class"; REGEXP = ""; ALLOW_DATA_URI_IMAGES = "true"; };
|
# "markup.sanitizer.jupyter.img" = { ELEMENT = "img"; ALLOW_ATTR = "class"; REGEXP = ""; ALLOW_DATA_URI_IMAGES = "true"; };
|
||||||
"markup.sanitizer.jupyter.svg.width" = { ELEMENT = "svg"; ALLOW_ATTR = "width"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.width" = { ELEMENT = "svg"; ALLOW_ATTR = "width"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.height" = { ELEMENT = "svg"; ALLOW_ATTR = "height"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.height" = { ELEMENT = "svg"; ALLOW_ATTR = "height"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.viewbox" = { ELEMENT = "svg"; ALLOW_ATTR = "viewbox"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.viewbox" = { ELEMENT = "svg"; ALLOW_ATTR = "viewbox"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.use" = { ELEMENT = "use"; ALLOW_ATTR = "transform"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.use" = { ELEMENT = "use"; ALLOW_ATTR = "transform"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.g" = { ELEMENT = "g"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.g" = { ELEMENT = "g"; ALLOW_ATTR = "class"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.path.style" = { ELEMENT = "path"; ALLOW_ATTR = "style"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.path.style" = { ELEMENT = "path"; ALLOW_ATTR = "style"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.path.d" = { ELEMENT = "path"; ALLOW_ATTR = "d"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.path.d" = { ELEMENT = "path"; ALLOW_ATTR = "d"; REGEXP = ""; };
|
||||||
"markup.sanitizer.jupyter.svg.path.transform" = { ELEMENT = "path"; ALLOW_ATTR = "transform"; REGEXP = ""; };
|
# "markup.sanitizer.jupyter.svg.path.transform" = { ELEMENT = "path"; ALLOW_ATTR = "transform"; REGEXP = ""; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
authentication = ''
|
authentication = ''
|
||||||
local forgejo all ident map=forgejo-users
|
local gitea all ident map=gitea-users
|
||||||
'';
|
'';
|
||||||
# Map the forgejo user to postgresql
|
# Map the gitea user to postgresql
|
||||||
identMap = ''
|
identMap = ''
|
||||||
forgejo-users forgejo forgejo
|
gitea-users gitea gitea
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -126,14 +125,14 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# users.users.forgejo.extraGroups = [ "keys" ];
|
# users.users.gitea.extraGroups = [ "keys" ];
|
||||||
systemd.services.forgejo = {
|
systemd.services.gitea = {
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ReadOnlyPaths = [ "/secrets" ];
|
ReadOnlyPaths = [ "/secrets" ];
|
||||||
};
|
};
|
||||||
preStart = ''
|
preStart = ''
|
||||||
cp -frT "${forgejoCustom}/" "${config.services.forgejo.stateDir}/custom/"
|
cp -frT "${giteaCustom}/" "${config.services.gitea.stateDir}/custom/"
|
||||||
find "${config.services.forgejo.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
|
find "${config.services.gitea.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
autoLogin.user = "fruchti";
|
autoLogin.user = "fruchti";
|
||||||
};
|
};
|
||||||
security.pam.services.gdm.enableGnomeKeyring = true;
|
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
services.touchegg.enable = true;
|
services.touchegg.enable = true;
|
||||||
services.gnome.gnome-settings-daemon.enable = true;
|
services.gnome.gnome-settings-daemon.enable = true;
|
||||||
|
|
|
@ -5,6 +5,7 @@ in
|
||||||
{
|
{
|
||||||
services.hedgedoc = {
|
services.hedgedoc = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
workDir = "/data/hedgedoc";
|
||||||
environmentFile = "/secrets/hedgedoc.env";
|
environmentFile = "/secrets/hedgedoc.env";
|
||||||
settings = {
|
settings = {
|
||||||
port = 7000;
|
port = 7000;
|
||||||
|
@ -38,7 +39,9 @@ in
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{
|
{
|
||||||
name = "hedgedoc";
|
name = "hedgedoc";
|
||||||
ensureDBOwnership = true;
|
ensurePermissions = {
|
||||||
|
"DATABASE hedgedoc" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
ensureDatabases = [ "hedgedoc" ];
|
ensureDatabases = [ "hedgedoc" ];
|
||||||
|
|
|
@ -6,21 +6,20 @@ in
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
https = true;
|
https = true;
|
||||||
package = pkgs.nextcloud29;
|
package = pkgs.nextcloud26;
|
||||||
hostName = hostName;
|
hostName = hostName;
|
||||||
datadir = "/data/nextcloud";
|
datadir = "/data/nextcloud";
|
||||||
settings = {
|
|
||||||
trusted_domains = [
|
|
||||||
((lib.toLower config.networking.hostName) + ".lan")
|
|
||||||
(lib.toLower config.networking.hostName)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
config = {
|
config = {
|
||||||
dbtype = "pgsql";
|
dbtype = "pgsql";
|
||||||
dbhost = "/run/postgresql";
|
dbhost = "/run/postgresql";
|
||||||
adminpassFile = "/secrets/nextcloud_admin_password.txt";
|
adminpassFile = "/secrets/nextcloud_admin_password.txt";
|
||||||
|
extraTrustedDomains = [
|
||||||
|
((lib.toLower config.networking.hostName) + ".lan")
|
||||||
|
(lib.toLower config.networking.hostName)
|
||||||
|
];
|
||||||
};
|
};
|
||||||
caching.redis = true;
|
caching.redis = true;
|
||||||
|
enableBrokenCiphersForSSE = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
|
@ -28,14 +27,16 @@ in
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{
|
{
|
||||||
name = "nextcloud";
|
name = "nextcloud";
|
||||||
ensureDBOwnership = true;
|
ensurePermissions = {
|
||||||
|
"DATABASE nextcloud" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "superuser";
|
||||||
|
ensurePermissions = {
|
||||||
|
"ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
# {
|
|
||||||
# name = "superuser";
|
|
||||||
# ensurePermissions = {
|
|
||||||
# "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
];
|
];
|
||||||
ensureDatabases = [ "nextcloud" ];
|
ensureDatabases = [ "nextcloud" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,17 +6,6 @@
|
||||||
speed = 170;
|
speed = 170;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Ensure that trackpoint mouse buttons work after suspend without having
|
|
||||||
# to touch the trackpoint first
|
|
||||||
powerManagement = {
|
|
||||||
powerDownCommands = ''
|
|
||||||
modprobe -r psmouse
|
|
||||||
'';
|
|
||||||
resumeCommands = ''
|
|
||||||
modprobe psmouse
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "modesetting" ];
|
services.xserver.videoDrivers = [ "modesetting" ];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "i915" ];
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
{
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
desktopManager = {
|
|
||||||
xfce.enable = true;
|
|
||||||
xterm.enable = false;
|
|
||||||
};
|
|
||||||
displayManager = {
|
|
||||||
lightdm.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.displayManager = {
|
|
||||||
defaultSession = "xfce";
|
|
||||||
autoLogin.enable = true;
|
|
||||||
autoLogin.user = "fruchti";
|
|
||||||
};
|
|
||||||
services.libinput.enable = true;
|
|
||||||
nixpkgs.config.pulseaudio = true;
|
|
||||||
hardware.pulseaudio.enable = true;
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
services.blueman.enable = true;
|
|
||||||
# environment.xfce.excludePackages = with pkgs.xfce; [
|
|
||||||
# xfce4-terminal
|
|
||||||
# ];
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
xfce.xfce4-whiskermenu-plugin
|
|
||||||
xfce.xfce4-pulseaudio-plugin
|
|
||||||
xfce.xfce4-volumed-pulse
|
|
||||||
xfce.xfwm4-themes
|
|
||||||
pinentry-gtk2
|
|
||||||
lounge-gtk-theme
|
|
||||||
hackneyed
|
|
||||||
blueman
|
|
||||||
gnome.file-roller
|
|
||||||
];
|
|
||||||
security.pam.services.lightdm.enableGnomeKeyring = true;
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
services.cpupower-gui.enable = true;
|
|
||||||
|
|
||||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
|
|
||||||
services.pcscd.enable = true;
|
|
||||||
services.dbus.packages = [ pkgs.gcr ];
|
|
||||||
}
|
|
|
@ -20,7 +20,7 @@ in
|
||||||
to="${toAddress}"
|
to="${toAddress}"
|
||||||
service="$1"
|
service="$1"
|
||||||
full_status="$(systemctl status --full --lines 200 "$service")"
|
full_status="$(systemctl status --full --lines 200 "$service")"
|
||||||
exit_code="$(echo "$full_status" | head -n5 | tail -1 | sed -e 's/.*ExecStart=.*status=\(.*\))$/\1/g')"
|
exit_code="$(echo "$full_status" | head -n5 | tail -1 | sed -e 's/.*status=\(.*\))$/\1/g')"
|
||||||
# state="$(systemctl is-failed "$service")"
|
# state="$(systemctl is-failed "$service")"
|
||||||
|
|
||||||
fail_priority=1
|
fail_priority=1
|
||||||
|
|
|
@ -2,6 +2,5 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./burp.nix
|
./burp.nix
|
||||||
./horizon-eda.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(self: super: {
|
|
||||||
horizon-eda = (super.horizon-eda.overrideAttrs (old: {
|
|
||||||
# Add an environment variable to fix redraw issues on Intel Graphics
|
|
||||||
patches = [
|
|
||||||
./horizon_software_draw_surface.patch
|
|
||||||
];
|
|
||||||
}));
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
diff --git a/org.horizon_eda.HorizonEDA.desktop b/org.horizon_eda.HorizonEDA.desktop
|
|
||||||
index 7551df54..d8df7800 100644
|
|
||||||
--- a/org.horizon_eda.HorizonEDA.desktop
|
|
||||||
+++ b/org.horizon_eda.HorizonEDA.desktop
|
|
||||||
@@ -5,4 +5,4 @@ Categories=Development;Engineering;Electronics;
|
|
||||||
Type=Application
|
|
||||||
Terminal=false
|
|
||||||
Icon=org.horizon_eda.HorizonEDA
|
|
||||||
-Exec=horizon-eda %U
|
|
||||||
+Exec=env GDK_GL=software-draw-surface horizon-eda %U
|
|
|
@ -1,65 +0,0 @@
|
||||||
{
|
|
||||||
cmake,
|
|
||||||
eigen,
|
|
||||||
fetchFromGitHub,
|
|
||||||
glm,
|
|
||||||
gobject-introspection,
|
|
||||||
gtkmm4,
|
|
||||||
lib,
|
|
||||||
libepoxy,
|
|
||||||
librsvg,
|
|
||||||
libspnav,
|
|
||||||
libuuid,
|
|
||||||
meson,
|
|
||||||
ninja,
|
|
||||||
opencascade-occt,
|
|
||||||
pkg-config,
|
|
||||||
python3,
|
|
||||||
gcc13Stdenv,
|
|
||||||
wrapGAppsHook,
|
|
||||||
}:
|
|
||||||
|
|
||||||
gcc13Stdenv.mkDerivation rec {
|
|
||||||
pname = "dune3d";
|
|
||||||
version = "1.1.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "dune3d";
|
|
||||||
repo = "dune3d";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
gobject-introspection
|
|
||||||
meson
|
|
||||||
ninja
|
|
||||||
pkg-config
|
|
||||||
wrapGAppsHook
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
cmake
|
|
||||||
eigen
|
|
||||||
glm
|
|
||||||
gtkmm4
|
|
||||||
libepoxy
|
|
||||||
librsvg
|
|
||||||
libspnav
|
|
||||||
libuuid
|
|
||||||
opencascade-occt
|
|
||||||
(python3.withPackages (pp: [
|
|
||||||
pp.pygobject3
|
|
||||||
]))
|
|
||||||
];
|
|
||||||
|
|
||||||
env.CASROOT = opencascade-occt;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "3D CAD application";
|
|
||||||
homepage = "https://dune3d.org";
|
|
||||||
license = licenses.gpl3Plus;
|
|
||||||
mainProgram = "dune3d";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|