Reformat all files using nixfmt

This commit is contained in:
Evie Litherland-Smith 2024-07-30 15:06:34 +01:00
parent 3e357cbe95
commit 6a6d53cff5
83 changed files with 2092 additions and 1700 deletions

112
flake.nix
View file

@ -2,8 +2,8 @@
description = "Evie's machine configurations";
nixConfig = {
extra-substituters = ["https://nix.xenia.me.uk"];
extra-trusted-public-keys = ["nix.xenia.me.uk:tlgwOaG5KMLjQUk2YaErS8mAG69ZCr3PaHXZYi+Y5eI="];
extra-substituters = [ "https://nix.xenia.me.uk" ];
extra-trusted-public-keys = [ "nix.xenia.me.uk:tlgwOaG5KMLjQUk2YaErS8mAG69ZCr3PaHXZYi+Y5eI=" ];
};
inputs = {
@ -27,7 +27,8 @@
};
};
outputs = {
outputs =
{
nixpkgs,
home-manager,
plasma-manager,
@ -35,20 +36,29 @@
base16,
tt-schemes,
...
} @ inputs: let
defaultSpecialArgs = {system ? "x86_64-linux", ...}: {
}@inputs:
let
defaultSpecialArgs =
{
system ? "x86_64-linux",
...
}:
{
inherit inputs;
iosevkaCustom = {
packages = iosevka-custom.outputs.packages.${system};
names = iosevka-custom.outputs.names;
};
};
defaultExtraSpecialArgs = {system}: let
defaultExtraSpecialArgs =
{ system }:
let
iosevkaCustom = {
packages = iosevka-custom.outputs.packages.${system};
names = iosevka-custom.outputs.names;
};
in {
in
{
inherit inputs iosevkaCustom;
inherit (plasma-manager.packages.${system}) rc2nix;
accentColourName = "base0E";
@ -70,45 +80,60 @@
};
};
};
defaultModules = {
defaultModules =
{
system ? "x86_64-linux",
username ? "pixelifytica",
hostName ? "Atlas",
loginShell ? "bash",
...
}: [
}:
[
home-manager.nixosModules.home-manager
./system/default.nix
./system/${hostName}.nix
./system/hardware-configuration/${hostName}.nix
({
(
{
config,
lib,
pkgs,
...
}: {
networking = {inherit hostName;};
nix.settings.trusted-users = [username];
}:
{
networking = {
inherit hostName;
};
nix.settings.trusted-users = [ username ];
services.greetd.settings.initial_session.user = username;
programs.${loginShell} = lib.mkIf (loginShell != "bash") {enable = true;};
programs.${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; };
users.users.${username} = {
shell = pkgs.${loginShell};
group = "users";
isNormalUser = true;
description = "Evie Litherland-Smith";
extraGroups = ["networkmanager" "wheel" "video" "input" "uinput" "dialout"];
extraGroups = [
"networkmanager"
"wheel"
"video"
"input"
"uinput"
"dialout"
];
initialHashedPassword = "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
openssh = {inherit (config.users.users.root.openssh) authorizedKeys;};
openssh = {
inherit (config.users.users.root.openssh) authorizedKeys;
};
};
home-manager = {
extraSpecialArgs = defaultExtraSpecialArgs {inherit system;};
extraSpecialArgs = defaultExtraSpecialArgs { inherit system; };
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "backup";
users.${username} = {
imports = [
base16.homeManagerModule
{scheme = "${tt-schemes}/base16/one-light.yaml";}
{ scheme = "${tt-schemes}/base16/one-light.yaml"; }
./home/${hostName}.nix
];
home = {
@ -120,64 +145,75 @@
nixpkgs.config.allowUnfree = true;
};
};
})
}
)
];
in {
devShells.x86_64-linux.default = let
pkgs = import nixpkgs {system = "x86_64-linux";};
in
{
devShells.x86_64-linux.default =
let
pkgs = import nixpkgs { system = "x86_64-linux"; };
in
pkgs.mkShellNoCC {
packages = with pkgs; [nil pre-commit];
packages = with pkgs; [
nil
pre-commit
];
shellHook = "pre-commit install --install-hooks";
};
nixosConfigurations = {
## Server
Legion = let
Legion =
let
system = "x86_64-linux";
username = "pixelifytica";
hostName = "Legion";
in
nixpkgs.lib.nixosSystem {
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {inherit system username hostName;};
specialArgs = defaultSpecialArgs { inherit system; };
modules = defaultModules { inherit system username hostName; };
};
## Personal
Northstar = let
Northstar =
let
system = "x86_64-linux";
username = "pixelifytica";
hostName = "Northstar";
in
nixpkgs.lib.nixosSystem {
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {inherit system username hostName;};
specialArgs = defaultSpecialArgs { inherit system; };
modules = defaultModules { inherit system username hostName; };
};
Vanguard = let
Vanguard =
let
system = "x86_64-linux";
username = "pixelifytica";
hostName = "Vanguard";
in
nixpkgs.lib.nixosSystem {
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {inherit system username hostName;};
specialArgs = defaultSpecialArgs { inherit system; };
modules = defaultModules { inherit system username hostName; };
};
## Work
Tone = let
Tone =
let
system = "x86_64-linux";
username = "elitherl";
hostName = "Tone";
in
nixpkgs.lib.nixosSystem {
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {inherit system username hostName;};
specialArgs = defaultSpecialArgs { inherit system; };
modules = defaultModules { inherit system username hostName; };
};
Scorch = let
Scorch =
let
system = "x86_64-linux";
username = "elitherl";
hostName = "Scorch";
in
nixpkgs.lib.nixosSystem {
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {inherit system username hostName;};
specialArgs = defaultSpecialArgs { inherit system; };
modules = defaultModules { inherit system username hostName; };
};
};
};

View file

@ -1 +1,4 @@
{...}: {imports = [./shell/default.nix];}
{ ... }:
{
imports = [ ./shell/default.nix ];
}

View file

@ -3,12 +3,13 @@
lib,
pkgs,
...
}: {
}:
{
imports = [
./personal.nix
./desktop/plasma/default.nix
];
home.packages = with pkgs; [prusa-slicer];
home.packages = with pkgs; [ prusa-slicer ];
programs.plasma = lib.mkIf config.programs.plasma.enable {
configFile.kcminputrc."Libinput/1739/52759/SYNA32AA:00 06CB:CE17 Touchpad".NaturalScroll = true;
};

View file

@ -1,8 +1,5 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
imports = [
./work.nix
./desktop/plasma/default.nix

View file

@ -1,8 +1,5 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
imports = [
./work.nix
./desktop/plasma/default.nix
@ -25,7 +22,8 @@
};
services.kanshi = lib.mkIf config.wayland.windowManager.sway.enable {
enable = true;
settings = let
settings =
let
laptopScreen = {
criteria = "eDP-1";
scale = 1.25;
@ -36,17 +34,21 @@
scale = 1.5;
position = "0,0";
};
in [
in
[
{
profile = {
name = "undocked";
outputs = [laptopScreen];
outputs = [ laptopScreen ];
};
}
{
profile = {
name = "docked";
outputs = [laptopScreen monitor];
outputs = [
laptopScreen
monitor
];
};
}
];

View file

@ -3,7 +3,8 @@
lib,
pkgs,
...
}: {
}:
{
imports = [
./personal.nix
./games/default.nix
@ -34,9 +35,7 @@
workspace = "1";
}
];
startup = [
{command = "${pkgs.xorg.xrandr}/bin/xrandr --output DP-1 --primary";}
];
startup = [ { command = "${pkgs.xorg.xrandr}/bin/xrandr --output DP-1 --primary"; } ];
};
};
}

View file

@ -1,8 +1,5 @@
{ config, fonts, ... }:
{
config,
fonts,
...
}: {
programs.alacritty = {
enable = true;
settings = {
@ -23,25 +20,30 @@
live_config_reload = true;
selection.save_to_clipboard = true;
mouse.hide_when_typing = true;
colors = let
mapColours = isBright: (builtins.listToAttrs (builtins.map (col: {
colors =
let
mapColours =
isBright:
(builtins.listToAttrs (
builtins.map
(col: {
# Alacritty uses Yellow instead of Orange for BASE09
name =
if col == "orange"
then "yellow"
else col;
value = "0x${config
.scheme
.${
if isBright
then "bright-${col}"
else col
}}";
name = if col == "orange" then "yellow" else col;
value = "0x${config.scheme.${if isBright then "bright-${col}" else col}}";
})
["red" "orange" "green" "cyan" "blue" "magenta"]));
[
"red"
"orange"
"green"
"cyan"
"blue"
"magenta"
]
));
mapNamedColours = mapColours false;
mapNamedBrightColours = mapColours true;
in {
in
{
draw_bold_text_with_bright_colors = false;
primary = with config.scheme; {
background = "0x${base00}";
@ -51,13 +53,15 @@
cursor = "0x${base05}";
text = "0x${base00}";
};
normal = with config.scheme;
normal =
with config.scheme;
{
black = "0x${base00-hex}";
white = "0x${base05-hex}";
}
// mapNamedColours;
bright = with config.scheme;
bright =
with config.scheme;
{
black = "0x${base03-hex}";
white = "0x${base07-hex}";

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./nyxt.nix
./firefox.nix

View file

@ -1,8 +1,9 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs = {
browserpass = {
enable = true;
browsers = ["firefox"];
browsers = [ "firefox" ];
};
firefox = {
enable = true;
@ -75,15 +76,21 @@
NoDefaultBookmarks = false;
OfferToSaveLogins = false;
PasswordManagerEnabled = false;
PDFjs = {Enabled = false;};
PDFjs = {
Enabled = false;
};
Permissions = {
Autoplay = {
Default = "block-audio-video";
};
};
PictureInPicture = {Enabled = true;};
PopupBlocking = {Default = true;};
RequestedLocales = ["en-GB"];
PictureInPicture = {
Enabled = true;
};
PopupBlocking = {
Default = true;
};
RequestedLocales = [ "en-GB" ];
SearchBar = "unified";
ShowHomeButton = true;
StartDownloadsInTempDirectory = true;
@ -131,37 +138,60 @@
default = "DuckDuckGo";
privateDefault = default;
force = true;
order = ["DuckDuckGo" "Atlas SearXNG"];
order = [
"DuckDuckGo"
"Atlas SearXNG"
];
engines = {
"Atlas SearXNG" = {
urls = [{template = "https://search.atlas.engineer/searxng/search?q={searchTerms}";}];
definedAliases = ["@atlas"];
urls = [ { template = "https://search.atlas.engineer/searxng/search?q={searchTerms}"; } ];
definedAliases = [ "@atlas" ];
};
"NixOS Wiki" = {
urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@nix" "@nixos" "@nixoswiki"];
definedAliases = [
"@nix"
"@nixos"
"@nixoswiki"
];
};
"Arch Wiki" = {
urls = [{template = "https://wiki.archlinux.org/index.php?search={searchTerms}";}];
definedAliases = ["@aw" "@arch" "@archwiki"];
urls = [ { template = "https://wiki.archlinux.org/index.php?search={searchTerms}"; } ];
definedAliases = [
"@aw"
"@arch"
"@archwiki"
];
};
"GitHub" = {
urls = [{template = "https://github.com/search?q={searchTerms}";}];
definedAliases = ["@gh" "@git" "@github"];
urls = [ { template = "https://github.com/search?q={searchTerms}"; } ];
definedAliases = [
"@gh"
"@git"
"@github"
];
};
"FlatHub" = {
url = [{template = "https://flathub.org/apps/search?q={searchTerms}";}];
definedAliases = ["@flat" "@fthub" "@flathub"];
url = [ { template = "https://flathub.org/apps/search?q={searchTerms}"; } ];
definedAliases = [
"@flat"
"@fthub"
"@flathub"
];
};
"NixOS Packages" = {
urls = [{template = "http://search.nixos.org/packages?channel=unstable&size=50&sort=relevance&type=packages&query={searchTerms}";}];
urls = [
{
template = "http://search.nixos.org/packages?channel=unstable&size=50&sort=relevance&type=packages&query={searchTerms}";
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@nixpkgs"];
definedAliases = [ "@nixpkgs" ];
};
"PyPI packages" = {
urls = [{template = "https://pypi.org/search/?q={searchTerms}";}];
definedAliases = ["@pypi"];
urls = [ { template = "https://pypi.org/search/?q={searchTerms}"; } ];
definedAliases = [ "@pypi" ];
};
};
};

View file

@ -1,9 +1,10 @@
{...}: {
{ ... }:
{
programs = {
browserpass.browsers = ["librewolf"];
browserpass.browsers = [ "librewolf" ];
librewolf = {
enable = true;
settings = {};
settings = { };
};
};
}

View file

@ -4,13 +4,16 @@
fonts,
accentColourName,
...
}: {
home.packages = [pkgs.nyxt];
}:
{
home.packages = [ pkgs.nyxt ];
xdg = {
configFile = {
"nyxt/config.lisp".text = let
"nyxt/config.lisp".text =
let
sc = config.scheme.withHashtag;
in ''
in
''
;; Import custom configuration
(nyxt::load-lisp "${./config.lisp}")
;; Define custom theme
@ -39,26 +42,30 @@
:on-codeblock-color "${sc.base05}"))))
'';
};
dataFile."nyxt/bookmarks.lisp".text = let
dataFile."nyxt/bookmarks.lisp".text =
let
# Make a string of lisp-style list of strings, from nix-style
# list
convertTags = tags: "(" + (builtins.foldl' (x: y: x + " \"" + y + "\"") "" tags) + " )";
# Take bookmarks as returned from JSON file and convert to NYXT
# expected format
convertBookmark = {
convertBookmark =
{
name,
tags,
url,
}: "(:url \"${url}\" :title \"${name}\" :tags ${convertTags tags})\n";
in (
}:
"(:url \"${url}\" :title \"${name}\" :tags ${convertTags tags})\n";
in
(
# Fold all entries in bookmarks.json into single string of NYXT
# format bookmarks, each entry on a new line and with 2 space
# indentation, just for visual clarity if reading the outputted
# file
"(\n"
+ (builtins.foldl'
(x: y: x + " " + convertBookmark y) ""
(builtins.fromJSON (builtins.readFile ./bookmarks.json)))
+ (builtins.foldl' (x: y: x + " " + convertBookmark y) "" (
builtins.fromJSON (builtins.readFile ./bookmarks.json)
))
+ ")"
);
};

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
# Programs
./desktop/default.nix
@ -28,7 +29,7 @@
followSystemTheme = true;
notificationMethod = "electron";
optInTeamsV2 = true;
spellCheckerLanguages = ["en_GB"];
spellCheckerLanguages = [ "en_GB" ];
};
};
}

View file

@ -1,8 +1,6 @@
{
scheme,
accentColourName,
}:
with scheme.withHashtag; ''
{ scheme, accentColourName }:
with scheme.withHashtag;
''
@define-color accent_color ${scheme.withHashtag."${accentColourName}-hex"};
@define-color accent_bg_color ${scheme.withHashtag."${accentColourName}-hex"};
@define-color accent_fg_color ${base00-hex};

View file

@ -1,15 +1,11 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
home = {
pointerCursor = let
name =
if config.scheme.variant == "light"
then "volantes_cursors"
else "volantes_light_cursors";
in {
pointerCursor =
let
name = if config.scheme.variant == "light" then "volantes_cursors" else "volantes_light_cursors";
in
{
inherit name;
package = pkgs.volantes-cursors;
size = 32;
@ -24,9 +20,11 @@
programs.mpv.enable = true;
xdg = {
mime.enable = true;
mimeApps = let
mimeApps =
let
defaultApplications = import ./mimeapps.nix;
in {
in
{
enable = true;
inherit defaultApplications;
associations = {

View file

@ -1,11 +1,13 @@
lib: string:
with lib; let
chars = let
with lib;
let
chars =
let
lc = strings.splitString "" string;
in (lists.sublist 1 (lists.length lc - 2) lc);
in (
strings.concatStringsSep "" (
in
(lists.sublist 1 (lists.length lc - 2) lc);
in
(strings.concatStringsSep "" (
(lists.singleton (strings.toUpper (lists.elemAt chars 0)))
++ (lists.sublist 1 (lists.length chars) chars)
)
)
))

View file

@ -1,13 +1,21 @@
let
emacs = ["emacsclient.desktop" "emacs.desktop"];
browser = ["firefox.desktop" "librewolf.desktop" "nyxt.desktop"];
in {
"inode/directory" = ["thunar.desktop"];
"inode/symlink" = ["thunar.desktop"];
emacs = [
"emacsclient.desktop"
"emacs.desktop"
];
browser = [
"firefox.desktop"
"librewolf.desktop"
"nyxt.desktop"
];
in
{
"inode/directory" = [ "thunar.desktop" ];
"inode/symlink" = [ "thunar.desktop" ];
"image/jpeg" = ["swayimg.desktop"];
"image/png" = ["swayimg.desktop"];
"video/mp4" = ["mpv.desktop"];
"image/jpeg" = [ "swayimg.desktop" ];
"image/png" = [ "swayimg.desktop" ];
"video/mp4" = [ "mpv.desktop" ];
"text/plain" = emacs;
"text/richtext" = emacs;
@ -44,10 +52,10 @@ in {
"application/x-docbook+xml" = emacs;
"application/x-yaml" = emacs;
"application/pdf" = ["evince.desktop"];
"application/epub+zip" = ["evince.desktop"];
"application/msword" = ["writer.desktop"];
"application/zip" = ["xarchiver.desktop"];
"application/pdf" = [ "evince.desktop" ];
"application/epub+zip" = [ "evince.desktop" ];
"application/msword" = [ "writer.desktop" ];
"application/zip" = [ "xarchiver.desktop" ];
"application/x-extension-htm" = browser;
"application/x-extension-html" = browser;
@ -55,23 +63,23 @@ in {
"application/x-extension-xhtml" = browser;
"application/x-extension-xht" = browser;
"application/x-mozilla-bookmarks" = browser;
"application/x-zoom" = ["Zoom.desktop"] ++ browser;
"application/x-zoom" = [ "Zoom.desktop" ] ++ browser;
"x-scheme-handler/http" = browser;
"x-scheme-handler/https" = browser;
"x-scheme-handler/about" = browser;
"x-scheme-handler/chrome" = browser;
"x-scheme-handler/webcal" = browser;
"x-scheme-handler/geo" = ["openstreetmap-geo-handler.desktop"];
"x-scheme-handler/mailto" = ["emacsclient-mail.desktop"];
"x-scheme-handler/geo" = [ "openstreetmap-geo-handler.desktop" ];
"x-scheme-handler/mailto" = [ "emacsclient-mail.desktop" ];
"x-scheme-handler/unknown" = emacs;
"x-scheme-handler/prusaslicer" = ["PrusaSlicerURLProtocol.desktop"];
"x-scheme-handler/prusaslicer" = [ "PrusaSlicerURLProtocol.desktop" ];
"x-scheme-handler/ms-word" = ["writer.desktop"];
"x-scheme-handler/ms-powerpoint" = ["impress.desktop"];
"x-scheme-handler/ms-excel" = ["calc.desktop"];
"x-scheme-handler/msteams" = ["teams-for-linux.desktop"] ++ browser;
"x-scheme-handler/ms-word" = [ "writer.desktop" ];
"x-scheme-handler/ms-powerpoint" = [ "impress.desktop" ];
"x-scheme-handler/ms-excel" = [ "calc.desktop" ];
"x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ] ++ browser;
"x-scheme-handler/zoomus" = browser;
"x-scheme-handler/zoommtg" = browser;
}

View file

@ -7,25 +7,28 @@
rc2nix,
accentColourName,
...
}: {
}:
{
imports = [
inputs.plasma-manager.homeManagerModules.plasma-manager
../default.nix
./konsole.nix
];
home.packages = with pkgs; [
home.packages = [
rc2nix
wl-clipboard
(papirus-icon-theme.override {color = "violet";})
pkgs.wl-clipboard
(pkgs.papirus-icon-theme.override { color = "violet"; })
];
services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
programs.plasma = {
enable = true;
overrideConfig = true;
workspace = let
workspace =
let
toCapital = import ../lib/to_capital.nix lib;
in {
in
{
clickItemTo = "open";
theme = "default";
colorScheme = "Breeze${toCapital config.scheme.variant}";
@ -41,7 +44,8 @@
wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
};
fonts = let
fonts =
let
general = {
family = fonts.sansSerif.name;
pointSize = 12;
@ -54,7 +58,8 @@
family = fonts.monospace.name;
pointSize = 12;
};
in {
in
{
inherit general small fixedWidth;
menu = general;
toolbar = general;
@ -103,14 +108,6 @@
];
};
}
{
name = "org.kde.plasma.pager";
config.General = {
showWindowIcons = "true";
showOnlyCurrentScreen = "false";
wrapPage = "true";
};
}
"org.kde.plasma.cameraindicator"
{
systemTray = {
@ -149,7 +146,10 @@
shortcuts = {
ksmserver = {
"Lock Session" = ["Screensaver" "Meta+Alt+L"];
"Lock Session" = [
"Screensaver"
"Meta+Alt+L"
];
};
kwin = {
"Walk Through Windows of Current Application" = "Alt+`";
@ -162,9 +162,13 @@
"Switch Window Up" = "Meta+K";
"Invert" = "Meta+Ctrl+I";
"InvertWindow" = "Meta+Ctrl+U";
"Invert Screen Colors" = [];
"Invert Screen Colors" = [ ];
};
"services/org.kde.krunner.desktop"."_launch" = ["Meta+Space" "Search" "Alt+F2"];
"services/org.kde.krunner.desktop"."_launch" = [
"Meta+Space"
"Search"
"Alt+F2"
];
};
kwin = {
@ -184,17 +188,6 @@
baloofilerc."Basic Settings"."Indexing-Enabled" = false;
bluedevilglobalrc.Global.launchState.value = "disable";
kcminputrc.Keyboard.NumLock = 1;
# powerdevilrc = {
# AC = {
# Display = {
# TurnOffDisplayIdleTimeoutSec = "1800";
# TurnOffDisplayIdleTimeoutWhenLockedSec = "120";
# };
# SuspendAndShutdown = {
# AutoSuspendIdleTimeoutSec = "3600";
# };
# };
# };
plasmanotifyrc = {
Notifications = {
NormalAlwaysOnTop = true;
@ -219,13 +212,17 @@
};
};
kdeglobals = {
General = let
AccentColor = let
General =
let
AccentColor =
let
r = config.scheme."${accentColourName}-rgb-r";
g = config.scheme."${accentColourName}-rgb-g";
b = config.scheme."${accentColourName}-rgb-b";
in "${r}, ${g}, ${b}";
in {
in
"${r}, ${g}, ${b}";
in
{
inherit AccentColor;
LastUsedCustomAccentColor = AccentColor;
TerminalApplication = "konsole";

View file

@ -1,4 +1,5 @@
{fonts, ...}: {
{ fonts, ... }:
{
programs.konsole = {
enable = true;
defaultProfile = "One-Light";

View file

@ -1,14 +1,14 @@
{ config, accentColourName, ... }:
{
config,
accentColourName,
...
}: {
services.avizo = {
enable = true;
settings.default = let
settings.default =
let
sc = config.scheme;
rgba = colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
in {
rgba =
colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
in
{
background = "rgba(${rgba "base00"}, 0.9)";
bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
bar-fg-color = "rgba(${rgba "base05"}, 1.0)";

View file

@ -5,11 +5,13 @@
fonts,
accentColourName,
...
}: let
}:
let
set-background = pkgs.writeShellScriptBin "set-background" ''
${pkgs.swaybg}/bin/swaybg -m fill -i ${../wallpapers/landscapes/tropic_island_day.jpg}
'';
in {
in
{
imports = [
../default.nix
./avizo/default.nix
@ -64,24 +66,26 @@ in {
tray = "never";
};
};
gtk = let
gtk =
let
toCapital = import ../lib/to_capital.nix lib;
in {
in
{
enable = true;
theme = {
package = pkgs.materia-theme;
name = "Materia-${config.scheme.variant}";
};
iconTheme = {
package = pkgs.papirus-icon-theme.override {color = "violet";};
package = pkgs.papirus-icon-theme.override { color = "violet"; };
name = "Papirus-${toCapital config.scheme.variant}";
};
};
wayland.windowManager.sway = {
enable = true;
package =
pkgs.swayfx.overrideAttrs
(old: {passthru.providedSessions = ["sway"];});
package = pkgs.swayfx.overrideAttrs (old: {
passthru.providedSessions = [ "sway" ];
});
swaynag.enable = true;
systemd.enable = true;
xwayland = true;
@ -106,51 +110,81 @@ in {
terminal = "${config.programs.alacritty.package}/bin/alacritty";
menu = "${config.programs.fuzzel.package}/bin/fuzzel";
workspaceAutoBackAndForth = true;
bars = [];
bars = [ ];
gaps = {
inner = 5;
outer = 0;
};
fonts = {
names = [fonts.monospace.name];
names = [ fonts.monospace.name ];
style = "regular";
size = fonts.sizes.desktop * 1.0;
};
colors = let
colors =
let
sc = config.scheme.withHashtag;
text = toString sc.base05;
indicator = toString sc.${accentColourName};
background = toString sc.base00;
in {
in
{
inherit background;
focused = let
focused =
let
border = toString sc.${accentColourName};
in {
inherit background text indicator border;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
focusedInactive = let
focusedInactive =
let
border = toString sc.base04;
in {
inherit background text indicator border;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
unfocused = let
unfocused =
let
border = toString sc.base03;
in {
inherit background text indicator border;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
urgent = let
urgent =
let
border = toString sc.red;
in {
inherit background text indicator border;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
};
startup = [
{command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";}
{command = "${set-background}/bin/set-background";}
{ command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; }
{ command = "${set-background}/bin/set-background"; }
];
window = {
border = 1;
@ -187,7 +221,9 @@ in {
];
};
floating.border = 1;
keybindings = with config; let
keybindings =
with config;
let
modifier = wayland.windowManager.sway.config.modifier;
in
lib.mkOptionDefault {

View file

@ -1,8 +1,5 @@
{ config, fonts, ... }:
{
config,
fonts,
...
}: {
programs.foot = {
enable = true;
server.enable = true;
@ -19,8 +16,12 @@
notify = false;
visual = false;
};
cursor = {blink = true;};
mouse = {hide-when-typing = true;};
cursor = {
blink = true;
};
mouse = {
hide-when-typing = true;
};
colors = with config.scheme; rec {
alpha = 0.85;
background = base00;

View file

@ -4,7 +4,8 @@
fonts,
accentColourName,
...
}: {
}:
{
programs.fuzzel = {
enable = true;
settings = {
@ -16,19 +17,19 @@
fields = "filename,name,generic,categories";
fuzzy = true;
filter-desktop = true;
terminal = with config.programs; "${
if alacritty.enable
then alacritty.package
else pkgs.alacritty
}/bin/alacritty -e";
terminal =
with config.programs;
"${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty -e";
lines = 24;
width = 80;
tabs = 4;
layer = "overlay";
};
colors = let
colors =
let
sc = config.scheme;
in {
in
{
background = "${sc.base00}cc"; # 80% Opacity
text = "${sc.base05}ff";
match = "${sc.red}ff";

View file

@ -3,10 +3,13 @@
fonts,
accentColourName,
...
}: {
services.mako = let
}:
{
services.mako =
let
sc = config.scheme.withHashtag;
in {
in
{
enable = true;
anchor = "top-right";
font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";

View file

@ -4,18 +4,17 @@
fonts,
accentColourName,
...
}: {
}:
{
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
terminal = with config.programs; "${
if alacritty.enable
then alacritty.package
else pkgs.alacritty
}/bin/alacritty";
terminal =
with config.programs;
"${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty";
font = fonts.monospace.name;
location = "center";
plugins = with pkgs; [rofi-emoji];
plugins = with pkgs; [ rofi-emoji ];
extraConfig = {
modi = "run,drun,ssh,window,emoji,combi";
combi-modi = "drun,ssh,window,emoji";
@ -36,7 +35,9 @@
display-emoji = " 󰞅 Emoji ";
display-combi = " 󰛡 Combi ";
};
theme = with builtins; let
theme =
with builtins;
let
inherit (config.lib.formats.rasi) mkLiteral;
sc = config.scheme;
bg = mkLiteral "rgba (${sc.base00-rgb-r}, ${sc.base00-rgb-g}, ${sc.base00-rgb-b}, 80%)";
@ -45,7 +46,8 @@
fg2 = mkLiteral sc.withHashtag.base04;
border = mkLiteral sc.withHashtag.${accentColour};
blue = mkLiteral sc.withHashtag.blue;
in {
in
{
"*" = {
background-color = mkLiteral "transparent";
text-color = fg;
@ -62,7 +64,10 @@
};
inputbar = {
children = map mkLiteral ["prompt" "entry"];
children = map mkLiteral [
"prompt"
"entry"
];
padding = mkLiteral "2px";
};

View file

@ -1,14 +1,13 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [../swaylock/default.nix];
services.swayidle = let
swaylockfx =
pkgs.callPackage ../swaylock/swaylockfx.nix
{swaylock-effects = config.programs.swaylock.package;};
in {
imports = [ ../swaylock/default.nix ];
services.swayidle =
let
swaylockfx = pkgs.callPackage ../swaylock/swaylockfx.nix {
swaylock-effects = config.programs.swaylock.package;
};
in
{
enable = true;
timeouts = [
{

View file

@ -3,18 +3,20 @@
pkgs,
accentColourName,
...
}: {
}:
{
home.packages = with pkgs; [
(callPackage ./swaylockfx.nix
{swaylock-effects = config.programs.swaylock.package;})
(callPackage ./swaylockfx.nix { swaylock-effects = config.programs.swaylock.package; })
];
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
# Settings are specifically for swaylock-effects
settings = let
settings =
let
sc = config.scheme;
in {
in
{
indicator-radius = 100;
indicator-thickness = 10;
indicator-caps-lock = true;

View file

@ -1,6 +1,2 @@
{
writeShellScriptBin,
swaylock-effects,
...
}:
{ writeShellScriptBin, swaylock-effects, ... }:
writeShellScriptBin "swaylockfx" "${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"

View file

@ -4,13 +4,16 @@
fonts,
accentColourName,
...
}: {
home.packages = [pkgs.swaynotificationcenter];
xdg.configFile."swaync/style.css".text = let
}:
{
home.packages = [ pkgs.swaynotificationcenter ];
xdg.configFile."swaync/style.css".text =
let
sc = config.scheme.withHashtag;
alpha = "0.85";
alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})";
in ''
in
''
* {
all: unset;
font-size: 1.2rem;

View file

@ -4,10 +4,11 @@
fonts,
accentColourName,
...
}: {
}:
{
systemd.user.targets.tray.Unit = {
Description = "Home Manager System Tray";
Requires = ["graphical-session.target"];
Requires = [ "graphical-session.target" ];
};
programs.waybar = {
enable = true;
@ -21,7 +22,7 @@
"sway/workspaces"
"sway/window"
];
"modules-center" = [];
"modules-center" = [ ];
"modules-right" = [
"mpris"
"custom/notification"
@ -50,12 +51,12 @@
};
all-outputs = false;
persistent-workspaces = {
"1" = [];
"2" = [];
"3" = [];
"4" = [];
"5" = [];
"6" = [];
"1" = [ ];
"2" = [ ];
"3" = [ ];
"4" = [ ];
"5" = [ ];
"6" = [ ];
};
};
"sway/window" = {
@ -105,7 +106,7 @@
"paused" = "󰏤";
"stopped" = "󰓛";
};
"ignored-players" = [];
"ignored-players" = [ ];
};
pulseaudio = {
scroll-step = 5;
@ -115,7 +116,11 @@
format-source-muted = "󰍭 ";
format-icons = {
car = "󰄍 ";
default = ["󰕿 " "󰖀 " "󰕾 "];
default = [
"󰕿 "
"󰖀 "
"󰕾 "
];
hands-free = "󰥰 ";
headset = "󰋎 ";
phone = "󰏲 ";
@ -135,14 +140,25 @@
format = "󰻠 {usage}%";
tooltip = false;
};
memory = {format = "󰍛 {}%";};
memory = {
format = "󰍛 {}%";
};
temperature = {
critical-threshold = 80;
format = "{icon} {temperatureC}°C";
format-icons = ["󱃃" "󰔏" "󱃂"];
format-icons = [
"󱃃"
"󰔏"
"󱃂"
];
};
network = {
format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
format-icons = [
"󰤟 "
"󰤢 "
"󰤥 "
"󰤨 "
];
format-wifi = "{icon}";
format-ethernet = "󰈁 ";
format-linked = "󰈂 ";
@ -167,9 +183,11 @@
mode-mon-col = 3;
weeks-pos = "left";
on-scroll = 1;
format = let
format =
let
sc = config.scheme.withHashtag;
in {
in
{
months = "<span color='${sc.red}'><b>{}</b></span>";
weeks = "<span color='${sc.cyan}'><b>W{}</b></span>";
weekdays = "<span color='${sc.orange}'><b>{}</b></span>";
@ -186,7 +204,17 @@
backlight = {
format = "{icon}";
tooltip-format = "{percent}%";
format-icons = [" " " " " " " " " " " " " " " " " "];
format-icons = [
" "
" "
" "
" "
" "
" "
" "
" "
" "
];
};
battery = {
states = {
@ -197,11 +225,25 @@
format-charging = "󰂄 ";
format-plugged = "󰚥 ";
tooltip-format = "{capacity}% {time}";
format-icons = ["󱃍 " "󰁺 " "󰁻 " "󰁼 " "󰁽 " "󰁾 " "󰁿 " "󰂀 " "󰂁 " "󰂂 " "󰁹 "];
format-icons = [
"󱃍 "
"󰁺 "
"󰁻 "
"󰁼 "
"󰁽 "
"󰁾 "
"󰁿 "
"󰂀 "
"󰂁 "
"󰂂 "
"󰁹 "
];
};
"custom/notification" = let
"custom/notification" =
let
swaync = pkgs.swaynotificationcenter;
in {
in
{
tooltip = false;
format = "{icon}{}";
format-icons = {
@ -221,10 +263,12 @@
on-click-right = "${swaync}/bin/swaync-client -d -sw";
escape = true;
};
"custom/weather" = let
"custom/weather" =
let
date-format = "%Y-%m-%d";
custom-indicator = "{ICON}{temp_C}({FeelsLikeC})";
in {
in
{
format = "{}°";
tooltip = true;
interval = 900; # Every 15 minutes
@ -237,10 +281,12 @@
spacing = 5;
};
};
style = let
style =
let
sc = config.scheme.withHashtag;
alpha = "0.85";
in ''
in
''
* {
all: unset;
font-size: ${toString fonts.sizes.popups}px;

View file

@ -1,8 +1,5 @@
{ config, fonts, ... }:
{
config,
fonts,
...
}: {
programs.wlogout = {
enable = true;
layout = [
@ -25,12 +22,14 @@
keybind = "l";
}
];
style = let
style =
let
sc = config.scheme.withHashtag;
shutdownIcon = ./icons/shutdown.png;
rebootIcon = ./icons/reboot.png;
logoutIcon = ./icons/logout.png;
in ''
in
''
* {
font-size: ${toString fonts.sizes.popups}px;
font-family: "${fonts.sansSerif.name}";

View file

@ -1,5 +1,4 @@
epkgs:
with epkgs; [
epkgs: with epkgs; [
# UI
base16-theme
all-the-icons

View file

@ -14,9 +14,11 @@ buildLuarocksPackage {
(fetchurl {
url = "mirror://luarocks/graph-toolkit-scm-1.rockspec";
sha256 = "0hsrf7k45w8ri18mdrx44mv1kr4zfr5mg76cxi8nnr30ssrblvgb";
})
.outPath;
src = fetchgit (removeAttrs (builtins.fromJSON '' {
}).outPath;
src = fetchgit (
removeAttrs
(builtins.fromJSON ''
{
"url": "https://github.com/franko/graph-toolkit",
"rev": "126a11bdbb98faf785c373516a288b7fa609f824",
"date": "2015-01-02T08:44:01-08:00",
@ -28,10 +30,20 @@ buildLuarocksPackage {
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path" "sha256"]);
'')
[
"date"
"path"
"sha256"
]
);
disabled = luaOlder "5.1";
propagatedBuildInputs = [lua agg freetype];
propagatedBuildInputs = [
lua
agg
freetype
];
meta = {
homepage = "http://franko.github.io/graph-toolkit/";

View file

@ -6,29 +6,33 @@
callPackage,
luajit,
openblas,
}: let
xsys = callPackage ./xsys.nix {};
}:
let
xsys = callPackage ./xsys.nix { };
in
buildLuarocksPackage {
buildLuarocksPackage {
pname = "sci";
version = "1.0.0.beta12-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/sci-1.0.0.beta12-1.rockspec";
sha256 = "0lprn9x4zw767hdz8lyxmwrrfyn5xj3x50pm9b4qiwy8992mg00r";
})
.outPath;
}).outPath;
src = fetchurl {
url = "https://github.com/stepelu/lua-sci/archive/v1.0.0-beta12.tar.gz";
sha256 = "0a45r7n13gfqckpdp1bmizqvjadn8nc5d6ff9gjw860g3i75sy2h";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [luajit xsys openblas];
propagatedBuildInputs = [
luajit
xsys
openblas
];
meta = {
homepage = "https://github.com/stepelu/lua-sci";
description = "Scientific Computing with LuaJIT";
license.fullName = "MIT";
};
}
}

View file

@ -12,15 +12,14 @@ buildLuarocksPackage {
(fetchurl {
url = "mirror://luarocks/xsys-1.0.2-1.rockspec";
sha256 = "0jlyrwbzh6fi68msdynp4bbihyww4i3yk0qh859xlwqhfy5cza7p";
})
.outPath;
}).outPath;
src = fetchurl {
url = "https://github.com/stepelu/lua-xsys/archive/v1.0.2.tar.gz";
sha256 = "1zwrlp6bghq8c12kyqc1ic7mrn8lf3d42755h8q2wxwhy1i3xqyh";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [luajit];
propagatedBuildInputs = [ luajit ];
meta = {
homepage = "http://scilua.org/xsys.html";

View file

@ -1,10 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home.packages = with pkgs; [
prismlauncher
cartridges
(lutris.override {
steamSupport = false;
extraPkgs = pkgs: with pkgs; [wineWowPackages.waylandFull];
extraPkgs = pkgs: with pkgs; [ wineWowPackages.waylandFull ];
})
];
}

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
imports = [./default.nix];
{ pkgs, ... }:
{
imports = [ ./default.nix ];
home.packages = with pkgs; [
kdePackages.ktorrent
prusa-slicer

View file

@ -1,12 +1,10 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home = {
packages = [
(pkgs.writeShellScriptBin "git-sync-all"
(builtins.readFile ./shell/git-sync-all.sh))
(pkgs.writeShellScriptBin "rsync-local-config"
(builtins.readFile ./shell/rsync-local-config.sh))
(pkgs.writeShellScriptBin "xdg-query-program"
(builtins.readFile ./shell/xdg-query-program.sh))
(pkgs.writeShellScriptBin "git-sync-all" (builtins.readFile ./shell/git-sync-all.sh))
(pkgs.writeShellScriptBin "rsync-local-config" (builtins.readFile ./shell/rsync-local-config.sh))
(pkgs.writeShellScriptBin "xdg-query-program" (builtins.readFile ./shell/xdg-query-program.sh))
];
shellAliases = {
gsa = "git-sync-all";

View file

@ -1,2 +1,2 @@
pkgs: (pkgs.writeShellScriptBin "ukaea-vpn-connect"
"sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")
pkgs:
(pkgs.writeShellScriptBin "ukaea-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")

View file

@ -1,12 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
home.packages = with pkgs; [
protonmail-bridge-gui
(writeShellScriptBin "mbsync-ensure-pass"
(builtins.readFile ./mbsync-ensure-pass.sh))
(writeShellScriptBin "mbsync-ensure-pass" (builtins.readFile ./mbsync-ensure-pass.sh))
(writeShellScriptBin "davmail-setup" ''
systemctl --user restart davmail # Ensure config file is present
systemctl --user stop davmail
@ -19,14 +15,18 @@
};
accounts.email = {
maildirBasePath = "Mail";
accounts = let
accounts =
let
realName = "Evie Litherland-Smith";
in {
proton = let
in
{
proton =
let
address = "e.litherlandsmith@proton.me";
host = "127.0.0.1";
tls.enable = false;
in {
in
{
inherit realName address;
primary = true;
maildir.path = "Proton";
@ -38,7 +38,10 @@
inherit host tls;
port = 1025;
};
aliases = ["evie@xenia.me.uk" "evie@litherlandsmith.slmail.me"];
aliases = [
"evie@xenia.me.uk"
"evie@litherlandsmith.slmail.me"
];
userName = address;
passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup email ${address}";
mu.enable = true;
@ -54,14 +57,22 @@
create = "both";
expunge = "both";
remove = "both";
patterns = ["*" "!All Mail" "!Labels*" "!Starred" "!Recovered Messages"];
patterns = [
"*"
"!All Mail"
"!Labels*"
"!Starred"
"!Recovered Messages"
];
subFolders = "Verbatim";
extraConfig.account.AuthMechs = "LOGIN";
};
};
icloud = let
icloud =
let
address = "e.litherlandsmith@icloud.com";
in {
in
{
inherit realName address;
primary = false;
maildir.path = "iCloud";
@ -76,15 +87,20 @@
create = "both";
expunge = "both";
remove = "both";
patterns = ["*" "!Notes"];
patterns = [
"*"
"!Notes"
];
subFolders = "Verbatim";
};
};
outlook = let
outlook =
let
address = "evie.litherland-smith@ukaea.uk";
host = "127.0.0.1";
tls.enable = false;
in {
in
{
inherit realName address;
primary = false;
maildir.path = "Outlook";
@ -96,7 +112,7 @@
inherit host tls;
port = 1026;
};
aliases = ["elitherl@jet.uk"];
aliases = [ "elitherl@jet.uk" ];
userName = address;
passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup email ${address}";
mu.enable = true;
@ -132,26 +148,26 @@
mbsync = {
enable = true;
groups.inboxes = {
proton = ["INBOX"];
icloud = ["INBOX"];
outlook = ["INBOX"];
proton = [ "INBOX" ];
icloud = [ "INBOX" ];
outlook = [ "INBOX" ];
};
};
};
systemd.user.services.davmail = {
Unit = {
Description = "Davmail server";
Wants = ["network-online.target"];
After = ["network-online.target"];
Wants = [ "network-online.target" ];
After = [ "network-online.target" ];
};
Service = {
Environment = ["PATH=/run/current-system/sw/bin/:$PATH"];
Environment = [ "PATH=/run/current-system/sw/bin/:$PATH" ];
Restart = "always";
ExecStartPre = with config.home; ''
/bin/sh -c "if [ ! -f ${homeDirectory}/.davmail.properties ]; then cp ${./davmail.properties} ${homeDirectory}/.davmail.properties; fi; chmod 644 ${homeDirectory}/.davmail.properties"
'';
ExecStart = "${pkgs.davmail}/bin/davmail -notray ${config.home.homeDirectory}/.davmail.properties";
};
Install.WantedBy = ["default.target"];
Install.WantedBy = [ "default.target" ];
};
}

View file

@ -3,16 +3,19 @@
lib,
pkgs,
...
}: {
xdg.configFile."pass-git-helper/git-pass-mapping.ini".source =
./git-pass-mapping.ini;
}:
{
xdg.configFile."pass-git-helper/git-pass-mapping.ini".source = ./git-pass-mapping.ini;
programs = {
gpg.enable = true;
password-store = {
enable = true;
package =
pkgs.pass-nodmenu.withExtensions
(exts: with exts; [pass-update pass-import]); # pass-audit
package = pkgs.pass-nodmenu.withExtensions (
exts: with exts; [
pass-update
pass-import
]
); # pass-audit
settings = {
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
PASSWORD_STORE_ENABLE_EXTENSIONS = "true";

View file

@ -1,8 +1,5 @@
{ config, accentColourName, ... }:
{
config,
accentColourName,
...
}: {
programs.bottom = {
enable = true;
settings = {
@ -13,10 +10,19 @@
enable_gpu = true;
enable_cache_memory = true;
};
colors = let
colors =
let
sc = config.scheme.withHashtag;
rainbow = with sc; [red yellow green cyan blue magenta];
in {
rainbow = with sc; [
red
yellow
green
cyan
blue
magenta
];
in
{
table_header_color = sc.base05;
all_cpu_color = sc.base05;
avg_cpu_color = sc.base05;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
./bottom.nix
./fastfetch.nix
@ -28,7 +29,7 @@
enable = true;
git = true;
icons = true;
extraOptions = ["--octal-permissions"];
extraOptions = [ "--octal-permissions" ];
};
direnv = {
enable = true;

View file

@ -1,6 +1,7 @@
{...}: {
{ ... }:
{
programs.fastfetch = {
enable = true;
settings = {};
settings = { };
};
}

View file

@ -3,14 +3,17 @@
lib,
pkgs,
...
}: {
}:
{
services.git-sync.enable = false; # Can't find pass for some reason...
programs.git = let
programs.git =
let
package = pkgs.git.override {
withLibsecret = true;
withSsh = true;
};
in {
in
{
inherit package;
enable = true;
userName = "Evie Litherland-Smith";
@ -29,11 +32,17 @@
"*.gpg filter=gpg diff=gpg"
"*.asc filter=gpg diff=gpg"
];
extraConfig = let
extraConfig =
let
user = "pixelifytica";
in {
github = {inherit user;};
gitea = {inherit user;};
in
{
github = {
inherit user;
};
gitea = {
inherit user;
};
pull.rebase = false;
init.defaultBranch = "main";
merge.conflictstyle = "diff3";

View file

@ -1,7 +1,7 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home.packages = with pkgs; [
(writeShellScriptBin "ssh-keygen-defaults"
''ssh-keygen -t ed25519 -C "$(whoami)@$(hostname)"'')
(writeShellScriptBin "ssh-keygen-defaults" ''ssh-keygen -t ed25519 -C "$(whoami)@$(hostname)"'')
];
programs.ssh = {
enable = true;

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
programs.starship = {
enable = true;
enableTransience = false;
@ -15,17 +16,24 @@
fish_style_pwd_dir_length = 1;
truncate_to_repo = false;
};
direnv = {disabled = false;};
direnv = {
disabled = false;
};
git_branch = {
only_attached = true;
ignore_branches = ["master" "main"];
ignore_branches = [
"master"
"main"
];
};
git_commit = {
format = "[ $hash | $tag]($style) ";
tag_symbol = " ";
tag_disabled = false;
};
git_metrics = {disabled = false;};
git_metrics = {
disabled = false;
};
git_status = {
stashed = " ";
ahead = " ";
@ -44,10 +52,18 @@
ssh_only = false;
ssh_symbol = "󰢹 ";
};
jobs = {symbol = "󰈏 ";};
line_break = {disabled = false;};
localip = {disabled = false;};
memory_usage = {disabled = false;};
jobs = {
symbol = "󰈏 ";
};
line_break = {
disabled = false;
};
localip = {
disabled = false;
};
memory_usage = {
disabled = false;
};
os = {
disabled = false;
format = "on [$symbol]($style) ";
@ -69,7 +85,9 @@
map_symbol = true;
pipestatus = true;
};
sudo = {disabled = false;};
sudo = {
disabled = false;
};
};
};
}

View file

@ -1,13 +1,18 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
programs.zellij = {
enable = true;
settings = {
themes.base16 = with config.scheme.withHashtag; rec {
inherit red green yellow blue magenta cyan orange;
inherit
red
green
yellow
blue
magenta
cyan
orange
;
black = base00;
bg = black;
white = base05;

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
programs.zsh = {
enable = true;
enableCompletion = true;
@ -7,7 +8,10 @@
defaultKeymap = "emacs";
syntaxHighlighting = {
enable = true;
highlighters = ["brackets" "cursor"];
highlighters = [
"brackets"
"cursor"
];
};
historySubstringSearch.enable = true;
history = {

View file

@ -1,6 +1,9 @@
{pkgs, ...}: {
home.packages = with pkgs;
with kdePackages; [
{ pkgs, ... }:
{
home.packages =
with pkgs;
with kdePackages;
[
helvum
kdenlive
krita

View file

@ -3,8 +3,9 @@
lib,
pkgs,
...
}: {
imports = [./default.nix];
}:
{
imports = [ ./default.nix ];
home.packages = with pkgs; [
twinkle
(import ./scripts/ukaea-vpn.nix pkgs)

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./services/caddy.nix
./services/forgejo.nix

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./laptop.nix
./desktop/plasma.nix

View file

@ -1,9 +1,12 @@
{pkgs, ...}: {
imports = [./desktop/plasma.nix];
{ pkgs, ... }:
{
imports = [ ./desktop/plasma.nix ];
boot = {
loader.efi.efiSysMountPoint = "/boot/efi";
initrd = {
secrets = {"/crypto_keyfile.bin" = null;};
secrets = {
"/crypto_keyfile.bin" = null;
};
luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb" = {
device = "/dev/disk/by-uuid/47d34268-5100-4eba-b34d-220f4239c1cb";
keyFile = "/crypto_keyfile.bin";
@ -14,6 +17,9 @@
etc."ppp/options".text = ''
ipcp-accept-remote
'';
systemPackages = with pkgs; [openfortivpn samba];
systemPackages = with pkgs; [
openfortivpn
samba
];
};
}

View file

@ -1,10 +1,13 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
./laptop.nix
./desktop/plasma.nix
];
boot.initrd = {
secrets = {"/crypto_keyfile.bin" = null;};
secrets = {
"/crypto_keyfile.bin" = null;
};
luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd" = {
device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd";
keyFile = "/crypto_keyfile.bin";
@ -14,7 +17,7 @@
etc."ppp/options".text = ''
ipcp-accept-remote
'';
systemPackages = with pkgs; [openfortivpn];
systemPackages = with pkgs; [ openfortivpn ];
};
services = {
samba.enable = true;

View file

@ -1,8 +1,9 @@
{config, ...}: {
imports = [./desktop/plasma.nix];
{ config, ... }:
{
imports = [ ./desktop/plasma.nix ];
boot = {
initrd.kernelModules = ["amdgpu"];
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
initrd.kernelModules = [ "amdgpu" ];
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
'';

View file

@ -3,14 +3,18 @@
pkgs,
iosevkaCustom,
...
}: {
}:
{
nix = {
enable = true;
settings = {
cores = 0;
max-jobs = "auto";
trusted-users = ["root"];
experimental-features = ["nix-command" "flakes"];
trusted-users = [ "root" ];
experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true;
};
channel.enable = true;
@ -64,7 +68,7 @@
networking = {
networkmanager.enable = true;
firewall.enable = true;
nameservers = ["9.9.9.9"];
nameservers = [ "9.9.9.9" ];
};
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
@ -72,7 +76,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPypUUGVAdpl0SHrUDVw0RureuFNsljrXQvrf0uc055 pixelifytica@Northstar"
];
environment = {
pathsToLink = ["/share/zsh"];
pathsToLink = [ "/share/zsh" ];
sessionVariables = {
XDG_CONFIG_HOME = "$HOME/.config";
XDG_CACHE_HOME = "$HOME/.cache";
@ -121,23 +125,25 @@
i18n.defaultLocale = "en_GB.UTF-8";
console.useXkbConfig = true;
fonts = {
packages = with pkgs;
with iosevkaCustom.packages; [
packages =
with pkgs;
with iosevkaCustom.packages;
[
iosevka-custom-nerdfont
iosevka-custom-aile
emacs-all-the-icons-fonts # Emacs
weather-icons # Emacs
lmodern # LaTeX
noto-fonts-emoji # Emoji
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
];
fontconfig = {
enable = true;
defaultFonts = with iosevkaCustom.names; {
serif = [iosevka-custom-aile];
sansSerif = [iosevka-custom-aile];
monospace = [iosevka-custom-nerdfont];
emoji = ["Noto Color Emoji"];
serif = [ iosevka-custom-aile ];
sansSerif = [ iosevka-custom-aile ];
monospace = [ iosevka-custom-nerdfont ];
emoji = [ "Noto Color Emoji" ];
};
};
};

View file

@ -3,7 +3,8 @@
lib,
pkgs,
...
}: {
}:
{
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
system.autoUpgrade.operation = "boot";
hardware.bluetooth.enable = true;

View file

@ -1,6 +1,7 @@
{pkgs, ...}: {
imports = [./default.nix];
environment.plasma6.excludePackages = with pkgs.kdePackages; [plasma-browser-integration];
{ pkgs, ... }:
{
imports = [ ./default.nix ];
environment.plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
services = {
displayManager.sddm = {
enable = true;

View file

@ -1,9 +1,6 @@
{ lib, pkgs, ... }:
{
lib,
pkgs,
...
}: {
imports = [./default.nix];
imports = [ ./default.nix ];
environment = {
sessionVariables.GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
systemPackages = with pkgs; [
@ -19,7 +16,7 @@
brightnessctl
];
};
security.pam.services.swaylock = {};
security.pam.services.swaylock = { };
programs = {
light.enable = true;
nm-applet.enable = true;
@ -33,16 +30,16 @@
};
sway = {
enable = true;
package =
pkgs.swayfx.overrideAttrs
(old: {passthru.providedSessions = ["sway"];});
extraPackages = [];
package = pkgs.swayfx.overrideAttrs (old: {
passthru.providedSessions = [ "sway" ];
});
extraPackages = [ ];
wrapperFeatures.gtk = true;
xwayland.enable = true;
};
};
services = {
dbus.packages = with pkgs; [gcr];
dbus.packages = with pkgs; [ gcr ];
gnome.gnome-keyring.enable = true;
blueman.enable = true;
accounts-daemon.enable = true;
@ -54,11 +51,17 @@
};
greetd = {
enable = true;
settings = let
settings =
let
command = "sway";
in {
initial_session = {inherit command;};
default_session = {inherit command;};
in
{
initial_session = {
inherit command;
};
default_session = {
inherit command;
};
};
};
};
@ -70,6 +73,6 @@
xdg.portal = {
enable = true;
config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes
extraPortals = [pkgs.xdg-desktop-portal-gtk];
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
};
}

View file

@ -1,32 +1,44 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b9d4ba04-a867-4ca6-88f9-79dc6a982e94";
fileSystems."/" = {
device = "/dev/disk/by-uuid/b9d4ba04-a867-4ca6-88f9-79dc6a982e94";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8F05-4C3A";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8F05-4C3A";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a10ee1da-3b0d-4f6b-b20a-d6a32ae1f668"; }
];
swapDevices = [ { device = "/dev/disk/by-uuid/a10ee1da-3b0d-4f6b-b20a-d6a32ae1f668"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,34 +1,43 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/84b28760-3643-4ad8-9ff6-ff78b57067f8";
fileSystems."/" = {
device = "/dev/disk/by-uuid/84b28760-3643-4ad8-9ff6-ff78b57067f8";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-d1062931-ee58-4848-adf9-09452daeb6eb".device = "/dev/disk/by-uuid/d1062931-ee58-4848-adf9-09452daeb6eb";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/ABE3-88E7";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/ABE3-88E7";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/ba43345c-a652-497f-84d0-86064805446b"; }
];
swapDevices = [ { device = "/dev/disk/by-uuid/ba43345c-a652-497f-84d0-86064805446b"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,13 +1,24 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
@ -17,16 +28,14 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-08822b9c-e9d6-424c-bc75-373f8667526d".device =
"/dev/disk/by-uuid/08822b9c-e9d6-424c-bc75-373f8667526d";
boot.initrd.luks.devices."luks-08822b9c-e9d6-424c-bc75-373f8667526d".device = "/dev/disk/by-uuid/08822b9c-e9d6-424c-bc75-373f8667526d";
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/6009-89FC";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/ff9627a7-820c-4628-a040-2b665688b893"; }];
swapDevices = [ { device = "/dev/disk/by-uuid/ff9627a7-820c-4628-a040-2b665688b893"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
@ -37,6 +46,5 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,33 +1,44 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"vmd"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/44c11386-0af8-4954-93bc-963a8e071672";
fileSystems."/" = {
device = "/dev/disk/by-uuid/44c11386-0af8-4954-93bc-963a8e071672";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-bf1eab3a-6d92-430d-a282-8dd4c9efe2c7".device = "/dev/disk/by-uuid/bf1eab3a-6d92-430d-a282-8dd4c9efe2c7";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/85D5-B6EC";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/85D5-B6EC";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/e65e5e4d-2084-4e6b-9255-3b36cba1529f"; }
];
swapDevices = [ { device = "/dev/disk/by-uuid/e65e5e4d-2084-4e6b-9255-3b36cba1529f"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,39 +1,51 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/379a999a-0753-4cbf-b868-e275902f0f73";
fileSystems."/" = {
device = "/dev/disk/by-uuid/379a999a-0753-4cbf-b868-e275902f0f73";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-0d50df5f-9456-4296-9156-f5b818e11552".device = "/dev/disk/by-uuid/0d50df5f-9456-4296-9156-f5b818e11552";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3297-A70D";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/3297-A70D";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
fileSystems."/mnt/secondary" =
{ device = "/dev/disk/by-uuid/036f1fcb-0674-4ae5-a2fe-cb4f7ada001d";
fileSystems."/mnt/secondary" = {
device = "/dev/disk/by-uuid/036f1fcb-0674-4ae5-a2fe-cb4f7ada001d";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/26a8690a-70f9-4701-b224-b212f76a7035"; }
];
swapDevices = [ { device = "/dev/disk/by-uuid/26a8690a-70f9-4701-b224-b212f76a7035"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,5 +1,6 @@
{...}: {
imports = [./desktop/default.nix];
{ ... }:
{
imports = [ ./desktop/default.nix ];
powerManagement.enable = true;
services.auto-cpufreq = {
enable = true;

View file

@ -3,15 +3,22 @@
lib,
pkgs,
...
}: {
}:
{
services.adguardhome = {
enable = true;
mutableSettings = false;
settings = rec {
http.address = "0.0.0.0:3200";
dns = {
bind_hosts = ["127.0.0.1" "192.168.1.230"];
bootstrap_dns = ["9.9.9.9" "149.112.112.10"];
bind_hosts = [
"127.0.0.1"
"192.168.1.230"
];
bootstrap_dns = [
"9.9.9.9"
"149.112.112.10"
];
ratelimit = 0;
safe_search.enabled = true;
rewrites = [
@ -24,20 +31,24 @@
answer = "192.168.1.230";
}
];
blocked_services.ids = [];
blocked_services.ids = [ ];
};
filtering = {
inherit (dns) safe_search rewrites blocked_services;
};
filtering = {inherit (dns) safe_search rewrites blocked_services;};
querylog.ignored = [
"discovery.syncthing.net"
"discovery-v6.syncthing.net"
"matrix.tchncs.de"
];
statistics = {inherit (querylog) ignored;};
statistics = {
inherit (querylog) ignored;
};
};
openFirewall = true;
};
networking.firewall = {
allowedTCPPorts = [53];
allowedUDPPorts = [53];
allowedTCPPorts = [ 53 ];
allowedUDPPorts = [ 53 ];
};
}

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [steamcmd];
networking.firewall.allowedTCPPorts = [8777];
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ steamcmd ];
networking.firewall.allowedTCPPorts = [ 8777 ];
services.caddy.virtualHosts."astro.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:8777";
}

View file

@ -1,10 +1,14 @@
{...}: {
networking.firewall.allowedTCPPorts = [80 443];
{ ... }:
{
networking.firewall.allowedTCPPorts = [
80
443
];
services.caddy = {
enable = true;
email = "evie@xenia.me.uk";
virtualHosts."xenia.me.uk" = {
serverAliases = ["www.xenia.me.uk"];
serverAliases = [ "www.xenia.me.uk" ];
extraConfig = ''
file_server * {
root /var/www/xenia.me.uk/
@ -14,7 +18,13 @@
};
services.fail2ban = {
enable = true;
ignoreIP = ["127.0.0.1/8" "::1" "192.168.1.0/16"];
bantime-increment = {enable = true;};
ignoreIP = [
"127.0.0.1/8"
"::1"
"192.168.1.0/16"
];
bantime-increment = {
enable = true;
};
};
}

View file

@ -1,9 +1,6 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [./caddy.nix];
imports = [ ./caddy.nix ];
services = {
forgejo = {
enable = true;
@ -15,9 +12,15 @@
HTTP_PORT = 3100;
DISABLE_SSH = true;
};
ui = {DEFAULT_THEME = "forgejo-auto";};
admin = {DISABLE_REGULAR_ORG_CREATION = true;};
service = {DISABLE_REGISTRATION = true;};
ui = {
DEFAULT_THEME = "forgejo-auto";
};
admin = {
DISABLE_REGULAR_ORG_CREATION = true;
};
service = {
DISABLE_REGISTRATION = true;
};
};
};
# gitea-actions-runner = {

View file

@ -1,5 +1,6 @@
{...}: {
imports = [./caddy.nix];
{ ... }:
{
imports = [ ./caddy.nix ];
services.gitea = {
enable = true;
settings = {

View file

@ -1,5 +1,6 @@
{...}: {
imports = [./caddy.nix];
{ ... }:
{
imports = [ ./caddy.nix ];
services.grafana = {
enable = true;
settings = {
@ -16,14 +17,14 @@
exporters = {
node = {
enable = true;
enabledCollectors = ["systemd"];
enabledCollectors = [ "systemd" ];
port = 9002;
};
};
scrapeConfigs = [
{
job_name = "legion";
static_configs = [{targets = ["127.0.0.1:${toString exporters.node.port}"];}];
static_configs = [ { targets = [ "127.0.0.1:${toString exporters.node.port}" ]; } ];
}
# {
# job_name = "minecraft";

View file

@ -1,11 +1,15 @@
{config, ...}: {
{ config, ... }:
{
virtualisation.oci-containers = {
backend = "podman";
containers.homeassistant = {
volumes = ["home-assistant:/config" "/run/dbus:/run/dbus:ro"];
volumes = [
"home-assistant:/config"
"/run/dbus:/run/dbus:ro"
];
environment.TZ = config.time.timeZone;
image = "ghcr.io/home-assistant/home-assistant:2024.8.0.dev202407210221";
extraOptions = ["--network=host"];
extraOptions = [ "--network=host" ];
};
};
services.caddy.virtualHosts."home.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:8123";

View file

@ -1,8 +1,10 @@
{...}: let
{ ... }:
let
baseUrl = "xenia.me.uk";
port = 8008;
in {
imports = [./caddy.nix];
in
{
imports = [ ./caddy.nix ];
services = {
matrix-synapse = {
enable = true;
@ -12,20 +14,26 @@ in {
listeners = [
{
inherit port;
bind_addresses = ["127.0.0.1" "::1"];
bind_addresses = [
"127.0.0.1"
"::1"
];
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = ["client" "federation"];
names = [
"client"
"federation"
];
compress = true;
}
];
}
];
};
extraConfigFiles = ["/run/secrets/matrix-shared-secret"];
extraConfigFiles = [ "/run/secrets/matrix-shared-secret" ];
};
caddy.virtualHosts."xenia.me.uk".extraConfig = ''
header /.well-known/matrix/* Content-Type application/json

View file

@ -1,18 +1,19 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
nixpkgs.overlays = [
# Fetch papermc v1.21 from unstable branch of nixpkgs
(final: prev: let
(
final: prev:
let
pinnedPkgs = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/03a94c776f261b78b95de0971a94dea0199b4cd8.tar.gz";
sha256 = "0vngf4g468qd5fqch85nzyvn7bpa6p2i6rdmzc6ws2653x868w3g";
}) {inherit (pkgs) system;};
in {
}) { inherit (pkgs) system; };
in
{
inherit (pinnedPkgs) papermc papermcServers;
})
}
)
];
services.minecraft-server = {
enable = true;

View file

@ -1,6 +1,7 @@
{pkgs, ...}: {
imports = [./caddy.nix];
environment.systemPackages = with pkgs; [ffmpeg];
{ pkgs, ... }:
{
imports = [ ./caddy.nix ];
environment.systemPackages = with pkgs; [ ffmpeg ];
services = {
navidrome = {
enable = true;

View file

@ -1,5 +1,6 @@
{config, ...}: {
imports = [./caddy.nix];
{ config, ... }:
{
imports = [ ./caddy.nix ];
services.nix-serve = {
enable = true;
openFirewall = true;

View file

@ -1,5 +1,6 @@
{...}: {
imports = [./caddy.nix];
{ ... }:
{
imports = [ ./caddy.nix ];
services.ntfy-sh = {
enable = true;
settings = {

View file

@ -1,5 +1,6 @@
{config, ...}: {
imports = [./caddy.nix];
{ config, ... }:
{
imports = [ ./caddy.nix ];
services.owncast = {
enable = true;
port = 9090;

View file

@ -1,11 +1,13 @@
{...}: let
{ ... }:
let
port = "5232";
in {
in
{
services.radicale = {
enable = true;
settings = {
server = {
hosts = ["0.0.0.0:${port}"];
hosts = [ "0.0.0.0:${port}" ];
};
auth = {
type = "htpasswd";

View file

@ -1,7 +1,8 @@
{...}: {
{ ... }:
{
services.openssh = {
enable = true;
ports = [22];
ports = [ 22 ];
settings = {
UseDns = true;
PermitRootLogin = "no";

View file

@ -1,7 +1,14 @@
{...}: let
devices = ["Ion" "Legion" "Northstar" "Vanguard"];
in {
imports = [./caddy.nix];
{ ... }:
let
devices = [
"Ion"
"Legion"
"Northstar"
"Vanguard"
];
in
{
imports = [ ./caddy.nix ];
services.syncthing = {
enable = true;
systemService = true;

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [tmux];
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ tmux ];
services.terraria = {
enable = true;
maxPlayers = 10;

View file

@ -1,12 +1,15 @@
{...}: {
{ ... }:
{
services.znc = {
enable = true;
mutable = false;
useLegacyConfig = false;
openFirewall = true;
config = {
LoadModule = ["adminlog"];
Listener.l = {Port = 6697;};
LoadModule = [ "adminlog" ];
Listener.l = {
Port = 6697;
};
User.pixelifytica = {
Admin = true;
Pass.password = {
@ -18,7 +21,7 @@
liberachat = {
Server = "irc.libera.chat +6697";
Nick = "pixelifytica";
Chan = {};
Chan = { };
JoinDelay = 2;
};
};