mirror of
https://github.com/oqyude/nixos.git
synced 2026-10-07 20:47:14 +03:00
soft coding
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
xlib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -185,7 +186,7 @@
|
||||
enable = true;
|
||||
config = {
|
||||
user = {
|
||||
name = "oqyude";
|
||||
name = xlib.device.username;
|
||||
email = "oqyude@gmail.com";
|
||||
};
|
||||
pull = {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
xlib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -20,7 +21,7 @@
|
||||
};
|
||||
shellInit = ''
|
||||
beet-p() {
|
||||
local base="/home/oqyude/.config/beets/My"
|
||||
local base="${xlib.dirs.user-home}/.config/beets/My"
|
||||
local rel
|
||||
rel=$(realpath --relative-to="$base" "$PWD")
|
||||
beet mod "path:$rel" playlist="$*"
|
||||
@@ -29,7 +30,7 @@
|
||||
beet im ./ -S $*
|
||||
}
|
||||
beet-path() {
|
||||
realpath --relative-to="/home/oqyude/.config/beets/My" "$1"
|
||||
realpath --relative-to="${xlib.dirs.user-home}/.config/beets/My" "$1"
|
||||
}
|
||||
'';
|
||||
shellAliases = {
|
||||
@@ -45,7 +46,7 @@
|
||||
gc = "git add . && git commit -m 'dev: автокоммит $(date +'%Y-%m-%d %H:%M:%S')'";
|
||||
y = "yazi";
|
||||
nix-shellp = "nix-shell --run $SHELL -p";
|
||||
beet-path-library = "realpath --relative-to='/home/oqyude/.config/beets/My' .";
|
||||
beet-path-library = "realpath --relative-to='${xlib.dirs.user-home}/.config/beets/My' .";
|
||||
z-proxy = "export ALL_PROXY=socks5://localhost:10808";
|
||||
zh-proxy = "export HTTPS_PROXY=http://localhost:10808 && export HTTP_PROXY=http://localhost:10808";
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
description = "Prebuild NixOS closure";
|
||||
serviceConfig = {
|
||||
CPUQuota = "20%";
|
||||
User = "oqyude";
|
||||
User = xlib.device.username;
|
||||
Group = "users";
|
||||
Nice = 10;
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = "/tmp";
|
||||
Environment = [
|
||||
"HOME=/home/oqyude"
|
||||
"HOME=${xlib.dirs.user-home}"
|
||||
];
|
||||
ExecStart = ''
|
||||
${pkgs.nix}/bin/nix build --no-link /etc/nixos#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
dbtype = "pgsql";
|
||||
dbuser = "nextcloud";
|
||||
dbname = "nextcloud";
|
||||
adminuser = "oqyude";
|
||||
adminuser = xlib.device.username;
|
||||
adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
|
||||
};
|
||||
settings = {
|
||||
|
||||
@@ -44,6 +44,12 @@ in
|
||||
name = "${user}";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
# Pinned, not left to NixOS' nextfree logic: the ntfs3/exfat mount
|
||||
# helpers (lib/xlib/helpers.nix) write the same uid into their mount
|
||||
# options, so both sides have to agree or NTFS files show up as owned
|
||||
# by `nobody`. NixOS has no per-user `gid` option — the primary group
|
||||
# id comes from `group` above.
|
||||
uid = xlib.device.uid;
|
||||
description = "Jor Oqyude";
|
||||
hashedPasswordFile = config.sops.secrets.hashed_password.path; # hashed_password
|
||||
homeMode = "700";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
let
|
||||
serviceName = "rsync-services-sync";
|
||||
serverAddress = "oqyude@100.64.0.0";
|
||||
serverAddress = "${xlib.device.username}@100.64.0.0";
|
||||
serverDir = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}";
|
||||
nodeDir = "${xlib.dirs.services-mnt-folder}";
|
||||
in
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
{
|
||||
imports = [
|
||||
# shared container modules live in ../../containers
|
||||
# ../../containers/3x-ui.nix
|
||||
../../containers/silero-tts.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
Reference in New Issue
Block a user