Compare commits
1 Commits
fix-zotero
...
db2ee5630a
| Author | SHA1 | Date | |
|---|---|---|---|
| db2ee5630a |
@@ -4,14 +4,26 @@ on: [push]
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build:
|
build-sydpc:
|
||||||
runs-on: nixos
|
runs-on: nixos
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository code
|
- name: Check out repository code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: build sydpc
|
- name: build sydpc
|
||||||
run: nix build -L .#nixosConfigurations.sydpc.config.system.build.toplevel
|
run: nix build -L .#nixosConfigurations.sydpc.config.system.build.toplevel
|
||||||
|
|
||||||
|
build-fruitbook:
|
||||||
|
runs-on: nixos
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
- name: build fruitbook
|
- name: build fruitbook
|
||||||
run: nix build -L .#nixosConfigurations.fruitbook.config.system.build.toplevel
|
run: nix build -L .#nixosConfigurations.fruitbook.config.system.build.toplevel
|
||||||
|
|
||||||
|
build-deertopia:
|
||||||
|
runs-on: nixos
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
- name: build deertopia
|
- name: build deertopia
|
||||||
run: nix build -L .#nixosConfigurations.deertopia.config.system.build.toplevel
|
run: nix build -L .#nixosConfigurations.deertopia.config.system.build.toplevel
|
||||||
|
|||||||
87
flake.lock
generated
87
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774411715,
|
"lastModified": 1762095388,
|
||||||
"narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=",
|
"narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
|
||||||
"owner": "9001",
|
"owner": "9001",
|
||||||
"repo": "copyparty",
|
"repo": "copyparty",
|
||||||
"rev": "26e663d111e39ca96c63702ad27a05b6736607cf",
|
"rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -307,11 +307,11 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773608492,
|
"lastModified": 1772807318,
|
||||||
"narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=",
|
"narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9a40ec3b78fc688d0908485887d355caa5666d18",
|
"rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -436,21 +436,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773533765,
|
|
||||||
"narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741402956,
|
"lastModified": 1741402956,
|
||||||
@@ -515,6 +500,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1750386251,
|
||||||
|
"narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743568003,
|
"lastModified": 1743568003,
|
||||||
"narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
|
"narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
|
||||||
@@ -548,11 +549,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773389992,
|
"lastModified": 1772542754,
|
||||||
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
|
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
|
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -596,16 +597,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773700673,
|
"lastModified": 1772736753,
|
||||||
"narHash": "sha256-RLidgpn3mN3cVkIiiYehcmM2ImBnPudwISFLy71zN0o=",
|
"narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=",
|
||||||
"owner": "msyds",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2595b5f0592534492bce3cb61c2c9bf5ba03ffbe",
|
"rev": "917fec990948658ef1ccd07cef2a1ef060786846",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "msyds",
|
"owner": "NixOS",
|
||||||
"ref": "fix-bepasty",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -715,7 +716,6 @@
|
|||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nixarr": "nixarr",
|
"nixarr": "nixarr",
|
||||||
"nixcord": "nixcord",
|
"nixcord": "nixcord",
|
||||||
"nixos-hardware": "nixos-hardware",
|
|
||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
@@ -797,23 +797,20 @@
|
|||||||
},
|
},
|
||||||
"sydpkgs": {
|
"sydpkgs": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_10"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773275674,
|
"lastModified": 1767975357,
|
||||||
"narHash": "sha256-kULSjFWDoDatz31aIses5q51ESUi0ASUc3MKmBYLnRY=",
|
"narHash": "sha256-MDVh3/aVhkD1bh/r8c0gs9DL4e78CrUbUxOZHWlCwLM=",
|
||||||
"ref": "fcitx5-toki-pona",
|
"owner": "msyds",
|
||||||
"rev": "03f6a67a0a3b3c00ff4566147eddb0123cfe3d14",
|
"repo": "sydpkgs",
|
||||||
"revCount": 38,
|
"rev": "233479ab277d47b1dbda202eafca50e61c659151",
|
||||||
"type": "git",
|
"type": "github"
|
||||||
"url": "https://git.deertopia.net/msyds/sydpkgs"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "fcitx5-toki-pona",
|
"owner": "msyds",
|
||||||
"type": "git",
|
"repo": "sydpkgs",
|
||||||
"url": "https://git.deertopia.net/msyds/sydpkgs"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
@@ -864,7 +861,7 @@
|
|||||||
"tf2-nix": {
|
"tf2-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_11"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761467191,
|
"lastModified": 1761467191,
|
||||||
|
|||||||
10
flake.nix
10
flake.nix
@@ -3,9 +3,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
disko.url = "github:nix-community/disko";
|
disko.url = "github:nix-community/disko";
|
||||||
# nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
# Waiting on https://github.com/NixOS/nixpkgs/pull/500538
|
|
||||||
nixpkgs.url = "github:msyds/nixpkgs/fix-bepasty";
|
|
||||||
impermanence.url = "github:nix-community/impermanence";
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
@@ -23,7 +21,6 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.vpnconfinement.follows = "vpn-confinement";
|
inputs.vpnconfinement.follows = "vpn-confinement";
|
||||||
};
|
};
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
|
||||||
# Used for Firefox extensions/addons.
|
# Used for Firefox extensions/addons.
|
||||||
nur = {
|
nur = {
|
||||||
url = "github:nix-community/NUR";
|
url = "github:nix-community/NUR";
|
||||||
@@ -32,10 +29,7 @@
|
|||||||
tf2-nix.url = "gitlab:msyds/tf2-nix";
|
tf2-nix.url = "gitlab:msyds/tf2-nix";
|
||||||
syd-fcitx5-tables.url =
|
syd-fcitx5-tables.url =
|
||||||
"git+https://git.deertopia.net/msyds/syd-fcitx5-tables";
|
"git+https://git.deertopia.net/msyds/syd-fcitx5-tables";
|
||||||
sydpkgs = {
|
sydpkgs.url = "github:msyds/sydpkgs";
|
||||||
url = "git+https://git.deertopia.net/msyds/sydpkgs?ref=fcitx5-toki-pona";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs:
|
outputs = { self, nixpkgs, ... }@inputs:
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
lldap.pam.enable = true;
|
lldap.pam.enable = true;
|
||||||
nginx.enable = true;
|
nginx.enable = true;
|
||||||
slskd.enable = true;
|
slskd.enable = true;
|
||||||
# webdav.enable = true;
|
webdav.enable = true;
|
||||||
copyparty.enable = true;
|
copyparty.enable = true;
|
||||||
syncthing.enable = true;
|
syncthing.enable = true;
|
||||||
cache.enable = true;
|
cache.enable = true;
|
||||||
|
|||||||
@@ -1,27 +1,23 @@
|
|||||||
{ config, pkgs, lib, disko, nixos-hardware, ... }:
|
{ config, pkgs, lib, disko, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./filesystems.nix
|
./filesystems.nix
|
||||||
nixos-hardware.nixosModules.apple-macbook-pro-12-1
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enabled by default by Nixos-hardware.
|
|
||||||
services.mbpfan.enable = false;
|
|
||||||
|
|
||||||
sydnix = {
|
sydnix = {
|
||||||
filesystemType = "btrfs";
|
filesystemType = "btrfs";
|
||||||
wifi.enable = true;
|
wifi.enable = true;
|
||||||
stylix.enable = true;
|
stylix.enable = true;
|
||||||
niri.enable = true;
|
niri.enable = true;
|
||||||
|
steam.enable = true;
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
# blueman.enable = true;
|
# gdm.enable = true;
|
||||||
openssh.enable = true;
|
openssh.enable = true;
|
||||||
sydpkgs.overlay.enable = true;
|
sydpkgs.overlay.enable = true;
|
||||||
dank-material-shell.enable = true;
|
dank-material-shell.enable = true;
|
||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
upower.enable = true;
|
|
||||||
|
|
||||||
users.users = [
|
users.users = [
|
||||||
# "crumb"
|
# "crumb"
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.bash;
|
|
||||||
in {
|
|
||||||
options.sydnix.bash = {
|
|
||||||
enable = lib.mkEnableOption "Bash";
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
./bash/complete-alias.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
programs.bash.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.sydnix.bash.complete-alias;
|
|
||||||
in {
|
|
||||||
options.sydnix.bash.complete-alias = {
|
|
||||||
enable = lib.mkEnableOption "Alias completion";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
programs.bash.initExtra = lib.mkAfter ''
|
|
||||||
. ${lib.getExe pkgs.complete-alias}
|
|
||||||
complete -F _complete_alias "''${!BASH_ALIASES[@]}"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -50,37 +50,31 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
systemd.user.services.jellyfin-rpc-configure =
|
systemd.user.services.jellyfin-rpc-configure = {
|
||||||
let api-key-file = config.sops.secrets.jellyfin-rpc-api-key.path;
|
Service = {
|
||||||
in {
|
Type = "oneshot";
|
||||||
Unit = {
|
ExecStart =
|
||||||
After = [ "sops-nix.service" ];
|
let
|
||||||
Requires = [ "sops-nix.service" ];
|
jq = lib.getExe pkgs.jq;
|
||||||
X-Restart-Triggers = [ api-key-file ];
|
api-key-file = config.sops.secrets.jellyfin-rpc-api-key.path;
|
||||||
};
|
in pkgs.writeShellScript "jellyfin-rpc-configure" ''
|
||||||
Install.WantedBy = [ "default.target" ];
|
dest=''${XDG_CONFIG_HOME:-$HOME/.config}/jellyfin-rpc/main.json
|
||||||
Service = {
|
umask 177
|
||||||
Type = "oneshot";
|
[[ -f "$dest" ]] && chmod 600 "$dest"
|
||||||
ExecStart =
|
jq < ${jellyfin-rpc-config-template} > "$dest" \
|
||||||
pkgs.writeShellScript "jellyfin-rpc-configure" ''
|
--rawfile api_key ${api-key-file} \
|
||||||
dest=''${XDG_CONFIG_HOME:-$HOME/.config}/jellyfin-rpc/main.json
|
'.jellyfin.api_key = $api_key'
|
||||||
mkdir -p "$(dirname "$dest")"
|
'';
|
||||||
umask 177
|
};
|
||||||
[[ -f "$dest" ]] && chmod 600 "$dest"
|
|
||||||
${lib.getExe pkgs.jq} \
|
|
||||||
< ${jellyfin-rpc-config-template} \
|
|
||||||
> "$dest" \
|
|
||||||
--rawfile api_key ${api-key-file} \
|
|
||||||
'.jellyfin.api_key = $api_key'
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.jellyfin-rpc = {
|
systemd.user.services.jellyfin-rpc = {
|
||||||
Unit.Requires = [ "jellyfin-rpc-configure.service" ];
|
Unit = {
|
||||||
Unit.After = [ "jellyfin-rpc-configure.service" ];
|
After = ["jellyfin-rpc-configure"];
|
||||||
Install.WantedBy = [ "default.target" ];
|
Wants = ["jellyfin-rpc-configure"];
|
||||||
Service.ExecStart = lib.getExe pkgs.jellyfin-rpc;
|
};
|
||||||
|
Service = {
|
||||||
|
ExecStart = lib.getExe pkgs.jellyfin-rpc;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sydnix.sops.secrets.jellyfin-rpc-api-key = {};
|
sydnix.sops.secrets.jellyfin-rpc-api-key = {};
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.documentation;
|
|
||||||
in {
|
|
||||||
options.sydnix.documentation = {
|
|
||||||
enable = lib.mkEnableOption "Docs";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
home.extraOutputsToInstall = [
|
|
||||||
"doc"
|
|
||||||
"info"
|
|
||||||
"man"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -131,7 +131,7 @@ in {
|
|||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplicationPackages = [
|
associations.defaultApplicationPackages = [
|
||||||
sydmacs
|
sydmacs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,10 +7,6 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
sydnix.impermanence.directories = [
|
|
||||||
".config/kdeconnect"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.kdeconnect = {
|
services.kdeconnect = {
|
||||||
enable = true;
|
enable = true;
|
||||||
indicator = true;
|
indicator = true;
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.prism-launcher;
|
|
||||||
in {
|
|
||||||
options.sydnix.prism-launcher = {
|
|
||||||
enable = lib.mkEnableOption "Prism Launcher";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
home.packages = [
|
|
||||||
pkgs.prismlauncher
|
|
||||||
];
|
|
||||||
|
|
||||||
sydnix.impermanence.directories = [
|
|
||||||
".local/share/PrismLauncher"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.toki-pona;
|
|
||||||
in {
|
|
||||||
options.sydnix.toki-pona = {
|
|
||||||
enable = lib.mkEnableOption "Toki Pona fonts, input, and spell-check";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
i18n.inputMethod.fcitx5.addons = [
|
|
||||||
(pkgs.fcitx5-toki-pona.overrideAttrs (final: prev: {
|
|
||||||
patches = prev.patches or [] ++ [
|
|
||||||
./toki-pona/punctuation.patch
|
|
||||||
];
|
|
||||||
}))
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.ghostty.settings.font-family = lib.mkAfter [
|
|
||||||
"sitelen seli kiwen mono juniko"
|
|
||||||
];
|
|
||||||
|
|
||||||
sydnix.hunspell.dictionaries = ds: with ds; [
|
|
||||||
tok
|
|
||||||
];
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
# nasin-nanpa-ucsur
|
|
||||||
nasin-nanpa
|
|
||||||
nasin-nanpa-helvetica
|
|
||||||
sitelen-seli-kiwen
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
diff --git a/static_tables/toki_pona_ucsur.txt b/static_tables/toki_pona_ucsur.txt
|
|
||||||
index 1bacd3a..53f5c8e 100644
|
|
||||||
--- a/static_tables/toki_pona_ucsur.txt
|
|
||||||
+++ b/static_tables/toki_pona_ucsur.txt
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-KeyCode=mnptkswljiueoa()[]{}^*.:"-_
|
|
||||||
+KeyCode=mnptkswljiueoa()[]{}^*.:"-_<>,
|
|
||||||
Length=16
|
|
||||||
Prompt=
|
|
||||||
ConstructPhrase=
|
|
||||||
@@ -13,8 +13,11 @@ _
|
|
||||||
^
|
|
||||||
*
|
|
||||||
.
|
|
||||||
+, 。
|
|
||||||
:
|
|
||||||
-
|
|
||||||
+< 「
|
|
||||||
+> 」
|
|
||||||
a
|
|
||||||
akesi
|
|
||||||
ala
|
|
||||||
34
modules/home/users/crumb/bash.nix
Normal file
34
modules/home/users/crumb/bash.nix
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.sydnix.users.crumb.bash;
|
||||||
|
in {
|
||||||
|
options.sydnix.users.crumb.bash.enable = lib.mkEnableOption "Bash, à la crumb";
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
programs.bash = {
|
||||||
|
enable = true;
|
||||||
|
shellOptions = [
|
||||||
|
# Correct minor typos in cd commands.
|
||||||
|
"cdspell"
|
||||||
|
"autocd"
|
||||||
|
# Extra glob power.
|
||||||
|
"extglob"
|
||||||
|
# Recursive glob w/ **.
|
||||||
|
"globstar"
|
||||||
|
# Append to history file.
|
||||||
|
"histappend"
|
||||||
|
# Require user confirmation for commands using expansion.
|
||||||
|
"histverify"
|
||||||
|
# Re-edit failed history substitutions.
|
||||||
|
"histreedit"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
home.shellAliases = {
|
||||||
|
nix2json = "nix eval --impure --json --file -";
|
||||||
|
"..." = "cd ../..";
|
||||||
|
"...." = "cd ../../..";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
@@ -26,8 +26,8 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
globalOptions = {
|
globalOptions = {
|
||||||
# Disable shift to toggle. I accidentally press it all
|
# Disable shift to toggle. I accidentally press it all the time.
|
||||||
# the time. 날 미치게 만들어요.
|
# 날 미치게 만들어요.
|
||||||
Hotkey.AltTriggerKeys = "";
|
Hotkey.AltTriggerKeys = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.sydnix.users.msyds.bash;
|
|
||||||
in {
|
|
||||||
options.sydnix.users.msyds.bash.enable =
|
|
||||||
lib.mkEnableOption "Bash, à la msyds";
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
sydnix.bash.enable = true;
|
|
||||||
sydnix.bash.complete-alias.enable = true;
|
|
||||||
|
|
||||||
programs.bash.shellOptions = [
|
|
||||||
# Correct minor typos in cd commands.
|
|
||||||
"cdspell"
|
|
||||||
# Implicitly prepend `cd` to directory names.
|
|
||||||
"autocd"
|
|
||||||
# Extra glob power.
|
|
||||||
"extglob"
|
|
||||||
# Recursive glob w/ **.
|
|
||||||
"globstar"
|
|
||||||
# Append to history file.
|
|
||||||
"histappend"
|
|
||||||
# Require user confirmation for commands using expansion.
|
|
||||||
"histverify"
|
|
||||||
# Re-edit failed history substitutions.
|
|
||||||
"histreedit"
|
|
||||||
];
|
|
||||||
|
|
||||||
home.shellAliases = {
|
|
||||||
nix2json = "nix eval --impure --json --file -";
|
|
||||||
"..." = "cd ../..";
|
|
||||||
"...." = "cd ../../..";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,11 +1,6 @@
|
|||||||
{ config, lib, pkgs, host, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let cfg = config.sydnix.users.msyds.dank-material-shell;
|
||||||
cfg = config.sydnix.users.msyds.dank-material-shell;
|
|
||||||
on = hosts:
|
|
||||||
if builtins.isString hosts
|
|
||||||
then hosts == host
|
|
||||||
else builtins.elem host hosts;
|
|
||||||
in {
|
in {
|
||||||
options.sydnix.users.msyds.dank-material-shell = {
|
options.sydnix.users.msyds.dank-material-shell = {
|
||||||
enable = lib.mkEnableOption "Dank Material Shell";
|
enable = lib.mkEnableOption "Dank Material Shell";
|
||||||
@@ -172,7 +167,7 @@ in {
|
|||||||
showControlCenterButton = true;
|
showControlCenterButton = true;
|
||||||
showCapsLockIndicator = true;
|
showCapsLockIndicator = true;
|
||||||
controlCenterShowNetworkIcon = true;
|
controlCenterShowNetworkIcon = true;
|
||||||
controlCenterShowBluetoothIcon = on ["fruitbook"];
|
controlCenterShowBluetoothIcon = true;
|
||||||
controlCenterShowAudioIcon = true;
|
controlCenterShowAudioIcon = true;
|
||||||
controlCenterShowVpnIcon = true;
|
controlCenterShowVpnIcon = true;
|
||||||
controlCenterShowBrightnessIcon = false;
|
controlCenterShowBrightnessIcon = false;
|
||||||
@@ -291,9 +286,9 @@ in {
|
|||||||
batterySuspendTimeout = 0;
|
batterySuspendTimeout = 0;
|
||||||
batterySuspendBehavior = 0;
|
batterySuspendBehavior = 0;
|
||||||
batteryProfileName = "";
|
batteryProfileName = "";
|
||||||
lockBeforeSuspend = true;
|
lockBeforeSuspend = false;
|
||||||
loginctlLockIntegration = true;
|
loginctlLockIntegration = true;
|
||||||
fadeToLockEnabled = true;
|
fadeToLockEnabled = false;
|
||||||
fadeToLockGracePeriod = 5;
|
fadeToLockGracePeriod = 5;
|
||||||
launchPrefix = "";
|
launchPrefix = "";
|
||||||
brightnessDevicePins = {};
|
brightnessDevicePins = {};
|
||||||
|
|||||||
@@ -30,11 +30,6 @@ in {
|
|||||||
];
|
];
|
||||||
plugins = {
|
plugins = {
|
||||||
ircColors.enable = true;
|
ircColors.enable = true;
|
||||||
voiceMessages = {
|
|
||||||
enable = true;
|
|
||||||
echoCancellation = false;
|
|
||||||
noiseSuppression = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
vesktop = {
|
vesktop = {
|
||||||
|
|||||||
@@ -31,17 +31,6 @@ in {
|
|||||||
treesit.enable = true;
|
treesit.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
ESHELL_ALIASES_FILE = pkgs.writeText "eshell-aliases" ''
|
|
||||||
alias cdp syd-project-cd
|
|
||||||
alias jj jj --no-pager $*
|
|
||||||
${lib.concatMapAttrsStringSep
|
|
||||||
"\n"
|
|
||||||
(alias: value: "alias ${alias} ${value} $*")
|
|
||||||
config.home.shellAliases}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
sydnix.emacs = {
|
sydnix.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8-emacs; mode: lisp-data -*-
|
|
||||||
;;; This format is meant to be slightly human-readable;
|
|
||||||
;;; nevertheless, you probably don't want to edit it.
|
|
||||||
;;; -*- End Of Bookmark File Format Version Stamp -*-
|
|
||||||
(("org-capture-last-stored"
|
|
||||||
(filename . "~/org/daily/2026-03-26.org")
|
|
||||||
(front-context-string . "* The significan")
|
|
||||||
(rear-context-string . "le: 2026-03-26\n\n")
|
|
||||||
(position . 89)
|
|
||||||
(last-modified 27077 32462 617656 528000))
|
|
||||||
)
|
|
||||||
@@ -3,7 +3,6 @@
|
|||||||
(syd-require-features
|
(syd-require-features
|
||||||
'(syd/base
|
'(syd/base
|
||||||
syd/constants
|
syd/constants
|
||||||
syd/fcitx
|
|
||||||
syd/dash
|
syd/dash
|
||||||
syd/disable-package
|
syd/disable-package
|
||||||
syd/straight
|
syd/straight
|
||||||
@@ -50,7 +49,6 @@
|
|||||||
syd/direnv
|
syd/direnv
|
||||||
syd/ligature
|
syd/ligature
|
||||||
syd/clojure
|
syd/clojure
|
||||||
syd/auctex
|
|
||||||
syd/lisp
|
syd/lisp
|
||||||
syd/minibuffer
|
syd/minibuffer
|
||||||
syd/auto-save
|
syd/auto-save
|
||||||
@@ -65,6 +63,5 @@
|
|||||||
syd/eshell
|
syd/eshell
|
||||||
syd/treesit
|
syd/treesit
|
||||||
syd/grammatical-framework
|
syd/grammatical-framework
|
||||||
syd/tabs
|
|
||||||
syd/lsp
|
syd/lsp
|
||||||
syd/custom))
|
syd/custom))
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
;;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(require 'syd/base)
|
|
||||||
|
|
||||||
(use-package auctex
|
|
||||||
:config
|
|
||||||
(add-to-list 'TeX-view-program-selection '(output-pdf "Sioyek")))
|
|
||||||
|
|
||||||
(use-package auctex-latexmk)
|
|
||||||
|
|
||||||
(provide 'syd/auctex)
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
;;; -*- lexical-binding: t; -*-
|
;;; -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
(require 'syd/base)
|
(require 'syd/base)
|
||||||
(require 'syd/handle)
|
|
||||||
(require 'syd/popups)
|
(require 'syd/popups)
|
||||||
(require 'syd/leader)
|
(require 'syd/leader)
|
||||||
|
|
||||||
@@ -27,8 +26,7 @@
|
|||||||
cider-doc-buffer)
|
cider-doc-buffer)
|
||||||
(defun syd-clojure-eval-region (beg end)
|
(defun syd-clojure-eval-region (beg end)
|
||||||
(cider-eval-region beg end))
|
(cider-eval-region beg end))
|
||||||
(syd-handle '(clojure-mode clojurescript-mode cider-repl-mode
|
(syd-handle '(clojure-mode clojurescript-mode cider-repl-mode)
|
||||||
cider-clojure-interaction-mode)
|
|
||||||
:docs #'cider-doc
|
:docs #'cider-doc
|
||||||
:eval-region #'syd-clojure-eval-region
|
:eval-region #'syd-clojure-eval-region
|
||||||
:load-buffer #'cider-load-buffer)
|
:load-buffer #'cider-load-buffer)
|
||||||
@@ -110,13 +108,4 @@
|
|||||||
s)
|
s)
|
||||||
s))))
|
s))))
|
||||||
|
|
||||||
(defun syd-clojure--setup-clj-refactor ()
|
|
||||||
(clj-refactor-mode 1)
|
|
||||||
(yas-minor-mode 1)
|
|
||||||
(cljr-add-keybindings-with-prefix "C-c r"))
|
|
||||||
|
|
||||||
(use-package clj-refactor
|
|
||||||
:config
|
|
||||||
(add-hook 'clojure-mode-hook #'syd-clojure--setup-clj-refactor))
|
|
||||||
|
|
||||||
(provide 'syd/clojure)
|
(provide 'syd/clojure)
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
;; -*- lexical-binding: t -*-
|
;;; -*- lexical-binding: t -*-
|
||||||
|
|
||||||
(require 'syd/base)
|
|
||||||
(require 'syd/popups)
|
|
||||||
|
|
||||||
(setq
|
(setq
|
||||||
;; Log native-compiler warnings, but don't display the buffer. Most of the
|
;; Log native-compiler warnings, but don't display the buffer. Most of the
|
||||||
@@ -11,7 +8,4 @@
|
|||||||
;; Scroll compilation buffer to follow output.
|
;; Scroll compilation buffer to follow output.
|
||||||
compilation-scroll-output t)
|
compilation-scroll-output t)
|
||||||
|
|
||||||
(syd-push shackle-rules
|
|
||||||
'("*compilation*" :select nil :size 0.42 :popup t :align bottom))
|
|
||||||
|
|
||||||
(provide 'syd/compilation)
|
(provide 'syd/compilation)
|
||||||
|
|||||||
@@ -150,9 +150,7 @@ if FILE-NAME has no TRAMP prefix."
|
|||||||
(eshell-last-dir-ring-file-name (file-name-concat
|
(eshell-last-dir-ring-file-name (file-name-concat
|
||||||
syd-eshell-data-dir "lastdir"))
|
syd-eshell-data-dir "lastdir"))
|
||||||
(eshell-prompt-function #'syd-eshell--prompt-fn)
|
(eshell-prompt-function #'syd-eshell--prompt-fn)
|
||||||
(eshell-prompt-regexp syd-eshell--prompt-regexp)
|
(eshell-prompt-regexp syd-eshell--prompt-regexp))
|
||||||
(eshell-aliases-file (or (getenv "ESHELL_ALIASES_FILE")
|
|
||||||
eshell-aliases-file)))
|
|
||||||
:general
|
:general
|
||||||
(:keymaps 'syd-leader-open-map
|
(:keymaps 'syd-leader-open-map
|
||||||
"e" #'syd-toggle-eshell)
|
"e" #'syd-toggle-eshell)
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
;;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(require 'syd/base)
|
|
||||||
|
|
||||||
(use-package fcitx
|
|
||||||
:custom ((fcitx-remote-command "fcitx5-remote"))
|
|
||||||
:config
|
|
||||||
(fcitx-aggressive-setup))
|
|
||||||
|
|
||||||
(provide 'syd/fcitx)
|
|
||||||
@@ -12,21 +12,15 @@
|
|||||||
(font-spec :family "JuliaMono" :size 16)
|
(font-spec :family "JuliaMono" :size 16)
|
||||||
"A monospace font secondary to `syd-fixed-pitch-font'.")
|
"A monospace font secondary to `syd-fixed-pitch-font'.")
|
||||||
|
|
||||||
(defvar syd-sitelen-pona-font
|
|
||||||
(font-spec :family "sitelen seli kiwen mono juniko"))
|
|
||||||
|
|
||||||
(defun syd-init-fonts-h ()
|
(defun syd-init-fonts-h ()
|
||||||
"Loads `syd-fixed-pitch-font' and `syd-variable-pitch-font'."
|
"Loads `syd-fixed-pitch-font' and `syd-variable-pitch-font'."
|
||||||
(dolist (map `((default . ,syd-fixed-pitch-font)
|
(dolist (map `((default . ,syd-fixed-pitch-font)
|
||||||
(fixed-pitch . ,syd-fixed-pitch-font)
|
(fixed-pitch . ,syd-fixed-pitch-font)
|
||||||
(variable-pitch . ,syd-variable-pitch-font)))
|
(variable-pitch . ,syd-variable-pitch-font)))
|
||||||
(pcase-let ((`(,face . ,font) map))
|
(pcase-let ((`(,face . ,font) map))
|
||||||
(set-face-attribute face nil
|
(set-face-attribute face nil
|
||||||
:width 'normal :weight 'normal
|
:width 'normal :weight 'normal
|
||||||
:slant 'normal :font font)))
|
:slant 'normal :font font))))
|
||||||
(set-fontset-font
|
|
||||||
t '(#xF1900 . #xF19FF)
|
|
||||||
syd-sitelen-pona-font))
|
|
||||||
|
|
||||||
(let ((hook-point (if (daemonp)
|
(let ((hook-point (if (daemonp)
|
||||||
'server-after-make-frame-hook
|
'server-after-make-frame-hook
|
||||||
|
|||||||
@@ -5,28 +5,22 @@
|
|||||||
(use-package ligature
|
(use-package ligature
|
||||||
:config
|
:config
|
||||||
(ligature-set-ligatures 'prog-mode
|
(ligature-set-ligatures 'prog-mode
|
||||||
'("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||="
|
'("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||="
|
||||||
"||>" ":::" "::=" "=:=" "===" "==>" "=!=" "=>>"
|
"||>" ":::" "::=" "=:=" "===" "==>" "=!=" "=>>"
|
||||||
"=<<" "=/=" "!==" "!!." ">=>" ">>=" ">>>" ">>-"
|
"=<<" "=/=" "!==" "!!." ">=>" ">>=" ">>>" ">>-"
|
||||||
">->" "->>" "-->" "---" "-<<" "<~~" "<~>" "<*>"
|
">->" "->>" "-->" "---" "-<<" "<~~" "<~>" "<*>"
|
||||||
"<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->" "<--"
|
"<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->" "<--"
|
||||||
"<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_("
|
"<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_("
|
||||||
"..<" "..." "+++" "/==" "///" "_|_" "www" "&&" "^="
|
"..<" "..." "+++" "/==" "///" "_|_" "www" "&&" "^="
|
||||||
"~~" "~@" "~=" "~>" "~-" "**" "*>" "*/" "||" "|}"
|
"~~" "~@" "~=" "~>" "~-" "**" "*>" "*/" "||" "|}"
|
||||||
"|]" "|=" "|>" "|-" "{|" "[|" "]#" "::" ":=" ":>"
|
"|]" "|=" "|>" "|-" "{|" "[|" "]#" "::" ":=" ":>"
|
||||||
":<" "$>" "==" "=>" "!=" "!!" ">:" ">=" ">>" ">-"
|
":<" "$>" "==" "=>" "!=" "!!" ">:" ">=" ">>" ">-"
|
||||||
"-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:" "<$"
|
"-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:" "<$"
|
||||||
"<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#="
|
"<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#="
|
||||||
"#!" "##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?"
|
"#!" "##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?"
|
||||||
"+>" "++" "?:" "?=" "?." "??" ";;" ";;;"
|
"+>" "++" "?:" "?=" "?." "??" ";;" ";;;"
|
||||||
"/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
"/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
||||||
"\\\\" "://"))
|
"\\\\" "://"))
|
||||||
;; Sitelen pona glyphs.
|
|
||||||
(rx-let ((ideograph (any (#xF1900 . #xF198C))))
|
|
||||||
(ligature-set-ligatures
|
|
||||||
'fundamental-mode
|
|
||||||
`(("" ,(rx (* ideograph)))
|
|
||||||
("" ,(rx "" (* ideograph))))))
|
|
||||||
(global-ligature-mode 1))
|
(global-ligature-mode 1))
|
||||||
|
|
||||||
(provide 'syd/ligature)
|
(provide 'syd/ligature)
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(require 'syd/base)
|
|
||||||
|
|
||||||
(use-package markdown-mode
|
|
||||||
:config
|
|
||||||
(add-hook 'markdown-mode-hook #'syd-prose-mode))
|
|
||||||
|
|
||||||
(provide 'syd/markdown)
|
|
||||||
@@ -80,8 +80,7 @@
|
|||||||
:target (file "todays-korean/%<%Y-%m-%d>.org"))
|
:target (file "todays-korean/%<%Y-%m-%d>.org"))
|
||||||
("I" "Korean irregularity class" plain
|
("I" "Korean irregularity class" plain
|
||||||
(file ,(syd-emacs-file "lisp/syd/org/roam/irregularity-class.org"))
|
(file ,(syd-emacs-file "lisp/syd/org/roam/irregularity-class.org"))
|
||||||
:target (file ,default-target-file-name)))))
|
:target (file ,default-target-file-name))))))
|
||||||
(org-roam-link-auto-replace nil))
|
|
||||||
:config
|
:config
|
||||||
(add-to-list 'org-agenda-files org-roam-directory)
|
(add-to-list 'org-agenda-files org-roam-directory)
|
||||||
(with-eval-after-load 'org-roam-dailies
|
(with-eval-after-load 'org-roam-dailies
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
;;; -*- lexical-binding: t -*-
|
|
||||||
(require 'syd/base)
|
|
||||||
|
|
||||||
;; Disable tabs by default.
|
|
||||||
(setq-default indent-tabs-mode nil)
|
|
||||||
|
|
||||||
(provide 'syd/tabs)
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
nil
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.users.msyds.sioyek;
|
|
||||||
in {
|
|
||||||
options.sydnix.users.msyds.sioyek = {
|
|
||||||
enable = lib.mkEnableOption "Sioyek";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
programs.sioyek = {
|
|
||||||
enable = true;
|
|
||||||
bindings = {
|
|
||||||
"move_down" = "j";
|
|
||||||
"move_up" = "k";
|
|
||||||
"screen_down" = [ "d" "<C-d>" ];
|
|
||||||
"screen_up" = [ "u" "<C-u>" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.blueman;
|
|
||||||
in {
|
|
||||||
options.sydnix.blueman = {
|
|
||||||
enable = lib.mkEnableOption "Blueman BlueTooth manager";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.blueman.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -7,6 +7,8 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
services.blueman.enable = true;
|
||||||
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
powerOnBoot = true;
|
powerOnBoot = true;
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
let cfg = config.sydnix.deertopia.bepasty;
|
let cfg = config.sydnix.deertopia.bepasty;
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
sydnix.deertopia.bepasty = {
|
sydnix.deertopia.bepasty = {
|
||||||
enable = lib.mkEnableOption "Bepasty";
|
enable = mkEnableOption "Bepasty";
|
||||||
|
|
||||||
port = lib.mkOption {
|
port = lib.mkOption {
|
||||||
default = 22018;
|
default = 22018;
|
||||||
@@ -17,7 +19,7 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
sydnix.sops.secrets.bepasty-secret-key = {};
|
sydnix.sops.secrets.bepasty-secret-key = {};
|
||||||
sydnix.sops.secrets.bepasty-secret-config = {};
|
sydnix.sops.secrets.bepasty-secret-config = {};
|
||||||
|
|
||||||
|
|||||||
@@ -13,14 +13,10 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [ ./copyparty/vault.nix ];
|
||||||
./copyparty/vault.nix
|
|
||||||
./copyparty/webdav.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
sydnix.deertopia.copyparty.vault.enable = true;
|
sydnix.deertopia.copyparty.vault.enable = true;
|
||||||
sydnix.deertopia.copyparty.webdav.enable = true;
|
|
||||||
|
|
||||||
sydnix.impermanence.directories = [
|
sydnix.impermanence.directories = [
|
||||||
"/var/lib/copyparty"
|
"/var/lib/copyparty"
|
||||||
@@ -33,8 +29,8 @@ in {
|
|||||||
"media"
|
"media"
|
||||||
];
|
];
|
||||||
|
|
||||||
# HACK: Make files created by copyparty.service initialise with
|
# HACK: Make files created by copyparty.service initialise with the mode
|
||||||
# the mode 775.
|
# 775.
|
||||||
systemd.services.copyparty.serviceConfig.UMask = lib.mkForce "002";
|
systemd.services.copyparty.serviceConfig.UMask = lib.mkForce "002";
|
||||||
|
|
||||||
services.copyparty = {
|
services.copyparty = {
|
||||||
@@ -60,7 +56,7 @@ in {
|
|||||||
"/Media library" = {
|
"/Media library" = {
|
||||||
path = "/media/library";
|
path = "/media/library";
|
||||||
# View and upload, but no deleting.
|
# View and upload, but no deleting.
|
||||||
access.r = "*";
|
access.rw = "*";
|
||||||
access.rwmd = "@jellyfin-admin";
|
access.rwmd = "@jellyfin-admin";
|
||||||
};
|
};
|
||||||
"/Torrents" = {
|
"/Torrents" = {
|
||||||
|
|||||||
@@ -36,12 +36,6 @@ in {
|
|||||||
access.A = [ "msyds" ];
|
access.A = [ "msyds" ];
|
||||||
access.rwmd = [ "zotero" ];
|
access.rwmd = [ "zotero" ];
|
||||||
};
|
};
|
||||||
"/msyds/zotero-root" = {
|
|
||||||
path = "/vault/msyds/zotero-root";
|
|
||||||
flags.daw = true;
|
|
||||||
access.A = [ "msyds" ];
|
|
||||||
access.rwmd = [ "zotero" ];
|
|
||||||
};
|
|
||||||
"/~msyds/public" = {
|
"/~msyds/public" = {
|
||||||
path = "/vault/~msyds/public";
|
path = "/vault/~msyds/public";
|
||||||
access.A = [ "msyds" ];
|
access.A = [ "msyds" ];
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.deertopia.copyparty.webdav;
|
|
||||||
in {
|
|
||||||
options.sydnix.deertopia.copyparty.webdav = {
|
|
||||||
enable = lib.mkEnableOption "WebDAV via copyparty";
|
|
||||||
port = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
description = ''
|
|
||||||
Port on which Copyparty shall listen for WebDAV traffic.
|
|
||||||
'';
|
|
||||||
default = 3924;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# https://github.com/9001/copyparty/issues/1142
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.copyparty.settings = {
|
|
||||||
rproxy = -1;
|
|
||||||
xff-src = "lan";
|
|
||||||
daw = true;
|
|
||||||
dav-auth = true;
|
|
||||||
ihead = "*";
|
|
||||||
ohead = "*";
|
|
||||||
dav-port = cfg.port;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.authelia.instances.deertopia.settings =
|
|
||||||
lib.mkIf config.sydnix.deertopia.authelia.enable {
|
|
||||||
access_control.rules = lib.mkBefore [
|
|
||||||
{
|
|
||||||
domain = "dav.deertopia.net";
|
|
||||||
policy = "bypass";
|
|
||||||
methods = [ "OPTIONS" "PROPFIND" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
sydnix.deertopia.nginx.vhosts."dav" = {
|
|
||||||
directory = null;
|
|
||||||
vhost = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
extraConfig = ''
|
|
||||||
include ${../authelia/authelia-location.conf};
|
|
||||||
# Increase limit of upload sizes.
|
|
||||||
client_max_body_size 20G;
|
|
||||||
'';
|
|
||||||
locations."/".extraConfig = ''
|
|
||||||
include ${../authelia/authelia-authrequest.conf};
|
|
||||||
include ${../authelia/proxy.conf};
|
|
||||||
proxy_pass http://localhost:${builtins.toString cfg.port};
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let cfg = config.sydnix.deertopia.gitea;
|
||||||
cfg = config.sydnix.deertopia.gitea;
|
|
||||||
commas = lib.concatStringsSep ",";
|
|
||||||
in {
|
in {
|
||||||
options.sydnix.deertopia.gitea = {
|
options.sydnix.deertopia.gitea = {
|
||||||
enable = lib.mkEnableOption "Gitea";
|
enable = lib.mkEnableOption "Gitea";
|
||||||
@@ -42,18 +40,11 @@ in {
|
|||||||
|
|
||||||
# sudo -u git gitea admin auth add-ldap --name gitea --port 3890 --bind-dn 'uid=gitea,ou=people,dc=deertopia,dc=net' --bind-password «password» --user-search-base 'ou=people,dc=deertopia,dc=net' --user-filter '(&(memberof=cn=git,ou=groups,dc=deertopia,dc=net)(|(uid=%[1]s)(mail=%[1]s)))' --username-attribute uid --firstname-attribute givenName --surname-attribute sn --email-attribute mail --avatar-attribute jpegPhoto --security-protocol unencrypted --host 127.0.0.1 --config /var/lib/gitea/custom/conf/app.ini --synchronize-users
|
# sudo -u git gitea admin auth add-ldap --name gitea --port 3890 --bind-dn 'uid=gitea,ou=people,dc=deertopia,dc=net' --bind-password «password» --user-search-base 'ou=people,dc=deertopia,dc=net' --user-filter '(&(memberof=cn=git,ou=groups,dc=deertopia,dc=net)(|(uid=%[1]s)(mail=%[1]s)))' --username-attribute uid --firstname-attribute givenName --surname-attribute sn --email-attribute mail --avatar-attribute jpegPhoto --security-protocol unencrypted --host 127.0.0.1 --config /var/lib/gitea/custom/conf/app.ini --synchronize-users
|
||||||
|
|
||||||
sydnix.sops.secrets.gitea-mailer-password = {
|
|
||||||
mode = "0440";
|
|
||||||
owner = "git";
|
|
||||||
group = "git";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.gitea = {
|
services.gitea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "git";
|
user = "git";
|
||||||
group = "git";
|
group = "git";
|
||||||
appName = "GupHub"; # Name per my dear Astrid ♥!!!!!
|
appName = "GupHub"; # Name per my darling Colestar ♥
|
||||||
mailerPasswordFile = config.sops.secrets.gitea-mailer-password.path;
|
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
ROOT_URL = "https://git.deertopia.net/";
|
ROOT_URL = "https://git.deertopia.net/";
|
||||||
@@ -62,48 +53,7 @@ in {
|
|||||||
};
|
};
|
||||||
service = {
|
service = {
|
||||||
DISABLE_REGISTRATION = true;
|
DISABLE_REGISTRATION = true;
|
||||||
ENABLE_NOTIFY_MAIL = true;
|
|
||||||
};
|
};
|
||||||
"repository.pull-request" = {
|
|
||||||
CLOSE_KEYWORDS = commas [
|
|
||||||
# en
|
|
||||||
"close" "closes" "closed" "fix" "fixes" "fixed" "resolve"
|
|
||||||
"resolves" "resolved"
|
|
||||||
# tok
|
|
||||||
"pini e"
|
|
||||||
# ko
|
|
||||||
"해결" "해결합니다" "해결했다"
|
|
||||||
"종료" "종료합니다" "중료한다" "중료해" "중료하다"
|
|
||||||
"수정" "수정했습니다" "중료한다" "중료해" "중료하다"
|
|
||||||
];
|
|
||||||
REOPEN_KEYWORDS = commas [
|
|
||||||
# en
|
|
||||||
"reopen" "reopens" "reopened"
|
|
||||||
# tok
|
|
||||||
"open sin e" "pakala sin e"
|
|
||||||
"li pakala sin" "li pakalan sin"
|
|
||||||
# ko
|
|
||||||
"재개" "재개합니다" "다시 열기" "다시 엽니다" "다시 여다"
|
|
||||||
"다시 연다"
|
|
||||||
];
|
|
||||||
WORK_IN_PROGRESS_PREFIXES = commas [
|
|
||||||
# en
|
|
||||||
"WIP:" "[WIP]"
|
|
||||||
# tok
|
|
||||||
"pini ala:" "awen pali:"
|
|
||||||
# ko
|
|
||||||
"공사 중:" "공사중:" "중:" "[중]" "中:" "[中]"
|
|
||||||
];
|
|
||||||
DEFAULT_MERGE_STYLE = "rebase";
|
|
||||||
};
|
|
||||||
mailer = {
|
|
||||||
ENABLED = true;
|
|
||||||
FROM = "Gitea <no-reply@deertopia.net>";
|
|
||||||
PROTOCOL = "smtps";
|
|
||||||
SMTP_ADDR = "smtp.fastmail.com";
|
|
||||||
SMTP_PORT = 465;
|
|
||||||
USER = "msyds@deertopia.net";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let cfg = config.sydnix.upower;
|
|
||||||
in {
|
|
||||||
options.sydnix.upower = {
|
|
||||||
enable = lib.mkEnableOption "UPower";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.upower.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -59,7 +59,6 @@ let
|
|||||||
pkgs = nixpkgs;
|
pkgs = nixpkgs;
|
||||||
};
|
};
|
||||||
inherit inputs system;
|
inherit inputs system;
|
||||||
host = hostName;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ anki-username: ENC[AES256_GCM,data:584uxjwyodM=,iv:/6HLSLzHgc77U1iN5JDLR9F+o8Nfe
|
|||||||
anki-password: ENC[AES256_GCM,data:plSKMTeeilKt6weAnzw/jMo65A==,iv:lzuPUt1+2Iwi9sHbaFj0OuBLd1p+Do2N5aCYXd45MFQ=,tag:WIABFp1T6NuIGpqqQFHmrg==,type:str]
|
anki-password: ENC[AES256_GCM,data:plSKMTeeilKt6weAnzw/jMo65A==,iv:lzuPUt1+2Iwi9sHbaFj0OuBLd1p+Do2N5aCYXd45MFQ=,tag:WIABFp1T6NuIGpqqQFHmrg==,type:str]
|
||||||
anki-sync-key: ENC[AES256_GCM,data:Ka4sPghPwmWQvdXw40ZRLogoMVTBjLnaSyHT9lTfn2XWHHqFAkANAg==,iv:bFkb/k7UUL8t26LjmQwiDYJpvq93NWuqUU/jNYkr7GQ=,tag:Mx5JdqjI3MDk7hsvOlPYIw==,type:str]
|
anki-sync-key: ENC[AES256_GCM,data:Ka4sPghPwmWQvdXw40ZRLogoMVTBjLnaSyHT9lTfn2XWHHqFAkANAg==,iv:bFkb/k7UUL8t26LjmQwiDYJpvq93NWuqUU/jNYkr7GQ=,tag:Mx5JdqjI3MDk7hsvOlPYIw==,type:str]
|
||||||
gitea-actions-runner-token: ENC[AES256_GCM,data:JglbJ2hgXl1wV2bCkcged+D3UrpWMMBuX+ri6YeIqwLIlscvK/wVCdsxQZtDGw==,iv:BYhgfoIa/wHQkd4c7kU8AWAJQfpTfUvSamFXDBqQXTE=,tag:sIK1XxVPIU+uBGaJY3AmTQ==,type:str]
|
gitea-actions-runner-token: ENC[AES256_GCM,data:JglbJ2hgXl1wV2bCkcged+D3UrpWMMBuX+ri6YeIqwLIlscvK/wVCdsxQZtDGw==,iv:BYhgfoIa/wHQkd4c7kU8AWAJQfpTfUvSamFXDBqQXTE=,tag:sIK1XxVPIU+uBGaJY3AmTQ==,type:str]
|
||||||
gitea-mailer-password: ENC[AES256_GCM,data:bgFAhAzYcDhHi4Brg7x8CQ==,iv:hj8+YbcE+Jfhtu8g//Y8EiNw1CejTtMgstB/knbgOls=,tag:CYX3Pr4ErzvHGVfhpvfruw==,type:str]
|
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age10fqh0td67alzpyjyhdex5ncj9thvaty506r0t63vs2nz4ldafgaqadl8mg
|
- recipient: age10fqh0td67alzpyjyhdex5ncj9thvaty506r0t63vs2nz4ldafgaqadl8mg
|
||||||
@@ -51,7 +50,7 @@ sops:
|
|||||||
TXFLY2l0UHJ3Z0NGZjVpbTQ2UC8yaTQKA7wTmW9Ha6T2KmCr/nkXdizgv8+V6SAp
|
TXFLY2l0UHJ3Z0NGZjVpbTQ2UC8yaTQKA7wTmW9Ha6T2KmCr/nkXdizgv8+V6SAp
|
||||||
ZhDO+uDQ1evIh2wLWMOXNJ3d/zplLCOTzR2xkqBIUp5V7MXj45RUIA==
|
ZhDO+uDQ1evIh2wLWMOXNJ3d/zplLCOTzR2xkqBIUp5V7MXj45RUIA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-03-22T07:49:51Z"
|
lastmodified: "2026-03-06T21:55:10Z"
|
||||||
mac: ENC[AES256_GCM,data:Y/7XSZtPlVPDV3eToYQ9MoAGF9nGq0sd0KU1VaR5duK1xbETULioQcpPvVk6HL1kPlUjnmR8RXfCKBC7EJ9P/UAMV2ySulLtD6daogCzF3qa2JSyXPuOyMuXMSjwCNcCyHgpaOrWz+7Zf9FU/1wQwVHeCDTf0sFHaX0xttFfHkg=,iv:7+zXPjeslh+z9hWhYXoUphpbg3Tpe4OHQEcUmetuiMM=,tag:LB0GuN+5TJxXyuvrrqOi7g==,type:str]
|
mac: ENC[AES256_GCM,data:Coff3pzqPxqe1g+2R7V0AN/ZSLog6sKHIBSoWOflYH8tKbIqwvQFRVvEQN6D1o6ZhD2wu8NyTVrKY7FYn4nG9DsEQq8vknq51r1Z9meLSP114N37oX5qjp60ns9kEm3kbf41DTObXETs+jzcA4Rcl2m9Z5I/feKEm7oFp6PvzEg=,iv:Bywv84FGB6IO7M9KFoxx3cVXFElX7QNWossWszMJui8=,tag:D07pceBF1i1vUMZ7nFuslA==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.12.1
|
version: 3.12.1
|
||||||
|
|||||||
@@ -18,68 +18,60 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
homeConfiguration = { config, lib, pkgs, host, ... }:
|
homeConfiguration = { config, lib, pkgs, ... }: {
|
||||||
let on = hosts:
|
home.file.".ssh/id_ed25519".source =
|
||||||
if builtins.isString hosts
|
config.lib.file.mkOutOfStoreSymlink
|
||||||
then hosts == host
|
"/persist/private-keys/ssh/msyds@sydpc";
|
||||||
else builtins.elem host hosts;
|
|
||||||
in {
|
|
||||||
home.file.".ssh/id_ed25519".source =
|
|
||||||
config.lib.file.mkOutOfStoreSymlink
|
|
||||||
"/persist/private-keys/ssh/msyds@sydpc";
|
|
||||||
|
|
||||||
home.file.".face".source = ./avatar.jpg;
|
home.file.".face".source = ./avatar.jpg;
|
||||||
|
|
||||||
home.file.".ssh/id_ed25519.pub".source =
|
home.file.".ssh/id_ed25519.pub".source =
|
||||||
../../public-keys/ssh/${"msyds@sydpc.pub"};
|
../../public-keys/ssh/${"msyds@sydpc.pub"};
|
||||||
|
|
||||||
sydnix = {
|
sydnix = {
|
||||||
documentation.enable = true;
|
xdg.enable = true;
|
||||||
xdg.enable = true;
|
steam.enable = true;
|
||||||
steam.enable = on "sydpc";
|
zotero.enable = true;
|
||||||
zotero.enable = true;
|
openutau.enable = true;
|
||||||
slippi.enable = on "sydpc";
|
slippi.enable = true;
|
||||||
desktop-environment.enable = true;
|
desktop-environment.enable = true;
|
||||||
clojure.enable = true;
|
clojure.enable = true;
|
||||||
capitaine-cursors.enable = true;
|
capitaine-cursors.enable = true;
|
||||||
terraria.enable = on "sydpc";
|
terraria.enable = true;
|
||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
qalculate.enable = true;
|
qalculate.enable = true;
|
||||||
toki-pona.enable = true;
|
sops = {
|
||||||
prism-launcher.enable = true;
|
enable = true;
|
||||||
sops = {
|
keyFile = "/persist/private-keys/age/crumb";
|
||||||
enable = true;
|
};
|
||||||
keyFile = "/persist/private-keys/age/crumb";
|
# Personal configurations.
|
||||||
};
|
users.crumb = {
|
||||||
# Personal configurations.
|
bash.enable = true;
|
||||||
users.crumb = {
|
direnv.enable = true;
|
||||||
direnv.enable = true;
|
git.enable = true;
|
||||||
git.enable = true;
|
nvim.enable = true;
|
||||||
nvim.enable = true;
|
readline.enable = true;
|
||||||
readline.enable = true;
|
niri.enable = true;
|
||||||
niri.enable = true;
|
firefox.enable = true;
|
||||||
firefox.enable = true;
|
ghostty.enable = true;
|
||||||
ghostty.enable = true;
|
# waybar.enable = true;
|
||||||
# waybar.enable = true;
|
tf2.enable = true;
|
||||||
tf2.enable = true;
|
fcitx5.enable = true;
|
||||||
fcitx5.enable = true;
|
anki.enable = true;
|
||||||
anki.enable = true;
|
mumble.enable = true;
|
||||||
mumble.enable = true;
|
};
|
||||||
};
|
users.msyds = {
|
||||||
users.msyds = {
|
discord.enable = true;
|
||||||
discord.enable = true;
|
hunspell.enable = true;
|
||||||
bash.enable = true;
|
emacs.enable = true;
|
||||||
hunspell.enable = true;
|
impermanence.enable = true;
|
||||||
emacs.enable = true;
|
syncthing.enable = true;
|
||||||
impermanence.enable = true;
|
fonts.enable = true;
|
||||||
syncthing.enable = true;
|
dank-material-shell.enable = true;
|
||||||
fonts.enable = true;
|
|
||||||
dank-material-shell.enable = true;
|
|
||||||
sioyek.enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Don't touch!
|
|
||||||
home.stateVersion = "18.09";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Don't touch!
|
||||||
|
home.stateVersion = "18.09";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user