Compare commits

..

No commits in common. "b63400e00be67434ca824c049644880070d2273d" and "8679ede69b3a0c5b892ada917e6beacab53c2019" have entirely different histories.

2 changed files with 75 additions and 56 deletions

View file

@ -1,8 +1,18 @@
{ pkgs, ... }:
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{
hardware.bluetooth.enable = true;
# Additional configuration from github/jeremiehuchet/nixos-macbookpro
boot.kernelParams = [
"hid_apple.fnmode=1"
"hid_apple.swap_fn_leftctrl=1"
"hid_apple.iso_layout=0"
];
boot.kernel.sysctl = {
"vm.swappiness" = 10;
};
@ -11,9 +21,9 @@
boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.consoleMode = "0";
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot";
boot.loader.efi.efiSysMountPoint = "/boot/efi";
networking.hostName = "sabo";
networking.hostName = "luffy"; # Define your hostname.
networking.extraHosts = ''
127.0.0.1 yeswiki.test hedgedoc.nixin.local
192.168.36.206 chmok.net
@ -83,5 +93,12 @@
decode = true; # for http access via https://127.0.0.1:8080/uri-res/N2R?urn:eris:...
package = pkgs.eris-go; # default package
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment?
}

View file

@ -1,6 +1,8 @@
# Local developpement
{
pkgs,
config,
lib,
...
}:
{
@ -15,60 +17,60 @@
#waydroid.enable = true
};
#programs.virt-manager.enable = true;
#systemd.services.yeswikidev = {
# enable = true;
# script = ''
# ${pkgs.systemd}/bin/systemctl start mysql
# # etc
# '';
# serviceConfig =
# let
# startstop =
# command:
# (pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl ${command} mysql.service
# '';
# });
#startstopFullShell = pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl "$1" mysql.service
# '';
#});
#commands = [ "start" "stop" ];
#scripts = map (command: (pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl ${command} mysql.service
# '';
#})) commands;
systemd.services.yeswikidev = {
enable = true;
script = ''
${pkgs.systemd}/bin/systemctl start mysql
# etc
'';
serviceConfig =
let
startstop =
command:
(pkgs.writeShellApplication {
name = "yeswikidev";
runtimeInputs = with pkgs; [ systemd ];
text = ''
systemctl ${command} mysql.service
'';
});
#startstopFullShell = pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl "$1" mysql.service
# '';
#});
#commands = [ "start" "stop" ];
#scripts = map (command: (pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl ${command} mysql.service
# '';
#})) commands;
# in
#execs = {
# ExecStart = "start";
# ExecStop = "stop";
#};
# https://nixos.org/manual/nix/stable/language/builtins
# https://nixos.org/manual/nix/stable/language/builtins#builtins-mapAttrs
#execAttrs = attrNames execs; # ["Start" "Stop"];
#execs2 = mapAttrs (k: v: ()) execs;
# {
# pkgs.writeScript, pkgs.writeScriptBin
#ExecStart = startstop "start";
#ExecStop = startstop "stop";
# OR
# ExecStart = "${startstopFullShell} start";
# ExecStop = "${startstopFullShell} stop";
# OR
# ExecStart = "${scripts[0]}";
# ExecStop = "${scripts[1]}";
# };
#};
in
#execs = {
# ExecStart = "start";
# ExecStop = "stop";
#};
# https://nixos.org/manual/nix/stable/language/builtins
# https://nixos.org/manual/nix/stable/language/builtins#builtins-mapAttrs
#execAttrs = attrNames execs; # ["Start" "Stop"];
#execs2 = mapAttrs (k: v: ()) execs;
{
# pkgs.writeScript, pkgs.writeScriptBin
#ExecStart = startstop "start";
#ExecStop = startstop "stop";
# OR
# ExecStart = "${startstopFullShell} start";
# ExecStop = "${startstopFullShell} stop";
# OR
# ExecStart = "${scripts[0]}";
# ExecStop = "${scripts[1]}";
};
};
services.mysql = {
enable = true;