kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: lots of things, really

Browse source
This commit is contained in:
Kat Inskip 2024-11-13 19:30:43 -05:00
parent 5448280ec8
commit 185833d1fb
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
28 changed files with 200 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/common.nix
View file

@ -17,7 +17,7 @@
}; };
}; };
nix.config.max-silent-time = 60 * 60; nix.config.max-silent-time = 60 * 60;
/* /*
nix.config = { nix.config = {
extra-platforms = ["aarch64-linux" "armv6l-linux" "armv7l-linux"]; extra-platforms = ["aarch64-linux" "armv6l-linux" "armv7l-linux"];

10
ci/flake-cron.nix
View file

@ -1,13 +1,9 @@
{ {
lib, lib,
config, config,
channels,
pkgs,
... ...
}: }:
with lib; let with lib; {
inherit (channels.std) string list set;
in {
imports = [./common.nix]; imports = [./common.nix];
config = { config = {
name = "flake-update"; name = "flake-update";
@ -43,9 +39,9 @@ in {
name = "flake update build"; name = "flake update build";
order = 500; order = 500;
run = "nix run .#nf-update"; run = "nix run .#nf-update";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
NF_UPDATE_GIT_COMMIT = "1"; NF_UPDATE_GIT_COMMIT = "1";
NF_UPDATE_CACHIX_PUSH = "1"; NF_UPDATE_CACHIX_PUSH = "1";

4
ci/nodes.nix
View file

@ -42,7 +42,7 @@ in {
run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
NF_UPDATE_CACHIX_PUSH = "1"; NF_UPDATE_CACHIX_PUSH = "1";
NF_CONFIG_ROOT = "\${{ github.workspace }}"; NF_CONFIG_ROOT = "\${{ github.workspace }}";
@ -57,7 +57,7 @@ in {
run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
NF_UPDATE_CACHIX_PUSH = "1"; NF_UPDATE_CACHIX_PUSH = "1";
NF_CONFIG_ROOT = "\${{ github.workspace }}"; NF_CONFIG_ROOT = "\${{ github.workspace }}";

10
common/overlay.nix
View file

@ -6,10 +6,10 @@
nixpkgs = { nixpkgs = {
overlays = import tree.overlays {inherit inputs tree;}; overlays = import tree.overlays {inherit inputs tree;};
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"olm-3.2.16" "olm-3.2.16"
]; ];
}; };
}; };
} }

78
flake.lock generated
View file

@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729826725, "lastModified": 1731454423,
"narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=", "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e", "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729864948, "lastModified": 1731535640,
"narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729734363, "lastModified": 1731375802,
"narHash": "sha256-qSAmcOBaCadTe9VkoNHUmgzJoYy42RE9tSgbGIDQ34M=", "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "f3795fcc37f37ae8c488e70e2cf8a85e43043722", "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,11 +458,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729394935, "lastModified": 1731209121,
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +473,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729742320, "lastModified": 1731403644,
"narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +518,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1729665710, "lastModified": 1731139594,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +534,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729874852, "lastModified": 1731537929,
"narHash": "sha256-ngJHU3jXU7pSSyG0diRIotgnLf2us6XR/jBSlYGD1hU=", "narHash": "sha256-8BN+r2bHiuERmxNcfME82ciiMkgJ+ZLAKSvFnNbVCgY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e39356f189144007b6ff29a82429c6486c59a034", "rev": "bd5ead048fb2a5bb3635111761d2d75f1f19debc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,11 +557,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729710171, "lastModified": 1731193165,
"narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "rev": "f33173b9d22e554a6f869626bc01808d35995257",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -666,11 +666,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726280639, "lastModified": 1729477859,
"narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e9f8641c92f26fd1e076e705edb12147c384171d", "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -715,11 +715,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729775275, "lastModified": 1731364708,
"narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=", "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d", "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -812,11 +812,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -841,11 +841,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1729006311, "lastModified": 1730734444,
"narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=", "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7", "rev": "51c794ac500a2033b9dc570c71810518bfa667a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -869,11 +869,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729717678, "lastModified": 1730453870,
"narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "rev": "adb6bc4b661a43328752b4575be4968a4990c033",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -28,11 +28,11 @@
}; };
}; };
wezterm = { wezterm = {
url = "github:wez/wezterm/main?dir=nix"; url = "github:wez/wezterm/main?dir=nix";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
flake-utils.follows = "utils"; flake-utils.follows = "utils";
}; };
}; };
ci = { ci = {
url = "github:arcnmx/ci/v0.7"; url = "github:arcnmx/ci/v0.7";

3
home/environments/gnome/extensions.nix
View file

@ -15,7 +15,7 @@
]; ];
}; };
"org/gnome/shell/extensions/date-menu-formatter" = { "org/gnome/shell/extensions/date-menu-formatter" = {
pattern = "y-MM-dd kk:mm XXX"; pattern = "y-MM-dd HH:mm Z";
"font-size" = "12"; "font-size" = "12";
}; };
"org/gnome/shell/extensions/vitals" = { "org/gnome/shell/extensions/vitals" = {
@ -28,6 +28,7 @@
space-bar space-bar
user-themes user-themes
tray-icons-reloaded tray-icons-reloaded
appindicator
vitals vitals
dash-to-panel dash-to-panel
date-menu-formatter date-menu-formatter

21
home/environments/gnome/gtk.nix Normal file
View file

@ -0,0 +1,21 @@
{pkgs, ...}: {
gtk = {
enable = true;
iconTheme = {
name = "Numix-Square";
package = pkgs.numix-icon-theme-square;
};
theme = {
name = "Arc-Dark";
package = pkgs.arc-theme;
};
cursorTheme = {
name = "Numix-Cursor";
package = pkgs.numix-cursor-theme;
};
};
home.sessionVariables.GTK_THEME = "Arc-Dark";
}

21
home/environments/gnome/konawall.nix
View file

@ -3,7 +3,26 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: { }: let
konawallConfig = {
interval = 30 * 60;
rotate = true;
source = "konachan";
tags = [
"rating:s"
"touhou"
"score:>=50"
"width:>=1500"
];
logging = {
file = "INFO";
console = "DEBUG";
};
};
in {
xdg.configFile = {
"konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig;
};
systemd.user.services.konawall-py-gnome = { systemd.user.services.konawall-py-gnome = {
Unit = { Unit = {
Description = "konawall-py"; Description = "konawall-py";

2
home/environments/gnome/ssh.nix
View file

@ -9,7 +9,7 @@ in {
# Disable gnome-keyring ssh-agent # Disable gnome-keyring ssh-agent
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
${fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} ${fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
Hidden=true Hidden=true
''; '';
} }

2
home/environments/kde/kde.nix
View file

@ -57,7 +57,7 @@
"kdeglobals"."WM"."inactiveBlend" = "231,232,235"; "kdeglobals"."WM"."inactiveBlend" = "231,232,235";
"kdeglobals"."WM"."inactiveForeground" = "163,165,172"; "kdeglobals"."WM"."inactiveForeground" = "163,165,172";
"kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
"kdeglobals"."General"."TerminalApplication" = "wezterm start --cwd ."; "kdeglobals"."General"."TerminalApplication" = "konsole";
"kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop"; "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop";
"kxkbrc"."Layout"."ResetOldOptions" = true; "kxkbrc"."Layout"."ResetOldOptions" = true;
"plasmarc"."Theme"."name" = "Arc"; "plasmarc"."Theme"."name" = "Arc";

2
home/profiles/common/base16.nix
View file

@ -22,6 +22,6 @@ in {
ansi.palette.background.alpha = "ee00"; ansi.palette.background.alpha = "ee00";
}; };
}; };
defaultSchemeName = "light"; defaultSchemeName = "dark";
}; };
} }

1
home/profiles/graphical/packages.nix
View file

@ -12,6 +12,7 @@
# Music # Music
spotify spotify
strawberry-qt6
# Chat # Chat
fractal # Matrix fractal # Matrix

15
home/profiles/graphical/wezterm.nix
View file

@ -1,14 +1,15 @@
{ inputs, pkgs, ... }: { {
inputs,
pkgs,
...
}: {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
#package = inputs.wezterm.outputs.packages.${pkgs.system}.default; package = inputs.wezterm.outputs.packages.${pkgs.system}.default;
extraConfig = '' extraConfig = ''
local wezterm = require 'wezterm'; local wezterm = require 'wezterm';
return { return {
front_end=‘WebGpu’,
font = wezterm.font_with_fallback({ font = wezterm.font_with_fallback({
-- /nix/store/rh47mw5pfp7w2nmkn8rlwjkmkzf11prq-monaspace-1.000/share/fonts/opentype/MonaspaceKrypton-Regular.otf, FontConfig
"Monaspace Krypton",
-- <built-in>, BuiltIn -- <built-in>, BuiltIn
"JetBrains Mono", "JetBrains Mono",
@ -22,9 +23,11 @@
"Symbols Nerd Font Mono", "Symbols Nerd Font Mono",
}), }),
window_decorations = "TITLE | RESIZE",
enable_wayland = false,
warn_about_missing_glyphs = false,
font_size = 10.0, font_size = 10.0,
check_for_updates = false, check_for_updates = false,
show_update_window = false,
enable_tab_bar = false enable_tab_bar = false
} }
''; '';

26
nixos/environments/gnome/packages.nix
View file

@ -1,19 +1,17 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.gnome.excludePackages = environment.gnome.excludePackages = with pkgs; [
(with pkgs; [ gnome-photos
gnome-photos gnome-tour
gnome-tour cheese # webcam tool
]) epiphany # web browser
++ (with pkgs.gnome; [ geary # email reader
cheese # webcam tool gnome-characters
epiphany # web browser gnome-contacts
geary # email reader gnome-initial-setup
gnome-characters ];
gnome-contacts
gnome-initial-setup
]);
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome.gnome-tweaks gnome-tweaks
gnome-extension-manager gnome-extension-manager
]; ];
services.udev.packages = [pkgs.gnome.gnome-settings-daemon];
} }

8
nixos/hardware/oracle_micro.nix
View file

@ -12,10 +12,10 @@
}; };
systemd-boot.configurationLimit = 1; systemd-boot.configurationLimit = 1;
}; };
initrd = { initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
kernelModules = ["nvme"]; kernelModules = ["nvme"];
}; };
}; };
fileSystems = { fileSystems = {
"/boot" = { "/boot" = {

7
nixos/profiles/gaming/lutris.nix
View file

@ -1,11 +1,10 @@
{pkgs, ...}: { {pkgs, ...}: {
hardware.opengl = {
driSupport32Bit = true;
};
hardware.graphics = { hardware.graphics = {
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [
amdvlk
];
extraPackages32 = with pkgs; [ extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
driversi686Linux.mesa driversi686Linux.mesa
]; ];
}; };

6
nixos/profiles/graphical/dns.nix
View file

@ -4,10 +4,10 @@ in {
networking = { networking = {
networkmanager.dns = mkForce "none"; networkmanager.dns = mkForce "none";
nameservers = [ nameservers = [
"172.20.0.1" #"172.20.0.1"
/*"1.1.1.1#cloudflare-dns.com" "1.1.1.1#cloudflare-dns.com"
"1.0.0.1#cloudflare-dns.com" "1.0.0.1#cloudflare-dns.com"
"8.8.8.8#dns.google"*/ "8.8.8.8#dns.google"
]; ];
}; };
services.resolved = { services.resolved = {

2
nixos/servers/matrix/discord.nix
View file

@ -1,4 +1,4 @@
{config, ...}: { _: {
services.mx-puppet-discord = { services.mx-puppet-discord = {
#inherit (config.services.matrix-synapse) enable; #inherit (config.services.matrix-synapse) enable;
settings = { settings = {

22
nixos/servers/matrix/postgres.nix
View file

@ -1,13 +1,13 @@
_: { _: {
services.postgresql = { services.postgresql = {
ensureUsers = [ ensureUsers = [
{ {
name = "matrix-synapse"; name = "matrix-synapse";
ensureDBOwnership = true; ensureDBOwnership = true;
} }
]; ];
ensureDatabases = [ ensureDatabases = [
"matrix-synapse" "matrix-synapse"
]; ];
}; };
} }

6
nixos/servers/matrix/synapse.nix
View file

@ -24,11 +24,13 @@ in {
allow_guest_access = true; allow_guest_access = true;
suppress_key_server_warning = true; suppress_key_server_warning = true;
use_appservice_legacy_authorization = true; use_appservice_legacy_authorization = true;
/*app_service_config_files = [ /*
app_service_config_files = [
"/var/lib/matrix-synapse/discord-registration.yaml" "/var/lib/matrix-synapse/discord-registration.yaml"
"/var/lib/matrix-synapse/whatsapp-registration.yaml" "/var/lib/matrix-synapse/whatsapp-registration.yaml"
"/var/lib/matrix-synapse/telegram-registration.yaml" "/var/lib/matrix-synapse/telegram-registration.yaml"
];*/ ];
*/
log_config = pkgs.writeText "nya.yaml" '' log_config = pkgs.writeText "nya.yaml" ''
version: 1 version: 1
formatters: formatters:

2
packages/default.nix
View file

@ -6,4 +6,4 @@
# formerly final: prev:, but deadnix # formerly final: prev:, but deadnix
inherit (inputs.std.lib) set; inherit (inputs.std.lib) set;
in in
(set.map (_: package: prev.callPackage package {}) (removeAttrs tree.packages ["default"])) set.map (_: package: prev.callPackage package {}) (removeAttrs tree.packages ["default"])

2
pkgs.nix
View file

@ -11,7 +11,7 @@ in
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"olm-3.2.16" "olm-3.2.16"
]; ];
}; };
}; };

35
systems/koishi.nix
View file

@ -19,7 +19,8 @@ _: let
secureboot secureboot
]) ])
++ (with tree.nixos.environments; [ ++ (with tree.nixos.environments; [
kde #kde
gnome
]); ]);
config = { config = {
home-manager.users.kat.imports = home-manager.users.kat.imports =
@ -28,27 +29,28 @@ _: let
devops devops
]) ])
++ (with tree.home.environments; [ ++ (with tree.home.environments; [
kde #kde
gnome
]); ]);
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/ea521d6e-386f-4e6d-adde-c4be376cf19b"; device = "/dev/disk/by-uuid/ea521d6e-386f-4e6d-adde-c4be376cf19b";
fsType = "xfs"; fsType = "xfs";
}; };
boot.initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb"; fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C6C8-14D2";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
fileSystems."/boot" = swapDevices = [
{ device = "/dev/disk/by-uuid/C6C8-14D2"; {device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4";}
fsType = "vfat"; ];
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4"; }
];
boot = { boot = {
initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb";
loader.grub.useOSProber = true;
extraModprobeConfig = "options snd_hda_intel power_save=0"; extraModprobeConfig = "options snd_hda_intel power_save=0";
extraModulePackages = [config.boot.kernelPackages.v4l2loopback.out]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback.out];
}; };
@ -60,7 +62,6 @@ _: let
IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
''; '';
boot.loader.grub.useOSProber = true;
nix = { nix = {
buildMachines = [ buildMachines = [
{ {

21
wrappers/default.nix
View file

@ -1,12 +1,9 @@
{ {inputs, ...} @ args:
inputs, inputs.utils.lib.eachDefaultSystem (system: let
... newArgs = args // {inherit system;};
}@args: in {
inputs.utils.lib.eachDefaultSystem (system: let packages = {
newArgs = args // { inherit system; }; nf-actions-test = import ./nf-actions-test.nix newArgs;
in { nf-generate = import ./nf-generate.nix newArgs;
packages = { };
nf-actions-test = import ./nf-actions-test.nix newArgs; })
nf-generate = import ./nf-generate.nix newArgs;
};
})

8
wrappers/exports.nix
View file

@ -1,9 +1,5 @@
{ {inputs, ...}: let
system, inherit (inputs.std.lib) string set;
inputs,
...
}: let
inherit (inputs.std.lib) string list set;
inherit (inputs.self) systems; inherit (inputs.self) systems;
enabledNixosSystems = set.filter (_: system: system.config.ci.enable && system.config.type == "NixOS") systems; enabledNixosSystems = set.filter (_: system: system.config.ci.enable && system.config.type == "NixOS") systems;
in { in {

14
wrappers/nf-actions-test.nix
View file

@ -2,16 +2,14 @@
system, system,
inputs, inputs,
... ...
}@args: let } @ args: let
lib = inputs.nixpkgs.lib;
exportFile = import ./exports.nix args; exportFile = import ./exports.nix args;
inherit (exportFile) exports exportsSystems; inherit (exportFile) exports exportsSystems;
inherit (inputs.std.lib) string list set;
packages = inputs.self.packages.${system};
inherit (inputs.self.legacyPackages.${system}) pkgs; inherit (inputs.self.legacyPackages.${system}) pkgs;
nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" '' nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" ''
${exports} ${exports}
${exportsSystems} ${exportsSystems}
source ${./actions-test.sh} source ${./actions-test.sh}
''; '';
in nf-actions-test in
nf-actions-test

26
wrappers/nf-generate.nix
View file

@ -2,20 +2,20 @@
system, system,
inputs, inputs,
... ...
}@args: let } @ args: let
lib = inputs.nixpkgs.lib; inherit (inputs.nixpkgs) lib;
exportFile = import ./exports.nix args; exportFile = import ./exports.nix args;
inherit (exportFile) exports exportsSystems; inherit (exportFile) exports;
inherit (lib.strings) makeBinPath; inherit (lib.strings) makeBinPath;
inherit (inputs.std.lib) string list set; inherit (inputs.std.lib) string;
packages = inputs.self.packages.${system};
inherit (inputs.self.legacyPackages.${system}) pkgs; inherit (inputs.self.legacyPackages.${system}) pkgs;
inherit (import ../ci/nix.nix) ci; inherit (import ../ci/nix.nix) ci;
nf-generate = pkgs.writeShellScriptBin "nf-generate" '' nf-generate = pkgs.writeShellScriptBin "nf-generate" ''
${exports} ${exports}
export PATH="$PATH:${makeBinPath [pkgs.jq]}" export PATH="$PATH:${makeBinPath [pkgs.jq]}"
NF_INPUT_CI=${string.escapeShellArg inputs.ci} NF_INPUT_CI=${string.escapeShellArg inputs.ci}
NF_CONFIG_FILES=(${string.concatMapSep " " string.escapeShellArg ci.workflowConfigs}) NF_CONFIG_FILES=(${string.concatMapSep " " string.escapeShellArg ci.workflowConfigs})
source ${./generate.sh} source ${./generate.sh}
''; '';
in nf-generate in
nf-generate