chore: format

This commit is contained in:
Teesh 2026-02-06 14:49:06 +02:00
parent 18cce0eb09
commit 8699ef309d
60 changed files with 265 additions and 312 deletions

View file

@ -41,7 +41,7 @@
copyparty.url = "github:9001/copyparty";
};
outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; }
outputs = inputs @ {flake-parts, ...}:
flake-parts.lib.mkFlake {inherit inputs;}
(inputs.import-tree ./modules);
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

View file

@ -1,8 +1,6 @@
{ ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
environment.systemPackages = [ pkgs.eza ];
{...}: {
flake.modules.nixos.base = {pkgs, ...}: {
environment.systemPackages = [pkgs.eza];
environment.shellAliases = {
"eza" = "${pkgs.eza}/bin/eza -lah --sort=type --icons=auto";
"ls" = "${pkgs.eza}/bin/eza";

View file

@ -1,7 +1,5 @@
{ config, ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
{config, ...}: {
flake.modules.nixos.base = {pkgs, ...}: {
programs.fish.enable = true;
users.users.${config.flake.meta.user.name}.shell = pkgs.fish;
documentation.man.generateCaches = false;

View file

@ -1,8 +1,6 @@
{ ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
environment.systemPackages = [ pkgs.gh ];
{...}: {
flake.modules.nixos.base = {pkgs, ...}: {
environment.systemPackages = [pkgs.gh];
};
flake.modules.homeManager.base = {

View file

@ -1,10 +1,7 @@
{ config, ... }:
let
{config, ...}: let
userName = config.flake.meta.git.name or config.flake.meta.user.name or "";
userEmail = config.flake.meta.git.email or config.flake.meta.user.email or "";
in
{
in {
flake.modules.nixos.base = {
programs.git.enable = true;
};

View file

@ -1,9 +1,11 @@
{ inputs, config, ... }:
{
inputs,
config,
...
}: {
flake.modules.nixos.base = {
imports = [ inputs.home-manager.nixosModules.home-manager ];
imports = [inputs.home-manager.nixosModules.home-manager];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${config.flake.meta.user.name} = {

View file

@ -1,7 +1,5 @@
{ ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
{...}: {
flake.modules.nixos.base = {pkgs, ...}: {
boot.kernelPackages = pkgs.linuxPackages_latest;
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
networking.networkmanager.enable = true;
networking.firewall.enable = false;

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.base = {
programs.nh = {
enable = true;

View file

@ -1,7 +1,5 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
time.timeZone = "Asia/Jerusalem";

View file

@ -1,7 +1,5 @@
{ inputs, ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
{inputs, ...}: {
flake.modules.nixos.base = {pkgs, ...}: {
imports = [
inputs.sops-nix.nixosModules.sops
];

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
programs.starship.enable = true;
};

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.base = {
system.stateVersion = "${config.flake.meta.stateVersion}";
};

View file

@ -1,9 +1,11 @@
{ inputs, lib, ... }:
{
flake.modules.nixos.base = { pkgs, ... }: {
imports = [ inputs.stylix.nixosModules.stylix ];
inputs,
lib,
...
}: {
flake.modules.nixos.base = {pkgs, ...}: {
imports = [inputs.stylix.nixosModules.stylix];
stylix = {
enable = true;
image = ./wallpaper.jpeg;

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
nixpkgs.config.allowUnfree = true;
};

View file

@ -1,11 +1,9 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.base = {
users.users.${config.flake.meta.user.name} = {
isNormalUser = true;
description = "${config.flake.meta.user.name}";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = ["networkmanager" "wheel"];
packages = [];
};
};

View file

@ -1,10 +1,8 @@
{ ... }:
{
{...}: {
flake.modules.nixos.base = {
programs.zoxide = {
enable = true;
enableZshIntegration = true;
enableBashIntegration = true;
enableFishIntegration = true;

View file

@ -1,7 +1,5 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
environment.systemPackages = [ pkgs.claude-code ];
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [pkgs.claude-code];
};
}

View file

@ -1,13 +1,10 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: let
discord = (pkgs.discord.override {
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: let
discord = pkgs.discord.override {
withOpenASAR = true;
withVencord = true;
});
in
{
environment.systemPackages = [ discord ];
};
in {
environment.systemPackages = [discord];
};
}

View file

@ -1,15 +1,17 @@
{ inputs, config, ... }:
{
inputs,
config,
...
}: {
flake.modules.nixos.desktop = {
programs.firefox.enable = true;
};
flake.modules.homeManager.desktop = { pkgs, ... }: let
flake.modules.homeManager.desktop = {pkgs, ...}: let
system = pkgs.stdenv.hostPlatform.system;
ff-addons = inputs.firefox-addons.packages.${system};
in {
stylix.targets.firefox.profileNames = [ config.flake.meta.user.name ];
stylix.targets.firefox.profileNames = [config.flake.meta.user.name];
programs.firefox = {
enable = true;
profiles.${config.flake.meta.user.name} = {
@ -22,10 +24,17 @@
];
search.engines = {
"Unduck" = {
urls = [{
template = "https://unduck.link";
params = [ { name = "q"; value = "{searchTerms}"; } ];
}];
urls = [
{
template = "https://unduck.link";
params = [
{
name = "q";
value = "{searchTerms}";
}
];
}
];
definedAliases = ["@un"];
};
};

View file

@ -1,8 +1,6 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
environment.systemPackages = [ pkgs.ghostty ];
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [pkgs.ghostty];
};
flake.modules.homeManager.desktop = {

View file

@ -1,15 +1,13 @@
{ config, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
environment.systemPackages = [ pkgs.halloy ];
{config, ...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [pkgs.halloy];
sops.secrets."irc/password" = {
owner = config.flake.meta.user.name;
};
};
flake.modules.homeManager.desktop = { lib, ... }: {
flake.modules.homeManager.desktop = {lib, ...}: {
programs.halloy = {
enable = true;
settings = {
@ -26,11 +24,10 @@
use_tls = false;
dangerously_accept_invalid_certs = true;
sasl.plain =
lib.mkIf (config.flake.meta.irc.server.isBouncer or false) {
username = config.flake.meta.user.name;
password_file = "/run/secrets/irc/password";
};
sasl.plain = lib.mkIf (config.flake.meta.irc.server.isBouncer or false) {
username = config.flake.meta.user.name;
password_file = "/run/secrets/irc/password";
};
};
buffer.chathistory = {

View file

@ -1,7 +1,5 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
environment.systemPackages = [ pkgs.localsend ];
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [pkgs.localsend];
};
}

View file

@ -1,9 +1,7 @@
{ self, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: let
{self, ...}: {
flake.modules.nixos.desktop = {pkgs, ...}: let
system = pkgs.stdenv.hostPlatform.system;
in {
environment.systemPackages = [ self.packages.${system}.notion ];
environment.systemPackages = [self.packages.${system}.notion];
};
}

View file

@ -1,7 +1,5 @@
{ inputs, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: let
{inputs, ...}: {
flake.modules.nixos.desktop = {pkgs, ...}: let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in {
imports = [

View file

@ -1,10 +1,8 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;

View file

@ -1,7 +1,5 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
environment.systemPackages = [ pkgs.telegram-desktop ];
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [pkgs.telegram-desktop];
};
}

View file

@ -1,9 +1,7 @@
{ self, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: let
{self, ...}: {
flake.modules.nixos.desktop = {pkgs, ...}: let
system = pkgs.stdenv.hostPlatform.system;
in {
environment.systemPackages = [ self.packages.${system}.u2c ];
environment.systemPackages = [self.packages.${system}.u2c];
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
services.xserver.enable = true;
services.desktopManager.gnome.enable = false;

View file

@ -1,7 +1,5 @@
{ inputs, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: let
{inputs, ...}: {
flake.modules.nixos.desktop = {pkgs, ...}: let
niri-unstable = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
in {
imports = [
@ -16,13 +14,17 @@
];
};
flake.modules.homeManager.desktop = { pkgs, lib, ... }: let
flake.modules.homeManager.desktop = {
pkgs,
lib,
...
}: let
noctalia-pkg = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
noctalia-shell = "${noctalia-pkg}/bin/noctalia-shell";
ghostty = "${pkgs.ghostty}/bin/ghostty";
playerctl = "${pkgs.playerctl}/bin/playerctl";
yazi = "${pkgs.yazi}/bin/yazi";
noctalia = cmd: [ noctalia-shell "ipc" "call" ] ++ (pkgs.lib.splitString " " cmd);
noctalia = cmd: [noctalia-shell "ipc" "call"] ++ (pkgs.lib.splitString " " cmd);
xws-unstable = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable;
in {
programs.niri.settings.xwayland-satellite.enable = true;
@ -31,10 +33,12 @@
environment."NIXOS_OZONE_WL" = "1";
prefer-no-csd = true;
input.keyboard.numlock = true;
layer-rules = [ {
matches = [ { namespace = "^noctalia-overview*"; } ];
place-within-backdrop = true;
} ];
layer-rules = [
{
matches = [{namespace = "^noctalia-overview*";}];
place-within-backdrop = true;
}
];
binds = {
"Mod+Shift+S".action.screenshot = [];
"Mod+Shift+Q".action.spawn = noctalia "sessionMenu toggle";
@ -93,11 +97,11 @@
"Mod+Shift+Equal".action.set-window-height = "+10%";
"Mod+O".action.toggle-overview = [];
"Mod+E".action.spawn = [ ghostty "-e" yazi ];
"Mod+E".action.spawn = [ghostty "-e" yazi];
};
spawn-at-startup = [
{ command = [ noctalia-shell ]; }
{command = [noctalia-shell];}
];
hotkey-overlay.skip-at-startup = true;
};

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.homeManager.desktop = {
home.file.".face".source = config.flake.meta.user.face;
};

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
services.displayManager.gdm.enable = true;
};

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
services.xserver.xkb = {
layout = "us,il";

View file

@ -1,7 +1,9 @@
{ config, inputs, ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
config,
inputs,
...
}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
environment.systemPackages = [
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
];
@ -35,16 +37,23 @@
position = "left";
widgets = {
left = [
{ id = "ControlCenter"; useDistroLogo = true; }
{ id = "Network"; }
{ id = "Bluetooth"; }
{
id = "ControlCenter";
useDistroLogo = true;
}
{id = "Network";}
{id = "Bluetooth";}
];
center = [
{ id = "Workspace"; hideUnoccupied = true; labelMode = "none"; }
{
id = "Workspace";
hideUnoccupied = true;
labelMode = "none";
}
];
right = [
{ id = "KeyboardLayout"; }
{ id = "Tray"; }
{id = "KeyboardLayout";}
{id = "Tray";}
{
id = "Battery";
alwaysShowPercentage = true;

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
services.printing.enable = true;
};

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.desktop = {
services.pulseaudio.enable = false;
security.rtkit.enable = true;

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.homeManager.desktop = {
services.udiskie.enable = true;
services.udiskie.notify = true;

View file

@ -1,10 +1,8 @@
{ ... }:
{
flake.modules.nixos.desktop = { pkgs, ... }: {
{...}: {
flake.modules.nixos.desktop = {pkgs, ...}: {
programs.yazi.enable = true;
environment.systemPackages = [ pkgs.mpv ];
environment.systemPackages = [pkgs.mpv];
};
flake.modules.homeManager.desktop = {

View file

@ -1,6 +1,4 @@
{ inputs, ... }:
{
{inputs, ...}: {
systems = [
"x86_64-linux"
];

View file

@ -1,33 +1,37 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ ... }:
{...}: {
flake.modules.nixos.krembo = {
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
{
flake.modules.nixos.krembo = { config, lib, pkgs, modulesPath, ... }: {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/c0ed85ea-78bd-4613-91c4-86f5e8772561";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c0ed85ea-78bd-4613-91c4-86f5e8772561";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/BA16-88CF";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/BA16-88CF";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/85a3e327-7e21-4489-a81a-79caf5c1ee09"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/85a3e327-7e21-4489-a81a-79caf5c1ee09";}
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedributableFirmware or true;

View file

@ -1,7 +1,5 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.krembo = {
home-manager.users.${config.flake.meta.user.name}.imports = [ config.flake.modules.homeManager.krembo ];
home-manager.users.${config.flake.meta.user.name}.imports = [config.flake.modules.homeManager.krembo];
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.krembo = {
networking.hostName = "krembo";
};

View file

@ -1,6 +1,8 @@
{ inputs, config, ... }:
{
inputs,
config,
...
}: {
flake.nixosConfigurations.krembo = inputs.nixpkgs.lib.nixosSystem {
modules = with config.flake.modules; [
nixos.krembo

View file

@ -1,33 +1,37 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ ... }:
{...}: {
flake.modules.nixos.taki = {
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
{
flake.modules.nixos.taki = { config, lib, pkgs, modulesPath, ... }: {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/b1830103-1e4a-4710-8aa6-f597a4ca46b3";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b1830103-1e4a-4710-8aa6-f597a4ca46b3";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/F3B7-DE6D";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/F3B7-DE6D";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a74700a7-4c29-40cc-b0b4-50a171125dc1"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/a74700a7-4c29-40cc-b0b4-50a171125dc1";}
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -1,7 +1,5 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.taki = {
home-manager.users.${config.flake.meta.user.name}.imports = [ config.flake.modules.homeManager.taki ];
home-manager.users.${config.flake.meta.user.name}.imports = [config.flake.modules.homeManager.taki];
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.taki = {
networking.hostName = "taki";
};

View file

@ -1,10 +1,12 @@
{ ... }:
{...}: {
flake.modules.nixos.taki = {
pkgs,
config,
...
}: {
hardware.firmware = [pkgs.sof-firmware];
{
flake.modules.nixos.taki = { pkgs, config, ... }: {
hardware.firmware = [ pkgs.sof-firmware ];
hardware.bluetooth.enable = true;
hardware.bluetooth.enable = true;
hardware.graphics.extraPackages = with pkgs; [
intel-media-driver
@ -12,7 +14,7 @@
vpl-gpu-rt
];
services.fstrim.enable = true;
services.tlp.enable = (!config.services.power-profiles-daemon.enable);
services.tlp.enable = !config.services.power-profiles-daemon.enable;
boot = {
# Workaround: Out of the box, resuming from hibernation will break sounds.
@ -41,7 +43,7 @@
};
environment.variables = {
INTEL_DEBUG="no32";
INTEL_DEBUG = "no32";
};
security.tpm2.enable = true;

View file

@ -1,6 +1,8 @@
{ inputs, config, ... }:
{
inputs,
config,
...
}: {
flake.nixosConfigurations.taki = inputs.nixpkgs.lib.nixosSystem {
modules = with config.flake.modules; [
nixos.taki

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.krembo.imports = with config.flake.modules.nixos; [
base
server

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.taki.imports = with config.flake.modules.nixos; [
base
desktop

View file

@ -1,9 +1,6 @@
{ lib, ... }:
let
{lib, ...}: let
inherit (lib) types;
in
{
in {
options.flake.meta = lib.mkOption {
type = types.attrsOf types.anything;
default = {};

View file

@ -1,14 +1,17 @@
{ ... }:
{
perSystem = { self', pkgs, lib, ... }: {
{...}: {
perSystem = {
self',
pkgs,
lib,
...
}: {
packages.notion-app = pkgs.writeShellScriptBin "notion-app" ''
${lib.getExe pkgs.chromium} --app=https://www.notion.so
'';
packages.notion-icon = pkgs.stdenv.mkDerivation {
name = "notion-icon";
src = pkgs.fetchurl {
url = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Notion-logo.svg";
hash = "sha256-G1KhhdgWbZM59cFt1ReJ7jD0mmW01Ac4KQtgQj4zEWA=";
@ -28,7 +31,7 @@
comment = "Productivity software";
desktopName = "Notion";
genericName = "Productivity software";
categories = [ "Office" ];
categories = ["Office"];
};
packages.notion = pkgs.symlinkJoin {

View file

@ -1,7 +1,5 @@
{ ... }:
{
perSystem = { pkgs, ... }: {
{...}: {
perSystem = {pkgs, ...}: {
packages.u2c = pkgs.stdenv.mkDerivation {
name = "u2c";
version = "2.19";
@ -18,7 +16,7 @@
chmod +x $out/bin/u2c
'';
buildInputs = [ pkgs.python3 ];
buildInputs = [pkgs.python3];
meta = {
description = "A fast uploader for Copyparty";

View file

@ -1,8 +1,6 @@
{ config, ... }:
{
flake.modules.nixos.server = { pkgs, ... }: {
environment.systemPackages = [ pkgs.cloudflared ];
{config, ...}: {
flake.modules.nixos.server = {pkgs, ...}: {
environment.systemPackages = [pkgs.cloudflared];
services.cloudflared.enable = config.flake.meta.web.domain.has;
};

View file

@ -1,10 +1,12 @@
{ inputs, ... }@inp:
let
{inputs, ...} @ inp: let
flk = inp.config.flake;
in
{
flake.modules.nixos.server = { pkgs, lib, config, ... }: {
in {
flake.modules.nixos.server = {
pkgs,
lib,
config,
...
}: {
imports = [
inputs.copyparty.nixosModules.default
];
@ -16,7 +18,7 @@ in
owner = config.services.copyparty.user;
};
sops.secrets."cloudflare/copyparty" = {};
services.cloudflared.tunnels = lib.mkIf config.services.cloudflared.enable {
"files" = {
credentialsFile = "/run/secrets/cloudflare/copyparty";
@ -29,15 +31,21 @@ in
};
};
nixpkgs.overlays = [ inputs.copyparty.overlays.default ];
environment.systemPackages = [ pkgs.copyparty ];
services.copyparty.settings.xff-hdr = if config.services.cloudflared.enable then "cf-connecting-ip" else null;
services.copyparty.settings.rproxy = if config.services.cloudflared.enable then 1 else null;
nixpkgs.overlays = [inputs.copyparty.overlays.default];
environment.systemPackages = [pkgs.copyparty];
services.copyparty.settings.xff-hdr =
if config.services.cloudflared.enable
then "cf-connecting-ip"
else null;
services.copyparty.settings.rproxy =
if config.services.cloudflared.enable
then 1
else null;
services.copyparty = {
enable = true;
settings = {
i = "0.0.0.0";
p = [ 3293 ];
p = [3293];
e2d = true;
e2t = true;
@ -51,20 +59,20 @@ in
"/" = {
path = "/var/lib/copyparty/data";
access = {
rwmd = [ "ilay" ];
r = [ "ron" ];
rwmd = ["ilay"];
r = ["ron"];
};
};
"/ilay" = {
path = "/var/lib/copyparty/data/ilay";
access = {
rwmd = [ "ilay" ];
rwmd = ["ilay"];
};
};
"/ron" = {
path = "/var/lib/copyparty/data/ron";
access = {
rwmd = [ "ron" ];
rwmd = ["ron"];
};
};
};

View file

@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
flake.modules.nixos.server = {
services.soju.enable = true;
services.soju.listen = [

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
flake.modules.nixos.server = {
services.openssh.enable = true;
};

View file

@ -1,6 +1,4 @@
{ ... }:
rec {
{...}: rec {
flake.meta.user = {
name = "teesh";
email = "ilaylevy611@gmail.com";