Compare commits
No commits in common. "master" and "master" have entirely different histories.
17
README.md
17
README.md
|
|
@ -1,17 +0,0 @@
|
|||
## Screenshots
|
||||
|
||||
[Click here](https://old.reddit.com/r/unixporn/comments/1ml7w96/sway_minimalist_rice_on_nixos/)
|
||||
|
||||
|
||||
## Unified nix configuration
|
||||
|
||||
Switch server: `nixos-rebuild switch --target-host root@posixlycorrect.com --use-substitutes --show-trace --flake .\#vps`
|
||||
|
||||
Switch current machine: `sudo nixos-rebuild switch --flake . --show-trace`
|
||||
|
||||
Switch current home manager: `home-manager switch --flake . --show-trace`
|
||||
|
||||
Update homepage: `nix flake update --commit-lock-file homepage`
|
||||
|
||||
Update whole flake: `nix flake update --commit-lock-file`
|
||||
|
||||
1016
flake.lock
1016
flake.lock
File diff suppressed because it is too large
Load diff
20
flake.nix
20
flake.nix
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -17,11 +17,6 @@
|
|||
|
||||
homepage.url = "git+https://git.posixlycorrect.com/fabian/homepage.git?ref=master";
|
||||
|
||||
trivionomicon = {
|
||||
url = "git+https://git.posixlycorrect.com/deepState/trivionomicon?ref=master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
authentik-nix = {
|
||||
url = "github:nix-community/authentik-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -45,9 +40,9 @@
|
|||
flake-utils,
|
||||
vpsadminos,
|
||||
homepage,
|
||||
conduwuit,
|
||||
mediawikiSkinCitizen,
|
||||
authentik-nix,
|
||||
trivionomicon,
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
|
||||
|
|
@ -60,7 +55,6 @@
|
|||
self.overlays.default
|
||||
nur.overlays.default
|
||||
nixGL.overlay
|
||||
trivionomicon.overlays.default
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -90,10 +84,6 @@
|
|||
|
||||
specialArgs = {
|
||||
inherit flakes;
|
||||
doctrine = import "${trivionomicon}/doctrine" {
|
||||
inherit pkgs;
|
||||
namespace = "sys";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -129,10 +119,6 @@
|
|||
|
||||
extraSpecialArgs = {
|
||||
inherit flakes;
|
||||
doctrine = import "${trivionomicon}/doctrine" {
|
||||
inherit pkgs;
|
||||
namespace = "hm";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,5 @@
|
|||
with lib; {
|
||||
imports = [
|
||||
./modules
|
||||
flakes.trivionomicon.homeManagerModules.default
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,17 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
xdg = {
|
||||
enable = true;
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {};
|
||||
};
|
||||
portal = {
|
||||
# this shouldnt be on baseline, as servers have no GUI
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
extraPortals = with pkgs; [xdg-desktop-portal-gtk]; #wtf is this
|
||||
configPackages = with pkgs; [xdg-desktop-portal-gtk]; #wtf is this
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
|
|
|
|||
19
home/modules/browsers.nix
Normal file
19
home/modules/browsers.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.apps.browsers;
|
||||
in {
|
||||
options.local.apps.browsers = {
|
||||
enable = mkEnableOption "Browser home settings";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
chromium
|
||||
firefox
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.deepState;
|
||||
in {
|
||||
options.local.services.deepState.enable = mkEnableOption "trivionomicon settings";
|
||||
config = mkIf cfg.enable {
|
||||
home.sessionVariables = {
|
||||
FSOCIETY_TELEGRAM_BACKUP_N = "0";
|
||||
FSOCIETY_TELEGRAM_BACKUP_LOCATION = "/extern/var/fsociety_backup";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -8,16 +8,13 @@
|
|||
./terminal
|
||||
./neovim.nix
|
||||
./baseline.nix
|
||||
./gaming.nix
|
||||
./gaming
|
||||
./yubikey.nix
|
||||
./firefox.nix
|
||||
./browsers.nix
|
||||
./gui
|
||||
./zsh
|
||||
./gpg.nix
|
||||
./defaultDesktopPack.nix
|
||||
./accounts.nix
|
||||
./syncthing.nix
|
||||
./deepState.nix
|
||||
./mapping.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,8 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
calibre
|
||||
chromium
|
||||
discord
|
||||
kdePackages.gwenview
|
||||
gwenview
|
||||
libreoffice-fresh
|
||||
mpv
|
||||
obs-studio
|
||||
|
|
@ -29,6 +28,7 @@ in {
|
|||
vpsfree-client
|
||||
vscodium-fhs
|
||||
zola
|
||||
zoom-us
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.apps.firefox;
|
||||
in {
|
||||
options.local.apps.firefox = {
|
||||
enable = mkEnableOption "firefox settings";
|
||||
|
||||
makeDefaultBrowser = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Take a guess
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{
|
||||
programs.firefox.enable = true;
|
||||
}
|
||||
|
||||
(mkIf cfg.makeDefaultBrowser {
|
||||
xdg = {
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"text/html" = ["firefox"];
|
||||
"text/uri-list" = ["firefox"];
|
||||
"x-scheme-handler/http" = ["firefox"];
|
||||
"x-scheme-handler/https" = ["firefox"];
|
||||
"x-scheme-handler/about" = ["firefox"];
|
||||
"x-scheme-handler/unknown" = ["firefox"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.sessionVariables.DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}";
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
|
@ -12,6 +12,11 @@ in {
|
|||
};
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
# Steam. todo: move to the steam module later
|
||||
(pkgs.callPackage ./package.nix {})
|
||||
pkgs.protonup
|
||||
pkgs.winetricks
|
||||
pkgs.protontricks
|
||||
pkgs.lutris
|
||||
pkgs.openrct2
|
||||
pkgs.prismlauncher
|
||||
9
home/modules/gaming/package.nix
Normal file
9
home/modules/gaming/package.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
writeShellScriptBin,
|
||||
steam-run,
|
||||
steam,
|
||||
...
|
||||
}:
|
||||
writeShellScriptBin "steam" ''
|
||||
exec ${steam-run}/bin/steam-run ${steam}/bin/steam -console
|
||||
''
|
||||
|
|
@ -38,7 +38,7 @@ in {
|
|||
maxCacheTtl = 3600 * 6;
|
||||
maxCacheTtlSsh = 3600 * 6;
|
||||
|
||||
pinentry.package = pkgs.pinentry-emacs;
|
||||
pinentryPackage = pkgs.pinentry-emacs;
|
||||
};
|
||||
|
||||
accounts.email.accounts = {
|
||||
|
|
|
|||
32
home/modules/gui/autorandr.nix
Normal file
32
home/modules/gui/autorandr.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.gui;
|
||||
in {
|
||||
programs.autorandr = {
|
||||
profiles."default" = {
|
||||
fingerprint =
|
||||
mapAttrs
|
||||
(monitorId: monitor: monitor.fingerprint)
|
||||
cfg.monitors;
|
||||
|
||||
config =
|
||||
mapAttrs (
|
||||
monitorId:
|
||||
filterAttrs
|
||||
(k: v:
|
||||
!elem k [
|
||||
#list of options to exclude from this list
|
||||
"fingerprint"
|
||||
"initialI3Workspace"
|
||||
"monitorId"
|
||||
])
|
||||
)
|
||||
cfg.monitors;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -9,62 +9,149 @@ with lib; let
|
|||
monitorType = {setName}: (
|
||||
types.submodule ({name ? null, ...}: {
|
||||
options = {
|
||||
width = mkOption {
|
||||
monitorId = mkOption {
|
||||
type = types.str;
|
||||
default = "1920";
|
||||
example = "1920";
|
||||
example = "DP-1";
|
||||
readOnly = true;
|
||||
internal = true;
|
||||
};
|
||||
height = mkOption {
|
||||
primary = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "is primary monitor";
|
||||
example = "true";
|
||||
};
|
||||
position = mkOption {
|
||||
type = types.str;
|
||||
default = "1080";
|
||||
example = "1080";
|
||||
example = "0x0";
|
||||
};
|
||||
mode = mkOption {
|
||||
type = types.str;
|
||||
description = "resolution";
|
||||
default = "1920x1080";
|
||||
example = "1920x1080";
|
||||
};
|
||||
rate = mkOption {
|
||||
type = types.str;
|
||||
description = "refresh rate";
|
||||
example = "143.85";
|
||||
};
|
||||
posX = mkOption {
|
||||
rotate = mkOption {
|
||||
type = types.str;
|
||||
description = "x axis position";
|
||||
default = "0";
|
||||
example = "0";
|
||||
default = "normal";
|
||||
example = "left";
|
||||
};
|
||||
posY = mkOption {
|
||||
fingerprint = mkOption {
|
||||
type = types.str;
|
||||
description = "y axis position";
|
||||
default = "0";
|
||||
example = "0";
|
||||
example = "00ffffffffffff003669a03bd4040000231e0104a5341d783bd005ac5048a627125054bfcf00814081809500714f81c0b30001010101023a801871382d40582c450009252100001e0882805070384d400820f80c09252100001a000000fd003090b4b422010a202020202020000000fc004d53492047323443340a20202001a2020320f14d010304131f120211900e0f1d1e230907078301000065030c001000866f80a0703840403020350009252100001a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e9";
|
||||
};
|
||||
initialI3Workspace = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = null;
|
||||
example = 1;
|
||||
};
|
||||
};
|
||||
config = optionalAttrs setName {
|
||||
# make this better later
|
||||
monitorId = name;
|
||||
};
|
||||
})
|
||||
);
|
||||
in {
|
||||
options.local.gui = {
|
||||
enable = mkEnableOption "GUI settings";
|
||||
primaryMonitor = mkOption {
|
||||
type = monitorType {setName = false;};
|
||||
readOnly = true;
|
||||
internal = true;
|
||||
};
|
||||
monitors = mkOption {
|
||||
type = types.attrsOf (monitorType {setName = true;});
|
||||
};
|
||||
displayBatteryLevel = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "show battery level on polybar";
|
||||
example = "true";
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
./autorandr.nix
|
||||
./fonts.nix
|
||||
./theme.nix
|
||||
./sway.nix
|
||||
./waybar.nix
|
||||
./mako.nix
|
||||
./i3.nix
|
||||
./polybar.nix
|
||||
./startx.nix # move to ly once 24.11 comes out :(
|
||||
./picom.nix
|
||||
];
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
xdg = {
|
||||
config = let
|
||||
primaryMonitors =
|
||||
filter (monitor: monitor.primary)
|
||||
(attrValues cfg.monitors);
|
||||
in
|
||||
mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = length primaryMonitors == 1;
|
||||
message = "Exactly one (1) primary monitor is requiered.";
|
||||
}
|
||||
];
|
||||
|
||||
local.gui.primaryMonitor = head primaryMonitors;
|
||||
|
||||
xsession = {
|
||||
enable = true;
|
||||
mimeApps = {
|
||||
windowManager.i3.enable = true;
|
||||
};
|
||||
|
||||
programs.autorandr.enable = true;
|
||||
services = {
|
||||
dunst.enable = true;
|
||||
betterlockscreen.enable = true;
|
||||
polybar.enable = true;
|
||||
picom.enable = true;
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"application/pdf" = with pkgs; ["qpdfview"];
|
||||
"x-scheme-handler/file" = with pkgs; ["kitty"];
|
||||
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
theme = {
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-dark";
|
||||
};
|
||||
|
||||
gtk2.extraConfig = ''
|
||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
|
||||
gtk-menu-images=1
|
||||
gtk-button-images=1
|
||||
'';
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
#qt = { mentioning qt makes qt applications not work, I should probably check how to fix this
|
||||
# enable = true;
|
||||
# style.name = "bb10dark";
|
||||
#};
|
||||
|
||||
home.sessionVariables = {
|
||||
# Use gtk in jvm apps
|
||||
_JAVA_OPTIONS = concatStringsSep " " [
|
||||
"-Dawt.useSystemAAFontSettings=on"
|
||||
"-Dswing.aatext=true"
|
||||
"-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
|
||||
"-Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,38 +4,9 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = {
|
||||
monospace = [
|
||||
"JetBrains Mono"
|
||||
"Noto Sans Mono CJK SC"
|
||||
"Noto Sans Mono"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
sansSerif = [
|
||||
"Noto Sans"
|
||||
"Noto Sans CJK SC"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
serif = [
|
||||
"Noto Serif"
|
||||
"Noto Serif CJK SC"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
emoji = ["Noto Color Emoji"];
|
||||
};
|
||||
};
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
# this is probably not necessary since they are already installed in sys
|
||||
# with fonts.packages buy im too lazy to check
|
||||
home.packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-extra
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.droid-sans-mono
|
||||
];
|
||||
}
|
||||
|
|
|
|||
108
home/modules/gui/i3.nix
Normal file
108
home/modules/gui/i3.nix
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
xsession.windowManager.i3 = {
|
||||
package = pkgs.i3-gaps;
|
||||
|
||||
config = let
|
||||
mod = "Mod4";
|
||||
in {
|
||||
modifier = mod;
|
||||
|
||||
fonts = {
|
||||
names = ["JetBrains Mono"];
|
||||
style = "Regular";
|
||||
size = 8.0;
|
||||
};
|
||||
|
||||
gaps = {
|
||||
inner = 10;
|
||||
outer = -10;
|
||||
};
|
||||
|
||||
window = {
|
||||
hideEdgeBorders = "both";
|
||||
titlebar = false;
|
||||
};
|
||||
|
||||
workspaceLayout = "tabbed";
|
||||
|
||||
colors = {
|
||||
focused = {
|
||||
background = "#222222";
|
||||
border = "#4c7899";
|
||||
childBorder = "#222222";
|
||||
indicator = "#292d2e";
|
||||
text = "#888888";
|
||||
};
|
||||
};
|
||||
|
||||
# mkOptionDefault hace que se ponga la config por default
|
||||
# y se sobreescriba las cosas que pongo acá
|
||||
# NO QUITARLO. ver man home-configuration.nix
|
||||
keybindings = mkOptionDefault {
|
||||
"${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux";
|
||||
"${mod}+Tab" = "focus right";
|
||||
"${mod}+Shift+Tab" = "focus left";
|
||||
"${mod}+Shift+s" = "exec ${pkgs.maim}/bin/maim -s -u | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i";
|
||||
"${mod}+Shift+w" = "move workspace to output right";
|
||||
"${mod}+l" = "exec ${pkgs.betterlockscreen}/bin/betterlockscreen -l";
|
||||
};
|
||||
|
||||
startup = [
|
||||
{
|
||||
command = "${pkgs.xss-lock}/bin/xss-lock --transfer-sleep-lock -- ${pkgs.i3lock}/bin/i3lock --nofork";
|
||||
notification = false;
|
||||
}
|
||||
{
|
||||
command = "${pkgs.networkmanagerapplet}/bin/nm-applet";
|
||||
notification = false;
|
||||
}
|
||||
#todo: sería nice hostear esta imagen en el server y fetchearla si no existe
|
||||
{
|
||||
command = "${pkgs.feh}/bin/feh --bg-fill ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png";
|
||||
notification = false;
|
||||
always = true;
|
||||
}
|
||||
{
|
||||
#todo: move this to browsers module
|
||||
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 1; exec ${pkgs.firefox}/bin/firefox'";
|
||||
}
|
||||
{
|
||||
#todo: move this to telegram module
|
||||
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.tdesktop}/bin/telegram-desktop'";
|
||||
}
|
||||
#{
|
||||
# command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.element-desktop}/bin/element-desktop'";
|
||||
#}
|
||||
{
|
||||
command = "${pkgs.systemd}/bin/systemctl --user restart polybar.service";
|
||||
notification = false;
|
||||
always = true;
|
||||
}
|
||||
{
|
||||
command = "${pkgs.autorandr}/bin/autorandr -c";
|
||||
notification = false;
|
||||
always = true;
|
||||
}
|
||||
];
|
||||
|
||||
workspaceOutputAssign =
|
||||
mapAttrsToList (
|
||||
monitorId: v:
|
||||
{
|
||||
output = monitorId;
|
||||
}
|
||||
// optionalAttrs (v.initialI3Workspace != null) {
|
||||
workspace = toString v.initialI3Workspace;
|
||||
}
|
||||
)
|
||||
config.local.gui.monitors;
|
||||
bars = [];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.gui;
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
services.mako = {
|
||||
enable = true;
|
||||
settings = {
|
||||
actions = true;
|
||||
anchor = "top-right";
|
||||
background-color = "#000000";
|
||||
border-color = "#000000";
|
||||
progress-color="over #FFFFFF";
|
||||
border-radius = 0;
|
||||
default-timeout = 7000;
|
||||
font = "JetBrains Mono 10";
|
||||
icons = true;
|
||||
ignore-timeout = false;
|
||||
layer = "top";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
41
home/modules/gui/picom.nix
Normal file
41
home/modules/gui/picom.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
services.picom = {
|
||||
fade = true;
|
||||
fadeSteps = [0.1 0.1];
|
||||
fadeDelta = 10;
|
||||
settings = {
|
||||
animations = [
|
||||
{
|
||||
triggers = [
|
||||
"open"
|
||||
"show"
|
||||
];
|
||||
|
||||
preset = "appear";
|
||||
duration = "1";
|
||||
}
|
||||
{
|
||||
triggers = [
|
||||
"close"
|
||||
"hide"
|
||||
];
|
||||
|
||||
preset = "disappear";
|
||||
duration = "1";
|
||||
}
|
||||
{
|
||||
triggers = [
|
||||
"geometry"
|
||||
];
|
||||
preset = "geometry-change";
|
||||
duration = "1";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
460
home/modules/gui/polybar.nix
Normal file
460
home/modules/gui/polybar.nix
Normal file
|
|
@ -0,0 +1,460 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
services.polybar = {
|
||||
package = pkgs.polybarFull;
|
||||
script = ''
|
||||
# Terminate already running bar instances
|
||||
killall -q polybar
|
||||
|
||||
# Wait until the processes have been shut down
|
||||
while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
|
||||
|
||||
# Launch Polybar, using default config location ~/.config/polybar/config
|
||||
polybar -r main & polybar -r secondary &
|
||||
'';
|
||||
|
||||
settings = {
|
||||
"colors" = {
|
||||
# background = "\${xrdb:color0:#222}";
|
||||
background = "#AA000000";
|
||||
background-alt = "#00000000";
|
||||
# foreground = "\${xrdb:color7:#222}";
|
||||
foreground = "#ffffff";
|
||||
foreground-alt = "#ffffff";
|
||||
primary = "#ffffff";
|
||||
secondary = "#e60053";
|
||||
alert = "#bd2c40";
|
||||
};
|
||||
|
||||
"bar/main" = {
|
||||
monitor = config.local.gui.primaryMonitor.monitorId;
|
||||
width = "100%";
|
||||
height = 30;
|
||||
offset-x = "0%";
|
||||
offset-y = "0%";
|
||||
radius = 0.0;
|
||||
fixed-center = false;
|
||||
|
||||
background = "\${colors.background}";
|
||||
foreground = "\${colors.foreground}";
|
||||
|
||||
line-size = 1;
|
||||
line-color = "#f0000000";
|
||||
|
||||
border-size = 0;
|
||||
border-color = "#00000000";
|
||||
|
||||
padding-left = 0;
|
||||
padding-right = 0;
|
||||
|
||||
module-margin-left = 1;
|
||||
module-margin-right = 1;
|
||||
|
||||
# font-0 = "fixed:pixelsize=10;1";
|
||||
font-0 = "JetBrains Mono Light:size=10;0";
|
||||
font-1 = "unifont:fontformat=truetype:size=8:antialias=false;0";
|
||||
font-2 = "siji:pixelsize=10;1";
|
||||
# font-2 = "FontAwesome5Free:style=Regular:size=10;4";
|
||||
|
||||
modules-left = "i3";
|
||||
modules-center = "xwindow";
|
||||
modules-right = "xkeyboard pulseaudio filesystem memory cpu temperature gputemperature nvmetemperature wlan eth date semanatec";
|
||||
separator = "|";
|
||||
|
||||
tray-position = "right";
|
||||
tray-padding = 2;
|
||||
|
||||
# To allow other windows to be placed above the bar, or to avoid having the bar visible when in fullscreen mode,
|
||||
# you need to use the following two parameters. Note that it will tell the window manager to back off so no
|
||||
# area will be reserved, etc.
|
||||
#
|
||||
# wm-restack = "i3";
|
||||
# override-redirect = true;
|
||||
|
||||
cursor-click = "pointer";
|
||||
cursor-scroll = "ns-resize";
|
||||
};
|
||||
|
||||
"bar/secondary" = {
|
||||
monitor = head (attrNames (filterAttrs (monitorId: v:
|
||||
!v.primary)
|
||||
config.local.gui.monitors)); # this is bad. will fail if more than 2 monitors. this sets all monitors other than the primary one for this bar.
|
||||
"inherit" = "bar/main";
|
||||
|
||||
modules-left = "i3";
|
||||
modules-center = "xwindow";
|
||||
modules-right = "xkeyboard pulseaudio date";
|
||||
tray-position = "none";
|
||||
};
|
||||
|
||||
"module/xwindow" = {
|
||||
type = "internal/xwindow";
|
||||
label = "%title:0:30:...%";
|
||||
};
|
||||
|
||||
"module/xkeyboard" = {
|
||||
type = "internal/xkeyboard";
|
||||
blacklist-0 = "num lock";
|
||||
|
||||
format-prefix = "";
|
||||
format-prefix-foreground = "\${colors.foreground-alt}";
|
||||
|
||||
label-layout = "%layout%";
|
||||
|
||||
label-indicator-padding = 2;
|
||||
label-indicator-margin = 1;
|
||||
label-indicator-background = "\${colors.secondary}";
|
||||
};
|
||||
|
||||
"module/filesystem" = {
|
||||
type = "internal/fs";
|
||||
interval = 10;
|
||||
|
||||
mount-0 = "/";
|
||||
|
||||
label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %used%/%total%";
|
||||
label-unmounted = "";
|
||||
};
|
||||
|
||||
"module/i3" = {
|
||||
type = "internal/i3";
|
||||
format = "<label-state> <label-mode>";
|
||||
index-sort = true;
|
||||
wrapping-scroll = false;
|
||||
|
||||
# Only show workspaces on the same output as the bar
|
||||
# pin-workspaces = true
|
||||
|
||||
label-mode-padding = 1;
|
||||
label-mode-foreground = "#000";
|
||||
label-mode-background = "\${colors.primary}";
|
||||
|
||||
# focused = Active workspace on focused monitor
|
||||
label-focused = "%index%";
|
||||
label-focused-background = "\${colors.background}";
|
||||
label-focused-underline = "\${colors.primary}";
|
||||
label-focused-padding = 1;
|
||||
|
||||
# unfocused = Inactive workspace on any monitor
|
||||
label-unfocused = "%index%";
|
||||
label-unfocused-padding = 1;
|
||||
|
||||
# visible = Active workspace on unfocused monitor
|
||||
label-visible = "%index%";
|
||||
label-visible-background = "\${self.label-focused-background}";
|
||||
label-visible-underline = "\${self.label-focused-underline}";
|
||||
label-visible-padding = "\${self.label-focused-padding}";
|
||||
|
||||
# urgent = Workspace with urgency hint set
|
||||
label-urgent = "%index%";
|
||||
label-urgent-background = "\${colors.alert}";
|
||||
label-urgent-padding = 1;
|
||||
};
|
||||
|
||||
"module/xbacklight" = {
|
||||
type = "internal/xbacklight";
|
||||
|
||||
format = "<label> <bar>";
|
||||
label = "BL";
|
||||
|
||||
bar-width = 10;
|
||||
bar-indicator = "|";
|
||||
bar-indicator-foreground = "#fff";
|
||||
bar-indicator-font = 2;
|
||||
bar-fill = "─";
|
||||
bar-fill-font = 2;
|
||||
bar-fill-foreground = "#9f78e1";
|
||||
bar-empty = "─";
|
||||
bar-empty-font = 2;
|
||||
bar-empty-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/backlight-acpi" = {
|
||||
"inherit" = "module/xbacklight";
|
||||
type = "internal/backlight";
|
||||
card = "intel_backlight";
|
||||
};
|
||||
|
||||
"module/cpu" = {
|
||||
type = "internal/cpu";
|
||||
interval = 2;
|
||||
format-prefix = "cpu ";
|
||||
format-prefix-foreground = "\${colors.foreground-alt}";
|
||||
label = "%percentage:2%%";
|
||||
};
|
||||
|
||||
"module/memory" = {
|
||||
type = "internal/memory";
|
||||
interval = 2;
|
||||
format-prefix = "mem ";
|
||||
format-prefix-foreground = "\${colors.foreground-alt}";
|
||||
label = "%percentage_used%%";
|
||||
};
|
||||
|
||||
"module/wlan" = {
|
||||
type = "internal/network";
|
||||
interface = "wlp7s0";
|
||||
interval = 3.0;
|
||||
|
||||
format-connected = "<ramp-signal> <label-connected>";
|
||||
label-connected = "%essid%";
|
||||
|
||||
format-disconnected = "";
|
||||
# format-disconnected = "<label-disconnected>";
|
||||
# format-disconnected-underline = "\${self.format-connected-underline}";
|
||||
# label-disconnected = "%ifname% disconnected";
|
||||
# label-disconnected-foreground = "\${colors.foreground-alt}";
|
||||
|
||||
ramp-signal-0 = "";
|
||||
ramp-signal-1 = "";
|
||||
ramp-signal-2 = "";
|
||||
ramp-signal-3 = "";
|
||||
ramp-signal-4 = "";
|
||||
ramp-signal-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/eth" = {
|
||||
type = "internal/network";
|
||||
interface = "enp8s0";
|
||||
interval = 3.0;
|
||||
|
||||
format-connected-prefix = "";
|
||||
format-connected-prefix-foreground = "\${colors.foreground-alt}";
|
||||
label-connected = "%local_ip%";
|
||||
|
||||
format-disconnected = "";
|
||||
# format-disconnected = "<label-disconnected>";
|
||||
# format-disconnected-underline = "\${self.format-connected-underline}";
|
||||
# label-disconnected = "%ifname% disconnected";
|
||||
# label-disconnected-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/date" = {
|
||||
type = "internal/date";
|
||||
interval = 1;
|
||||
|
||||
date = " %d/%m/%Y";
|
||||
date-alt = " %c";
|
||||
|
||||
time = "%H:%M";
|
||||
time-alt = " [%s]";
|
||||
|
||||
format-prefix = "";
|
||||
format-prefix-foreground = "\${colors.foreground-alt}";
|
||||
|
||||
label = "%date% %time%";
|
||||
};
|
||||
|
||||
# "module/semanatec" = {
|
||||
# type = "custom/script"
|
||||
# exec = "/home/fabian/bin/semanatec/target/release/semanatec"
|
||||
# interval = 3600
|
||||
# format-prefix = ""
|
||||
# };
|
||||
|
||||
"module/pulseaudio" = {
|
||||
type = "internal/pulseaudio";
|
||||
|
||||
format-volume = "<label-volume>";
|
||||
label-volume = "vol %percentage%%";
|
||||
label-volume-foreground = "\${root.foreground}";
|
||||
|
||||
label-muted = "vol 0%";
|
||||
label-muted-foreground = "\${root.foreground}";
|
||||
|
||||
bar-volume-width = 10;
|
||||
bar-volume-foreground-0 = "#55aa55";
|
||||
bar-volume-foreground-1 = "#55aa55";
|
||||
bar-volume-foreground-2 = "#55aa55";
|
||||
bar-volume-foreground-3 = "#55aa55";
|
||||
bar-volume-foreground-4 = "#55aa55";
|
||||
bar-volume-foreground-5 = "#f5a70a";
|
||||
bar-volume-foreground-6 = "#ff5555";
|
||||
bar-volume-gradient = false;
|
||||
bar-volume-indicator = "|";
|
||||
bar-volume-indicator-font = 2;
|
||||
bar-volume-fill = "─";
|
||||
bar-volume-fill-font = 2;
|
||||
bar-volume-empty = "─";
|
||||
bar-volume-empty-font = 2;
|
||||
bar-volume-empty-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/alsa" = {
|
||||
type = "internal/alsa";
|
||||
|
||||
format-volume = "<label-volume> <bar-volume>";
|
||||
label-volume = "VOL";
|
||||
label-volume-foreground = "\${root.foreground}";
|
||||
|
||||
format-muted-prefix = "vol ";
|
||||
format-muted-foreground = "\${colors.foreground-alt}";
|
||||
label-muted = "sound muted";
|
||||
|
||||
bar-volume-width = 10;
|
||||
bar-volume-foreground-0 = "#55aa55";
|
||||
bar-volume-foreground-1 = "#55aa55";
|
||||
bar-volume-foreground-2 = "#55aa55";
|
||||
bar-volume-foreground-3 = "#55aa55";
|
||||
bar-volume-foreground-4 = "#55aa55";
|
||||
bar-volume-foreground-5 = "#f5a70a";
|
||||
bar-volume-foreground-6 = "#ff5555";
|
||||
bar-volume-gradient = false;
|
||||
bar-volume-indicator = "|";
|
||||
bar-volume-indicator-font = 2;
|
||||
bar-volume-fill = "─";
|
||||
bar-volume-fill-font = 2;
|
||||
bar-volume-empty = "─";
|
||||
bar-volume-empty-font = 2;
|
||||
bar-volume-empty-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/battery" = {
|
||||
type = "internal/battery";
|
||||
battery = "BAT0";
|
||||
adapter = "ADP1";
|
||||
full-at = 98;
|
||||
|
||||
format-charging = "<animation-charging> <label-charging>";
|
||||
format-charging-underline = "#ffb52a";
|
||||
|
||||
format-discharging = "<animation-discharging> <label-discharging>";
|
||||
format-discharging-underline = "\${self.format-charging-underline}";
|
||||
|
||||
format-full-prefix = " ";
|
||||
format-full-prefix-foreground = "\${colors.foreground-alt}";
|
||||
format-full-underline = "\${self.format-charging-underline}";
|
||||
|
||||
ramp-capacity-0 = "";
|
||||
ramp-capacity-1 = "";
|
||||
ramp-capacity-2 = "";
|
||||
ramp-capacity-foreground = "\${colors.foreground-alt}";
|
||||
|
||||
animation-charging-0 = "";
|
||||
animation-charging-1 = "";
|
||||
animation-charging-2 = "";
|
||||
animation-charging-foreground = "\${colors.foreground-alt}";
|
||||
animation-charging-framerate = 750;
|
||||
|
||||
animation-discharging-0 = "";
|
||||
animation-discharging-1 = "";
|
||||
animation-discharging-2 = "";
|
||||
animation-discharging-foreground = "\${colors.foreground-alt}";
|
||||
animation-discharging-framerate = 750;
|
||||
};
|
||||
|
||||
"module/temperature" = {
|
||||
type = "internal/temperature";
|
||||
warn-temperature = 60;
|
||||
hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon1/temp2_input";
|
||||
|
||||
format = "<ramp> <label>";
|
||||
format-warn = "<ramp> <label-warn>";
|
||||
|
||||
label = "cpu %temperature-c%";
|
||||
label-warn = "cpu %temperature-c%";
|
||||
label-warn-foreground = "\${colors.secondary}";
|
||||
|
||||
ramp-0 = "";
|
||||
ramp-1 = "";
|
||||
ramp-2 = "";
|
||||
ramp-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/gputemperature" = {
|
||||
type = "internal/temperature";
|
||||
warn-temperature = 60;
|
||||
hwmon-path = "/sys/devices/pci0000:00/0000:00:03.1/0000:09:00.0/hwmon/hwmon3/temp1_input";
|
||||
|
||||
format = "<ramp> <label>";
|
||||
format-warn = "<ramp> <label-warn>";
|
||||
|
||||
label = "gpu %temperature-c%";
|
||||
label-warn = "gpu %temperature-c%";
|
||||
label-warn-foreground = "\${colors.secondary}";
|
||||
|
||||
ramp-0 = "";
|
||||
ramp-1 = "";
|
||||
ramp-2 = "";
|
||||
ramp-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/nvmetemperature" = {
|
||||
type = "internal/temperature";
|
||||
warn-temperature = 60;
|
||||
hwmon-path = "/sys/devices/pci0000:00/0000:00:01.1/0000:01:00.0/hwmon/hwmon0/temp1_input";
|
||||
|
||||
format = "<ramp> <label>";
|
||||
format-warn = "<ramp> <label-warn>";
|
||||
|
||||
label = "M.2 %temperature-c%";
|
||||
label-warn = "M.2 %temperature-c%";
|
||||
label-warn-foreground = "\${colors.secondary}";
|
||||
|
||||
ramp-0 = "";
|
||||
ramp-1 = "";
|
||||
ramp-2 = "";
|
||||
ramp-foreground = "\${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"module/powermenu" = {
|
||||
type = "custom/menu";
|
||||
|
||||
expand-right = true;
|
||||
|
||||
format-spacing = 1;
|
||||
|
||||
label-open = "";
|
||||
label-open-foreground = "\${colors.secondary}";
|
||||
label-close = " cancel";
|
||||
label-close-foreground = "\${colors.secondary}";
|
||||
label-separator = "|";
|
||||
label-separator-foreground = "\${colors.foreground-alt}";
|
||||
|
||||
menu-0-0 = "reboot";
|
||||
menu-0-0-exec = "menu-open-1";
|
||||
menu-0-1 = "power off";
|
||||
menu-0-1-exec = "menu-open-2";
|
||||
|
||||
menu-1-0 = "cancel";
|
||||
menu-1-0-exec = "menu-open-0";
|
||||
menu-1-1 = "reboot";
|
||||
menu-1-1-exec = "sudo reboot";
|
||||
|
||||
menu-2-0 = "power off";
|
||||
menu-2-0-exec = "sudo poweroff";
|
||||
menu-2-1 = "cancel";
|
||||
menu-2-1-exec = "menu-open-0";
|
||||
};
|
||||
|
||||
"module/sink_changer" = {
|
||||
type = "custom/script";
|
||||
exec = "/home/fabian/bin/polybar_scripts/info.sh";
|
||||
label = "%output%";
|
||||
click-left = "/home/fabian/bin/polybar_scripts/sink_changer.sh";
|
||||
# format-prefix = " ";
|
||||
interval = "0";
|
||||
# format-prefix-foreground = "${colors.foreground-alt}";
|
||||
};
|
||||
|
||||
"settings" = {
|
||||
screenchange-reload = true;
|
||||
# compositing-background = "xor";
|
||||
# compositing-background = "screen";
|
||||
# compositing-foreground = "source";
|
||||
# compositing-border = "over";
|
||||
# pseudo-transparency = false;
|
||||
};
|
||||
|
||||
"global/wm" = {
|
||||
margin-top = 5;
|
||||
margin-bottom = 5;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
16
home/modules/gui/startx.nix
Normal file
16
home/modules/gui/startx.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
config = mkIf config.local.gui.enable {
|
||||
home.file.".xinitrc".source = let
|
||||
content = ''
|
||||
exec ~/.xsession
|
||||
'';
|
||||
in
|
||||
pkgs.writeShellScript "xinitrc" content;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,189 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.gui;
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
wlr-randr
|
||||
bemenu
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
"BEMENU_BACKEND" = "wayland";
|
||||
};
|
||||
|
||||
services = {
|
||||
swayidle = {
|
||||
enable = true;
|
||||
timeouts = [
|
||||
{
|
||||
timeout = 600;
|
||||
command = "${getExe pkgs.gtklock} -d";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.wl-gammarelay-rs = {
|
||||
Unit.After = ["sway-session.target"];
|
||||
Install.WantedBy = ["sway-session.target"];
|
||||
|
||||
Service.ExecStart = getExe pkgs.wl-gammarelay-rs;
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
|
||||
config = {
|
||||
output =
|
||||
lib.mapAttrs (k: v: {
|
||||
mode = "${toString v.width}x${toString v.height}@${v.rate}Hz";
|
||||
pos = "${toString v.posX} ${toString v.posY}";
|
||||
})
|
||||
cfg.monitors;
|
||||
|
||||
modifier = "Mod4";
|
||||
|
||||
focus = {
|
||||
followMouse = true;
|
||||
wrapping = "workspace";
|
||||
};
|
||||
|
||||
input = {
|
||||
"*" = {
|
||||
xkb_layout = "us";
|
||||
xkb_variant = "altgr-intl";
|
||||
};
|
||||
};
|
||||
|
||||
fonts = {
|
||||
names = ["JetBrains Mono"];
|
||||
style = "Regular";
|
||||
size = 8.0;
|
||||
};
|
||||
|
||||
gaps = {
|
||||
inner = 8;
|
||||
outer = -10;
|
||||
smartBorders = "on";
|
||||
smartGaps = true;
|
||||
};
|
||||
|
||||
bars = singleton {
|
||||
command = "waybar";
|
||||
position = "top";
|
||||
};
|
||||
|
||||
window = {
|
||||
hideEdgeBorders = "both";
|
||||
titlebar = false;
|
||||
border = 2;
|
||||
};
|
||||
|
||||
floating = {
|
||||
border = 0;
|
||||
titlebar = false;
|
||||
};
|
||||
|
||||
menu = "bemenu-run";
|
||||
|
||||
workspaceLayout = "tabbed";
|
||||
|
||||
colors = {
|
||||
background = "#141414";
|
||||
focused = {
|
||||
border = "#1c1c1c";
|
||||
background = "#000000";
|
||||
text = "#eaeaea";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
};
|
||||
focusedInactive = {
|
||||
border = "#000000";
|
||||
background = "#000000";
|
||||
text = "#eaeaea";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
};
|
||||
unfocused = {
|
||||
border = "#000000";
|
||||
background = "#000000";
|
||||
text = "#eaeaea";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
};
|
||||
urgent = {
|
||||
border = "#ff6666";
|
||||
background = "#ff6666";
|
||||
text = "#eaeaea";
|
||||
indicator = "#ff6666";
|
||||
childBorder = "#ff6666";
|
||||
};
|
||||
placeholder = {
|
||||
border = "#000000";
|
||||
background = "#000000";
|
||||
text = "#eaeaea";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
};
|
||||
};
|
||||
|
||||
keybindings = let
|
||||
mod = config.wayland.windowManager.sway.config.modifier;
|
||||
grimshot = getExe pkgs.sway-contrib.grimshot;
|
||||
bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrains Mono 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
|
||||
in
|
||||
mkOptionDefault {
|
||||
"${mod}+a" = "focus parent";
|
||||
"${mod}+c" = "focus child";
|
||||
"${mod}+d" = "exec ${bemenuCommand}";
|
||||
"${mod}+l" = "exec ${getExe pkgs.gtklock} -d";
|
||||
"${mod}+Return" = "exec ${lib.getExe pkgs.kitty} ${lib.getExe pkgs.tmux}";
|
||||
"${mod}+Shift+s" = "exec ${grimshot} copy area";
|
||||
"${mod}+Shift+a" = "exec ${grimshot} copy output";
|
||||
"${mod}+Tab" = "focus right";
|
||||
"${mod}+Shift+Tab" = "focus left";
|
||||
"${mod}+Shift+w" = "move workspace to output right";
|
||||
};
|
||||
|
||||
startup = [
|
||||
{
|
||||
command = "${lib.getExe pkgs.sway} 'workspace 1; exec ${lib.getExe pkgs.firefox}'";
|
||||
}
|
||||
{
|
||||
command = "${lib.getExe pkgs.sway} 'workspace 2; exec ${lib.getExe pkgs.tdesktop}'";
|
||||
}
|
||||
{
|
||||
command = "${lib.getExe pkgs.sway} 'workspace 2; exec ${lib.getExe pkgs.gajim}'";
|
||||
}
|
||||
{
|
||||
command = "${lib.getExe pkgs.swaybg} -m fill -i ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png";
|
||||
always = true;
|
||||
}
|
||||
{
|
||||
command = "${lib.getExe pkgs.networkmanagerapplet}";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
extraSessionCommands = ''
|
||||
export SDL_VIDEODRIVER=wayland
|
||||
# needs qt5.qtwayland in systemPackages
|
||||
export QT_QPA_PLATFORM=wayland
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||
# use this if they aren't displayed properly:
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
'';
|
||||
|
||||
swaynag.enable = true;
|
||||
systemd.enable = true;
|
||||
xwayland = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
theme = {
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-dark";
|
||||
};
|
||||
|
||||
gtk2.extraConfig = ''
|
||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
|
||||
gtk-menu-images=1
|
||||
gtk-button-images=1
|
||||
'';
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
# Use gtk in jvm apps
|
||||
_JAVA_OPTIONS = concatStringsSep " " [
|
||||
"-Dawt.useSystemAAFontSettings=on"
|
||||
"-Dswing.aatext=true"
|
||||
"-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
|
||||
"-Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.gui;
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 20;
|
||||
spacing = 0;
|
||||
|
||||
modules-left = [
|
||||
"sway/workspaces"
|
||||
"sway/mode"
|
||||
];
|
||||
modules-center = [
|
||||
"clock"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"privacy"
|
||||
"cpu"
|
||||
"memory"
|
||||
"disk"
|
||||
"temperature"
|
||||
"keyboard-state"
|
||||
"tray"
|
||||
];
|
||||
"keyboard-state" = {
|
||||
numlock = true;
|
||||
capslock = true;
|
||||
};
|
||||
"tray" = {
|
||||
icon-size = 13;
|
||||
spacing = 8;
|
||||
};
|
||||
"clock" = {
|
||||
interval = 60;
|
||||
format = "{:%A %B %d %Y %H:%M}";
|
||||
tooltip = false;
|
||||
};
|
||||
"cpu" = {
|
||||
format = "cpu {usage}%";
|
||||
tooltip = false;
|
||||
};
|
||||
"memory" = {
|
||||
format = "mem {percentage}%";
|
||||
tooltip = true;
|
||||
tooltip-format = "{used}/{total}";
|
||||
};
|
||||
"disk" = {
|
||||
format = "disk {specific_used:0.0f}/{specific_total:0.0f}";
|
||||
unit = "GiB";
|
||||
tooltip = false;
|
||||
};
|
||||
"privacy" = {
|
||||
icon-size = 12;
|
||||
};
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
* {
|
||||
font-family: "JetBrains Mono", monospace;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/* Entire bar: fully transparent, no border */
|
||||
window#waybar {
|
||||
background: transparent;
|
||||
color: #eaeaea;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Optional: small edge breathing room (comment out if you want edge-to-edge) */
|
||||
/* window#waybar { margin: 3px 6px 0 6px; } */
|
||||
|
||||
/* Module containers */
|
||||
.modules-left, .modules-center, .modules-right {
|
||||
padding: 0;
|
||||
margin: 0 6px;
|
||||
}
|
||||
|
||||
/* Subtle separators between modules (no boxes) */
|
||||
.modules-left > widget:not(:first-child),
|
||||
.modules-center > widget:not(:first-child),
|
||||
.modules-right > widget:not(:first-child) {
|
||||
margin-left: 12px;
|
||||
padding-left: 12px;
|
||||
border-left: 1px solid rgba(255, 255, 255, 0.08);
|
||||
}
|
||||
|
||||
/* Tightest possible workspaces */
|
||||
#workspaces { padding: 0; margin: 0; }
|
||||
#workspaces button {
|
||||
margin: 0;
|
||||
padding: 0 3px;
|
||||
min-width: 0;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
color: #cfcfcf;
|
||||
}
|
||||
#workspaces button:hover {
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
}
|
||||
#workspaces button.active,
|
||||
#workspaces button.focused {
|
||||
background: rgba(255, 255, 255, 0.10);
|
||||
color: #ffffff;
|
||||
border-bottom: 2px solid #ffffff;
|
||||
}
|
||||
#workspaces button.urgent {
|
||||
background: rgba(255, 80, 80, 0.25);
|
||||
border-bottom: 2px solid #ff5050;
|
||||
}
|
||||
|
||||
/* Focused window title: single line, no glow */
|
||||
#window {
|
||||
padding: 0 6px;
|
||||
margin: 0;
|
||||
color: #dedede;
|
||||
}
|
||||
|
||||
/* Sway mode indicator: visible only when active, no bloat */
|
||||
#mode {
|
||||
padding: 0 6px;
|
||||
margin: 0;
|
||||
background: rgba(255, 255, 255, 0.10);
|
||||
color: #ffffff;
|
||||
border-bottom: 2px solid #ffffff;
|
||||
}
|
||||
|
||||
/* Status modules — keep them flat and compact */
|
||||
#clock, #battery, #network, #pulseaudio, #backlight, #cpu, #memory, #temperature, #tray {
|
||||
padding: 0 6px;
|
||||
margin: 0;
|
||||
background: transparent;
|
||||
color: #eaeaea;
|
||||
}
|
||||
|
||||
/* States (battery, network, audio) */
|
||||
#battery.charging { color: #c9ffbf; }
|
||||
#battery.warning:not(.charging) { color: #ffd29a; }
|
||||
#battery.critical:not(.charging) { color: #ff9a9a; }
|
||||
|
||||
#network.disconnected { color: #ffb4b4; }
|
||||
#pulseaudio.muted { color: #9aa0a6; }
|
||||
|
||||
/* Tray: compress icons */
|
||||
#tray > .passive { opacity: 0.6; }
|
||||
#tray > .needs-attention { opacity: 1; }
|
||||
|
||||
/* Tooltips: clean and readable */
|
||||
tooltip {
|
||||
background: rgba(30, 30, 30, 0.95);
|
||||
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||
color: #eaeaea;
|
||||
padding: 6px 8px;
|
||||
}
|
||||
|
||||
/* Remove any leftover borders around everything */
|
||||
#custom-*, #idle_inhibitor, #privacy, #bluetooth {
|
||||
border: none;
|
||||
background: transparent;
|
||||
margin: 0;
|
||||
padding: 0 6px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.apps.mapping;
|
||||
in {
|
||||
options.local.apps.mapping = {
|
||||
enable = mkEnableOption "mapping apps";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
qgis
|
||||
openorienteering-mapper
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.syncthing;
|
||||
in {
|
||||
options.local.services.syncthing = {
|
||||
enable = mkEnableOption "syncthing settings";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
tray.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -22,27 +22,14 @@ in {
|
|||
escapeTime = 10;
|
||||
terminal = "xterm-256color";
|
||||
keyMode = "emacs";
|
||||
mouse = true;
|
||||
|
||||
extraConfig = ''
|
||||
set -g mouse on
|
||||
set -ga update-environment " LIFT_PID"
|
||||
set -g set-titles on
|
||||
set -g renumber-windows on
|
||||
set -sa terminal-overrides ',xterm-termite:RGB'
|
||||
|
||||
set -g status-style bg=default,fg=colour250
|
||||
set -g pane-border-style fg=colour236
|
||||
set -g pane-active-border-style fg=colour240
|
||||
set -g window-status-format " #I:#W "
|
||||
set -g window-status-style bg=default,fg=colour244
|
||||
set -g window-status-current-format " #I:#W "
|
||||
set -g window-status-current-style bg=colour236,fg=white,bold
|
||||
set -g status-position bottom
|
||||
set -g status-left-length 20
|
||||
set -g status-right-length 60
|
||||
set -g status-left ""
|
||||
set -g window-status-separator ""
|
||||
set -g status-justify left
|
||||
set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ in {
|
|||
ignoreSpace = true;
|
||||
};
|
||||
|
||||
initContent = import ./zshrc.nix {inherit config lib pkgs;};
|
||||
initExtra = import ./zshrc.nix {inherit config lib pkgs;};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,12 +29,10 @@
|
|||
prompt = "%B[%~] \${vcs_info_msg_0_}%b";
|
||||
};
|
||||
accounts.enable = true;
|
||||
deepState.enable = true;
|
||||
gpg = {
|
||||
enable = true;
|
||||
defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
|
||||
};
|
||||
syncthing.enable = true;
|
||||
};
|
||||
|
||||
apps = {
|
||||
|
|
@ -42,24 +40,27 @@
|
|||
neovim.enable = true;
|
||||
gaming.enable = true;
|
||||
yubikey.enable = true;
|
||||
browsers.enable = true;
|
||||
defaultDesktopPack.enable = true;
|
||||
firefox.enable = true;
|
||||
mapping.enable = true;
|
||||
};
|
||||
|
||||
gui = {
|
||||
enable = true;
|
||||
monitors = {
|
||||
DP-1 = {
|
||||
width = "1920";
|
||||
height = "1080";
|
||||
rate = "59.94";
|
||||
primary = true;
|
||||
position = "0x0";
|
||||
mode = "1920x1080";
|
||||
rate = "143.85";
|
||||
fingerprint = "00ffffffffffff003669a03bd4040000231e0104a5341d783bd005ac5048a627125054bfcf00814081809500714f81c0b30001010101023a801871382d40582c450009252100001e0882805070384d400820f80c09252100001a000000fd003090b4b422010a202020202020000000fc004d53492047323443340a20202001a2020320f14d010304131f120211900e0f1d1e230907078301000065030c001000866f80a0703840403020350009252100001a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e9";
|
||||
initialI3Workspace = 1;
|
||||
};
|
||||
DP-2 = {
|
||||
width = "1920";
|
||||
height = "1080";
|
||||
rate = "143.855";
|
||||
posX = "1920";
|
||||
position = "1920x0";
|
||||
mode = "1920x1080";
|
||||
rate = "59.94";
|
||||
fingerprint = "00ffffffffffff0009d1e77845540000061f0104a5351e783a0565a756529c270f5054a56b80d1c0b300a9c08180810081c001010101023a801871382d40582c45000f282100001e000000ff0039324d30303033323031510a20000000fd00324c1e5311010a202020202020000000fc0042656e51204757323438300a20019b02031cf14f901f041303120211011406071516052309070783010000023a801871382d40582c45000f282100001f011d8018711c1620582c25000f282100009f011d007251d01e206e2855000f282100001e8c0ad08a20e02d10103e96000f28210000180000000000000000000000000000000000000000000000000000008d";
|
||||
initialI3Workspace = 10;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -68,17 +69,18 @@
|
|||
home = {
|
||||
packages = with pkgs; [
|
||||
darktable
|
||||
deluge
|
||||
(gajim.override {
|
||||
enableSecrets = true;
|
||||
# enableJingle = true;
|
||||
# enableSpelling = true;
|
||||
enableUPnP = true;
|
||||
enableAppIndicator = true;
|
||||
# enableAppIndicator = true;
|
||||
enableE2E = true;
|
||||
enableRST = true;
|
||||
})
|
||||
gnucash
|
||||
kdePackages.kdenlive
|
||||
nmap
|
||||
qbittorrent
|
||||
kdenlive
|
||||
virt-manager
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -48,9 +48,12 @@
|
|||
enable = true;
|
||||
monitors = {
|
||||
eDP-1 = {
|
||||
width = "1920";
|
||||
height = "1080";
|
||||
primary = true;
|
||||
position = "0x0";
|
||||
mode = "1920x1080";
|
||||
rate = "60.00";
|
||||
fingerprint = "00ffffffffffff000dae0a1400000000291d0104a51f11780328659759548e271e505400000001010101010101010101010101010101363680a0703820403020a60035ad10000018000000fe004e3134304843412d4541450a20000000fe00434d4e0a202020202020202020000000fe004e3134304843412d4541450a200002";
|
||||
initialI3Workspace = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,4 +8,5 @@ with lib;
|
|||
"steam-original"
|
||||
"steam-unwrapped"
|
||||
"steam-run"
|
||||
"zoom"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
}:
|
||||
with lib; {
|
||||
imports = [
|
||||
flakes.trivionomicon.nixosModules.default
|
||||
./modules
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,18 +13,5 @@
|
|||
./android.nix
|
||||
./users.nix
|
||||
./bluetooth.nix
|
||||
./net.nix
|
||||
./steam.nix
|
||||
./gtklock.nix
|
||||
];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-extra
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.droid-sans-mono
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.sys.gtklock;
|
||||
in {
|
||||
options.local.sys.gtklock = {
|
||||
enable = mkEnableOption "gtklock settings";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.gtklock = {
|
||||
enable = true;
|
||||
config = {
|
||||
main = {
|
||||
idle-hide = true;
|
||||
idle-timeout = 1;
|
||||
time-format = "%H:%M:%S";
|
||||
start-hidden = true;
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
/* Main lockscreen window */
|
||||
window {
|
||||
background-color: black;
|
||||
color: #eaeaea;
|
||||
font-family: "JetBrains Mono", monospace;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* Container for clock + prompt */
|
||||
#main-box {
|
||||
background: black;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Clock text */
|
||||
#clock {
|
||||
font-size: 32px;
|
||||
font-weight: bold;
|
||||
color: #ffffff;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
/* Date text */
|
||||
#date {
|
||||
font-size: 14px;
|
||||
color: #aaaaaa;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
/* Password entry */
|
||||
entry {
|
||||
background-color: black;
|
||||
color: #ffffff;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
padding: 6px 8px;
|
||||
font-family: "JetBrains Mono", monospace;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* Hide any extra icons in the entry */
|
||||
entry image {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/* Wrong password feedback */
|
||||
#auth-failure {
|
||||
color: #ff6666;
|
||||
font-size: 12px;
|
||||
margin-top: 6px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,186 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
options.local.sys.nets = with lib.types;
|
||||
mkOption {
|
||||
readOnly = true;
|
||||
|
||||
type = attrsOf (submodule ({config, ...}: {
|
||||
options = let
|
||||
v4config = config.v4;
|
||||
v6config = config.v6;
|
||||
in {
|
||||
hosts = mkOption {
|
||||
default = {};
|
||||
|
||||
type = attrsOf (submodule {
|
||||
options = {
|
||||
v4 = mkOption {
|
||||
default = null;
|
||||
|
||||
type = nullOr (submodule ({config, ...}: {
|
||||
options = {
|
||||
suffix = mkOption {
|
||||
type = str;
|
||||
};
|
||||
|
||||
address = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
cidr = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
single = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
address =
|
||||
if v4config.bits == 0
|
||||
then config.suffix
|
||||
else if v4config.bits == 32
|
||||
then v4config.subnet
|
||||
else "${v4config.prefix}.${config.suffix}";
|
||||
|
||||
cidr = "${config.address}/${toString v4config.bits}";
|
||||
single = "${config.address}/32";
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
v6 = mkOption {
|
||||
default = null;
|
||||
|
||||
type = nullOr (submodule ({config, ...}: {
|
||||
options = {
|
||||
suffix = mkOption {
|
||||
type = str;
|
||||
};
|
||||
|
||||
address = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
cidr = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
single = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
address = let
|
||||
hextets = fragment: length (splitString ":" fragment);
|
||||
separator =
|
||||
if doubleColon
|
||||
then "::"
|
||||
else ":";
|
||||
doubleColon = hextets v6config.prefix + hextets config.suffix < 8;
|
||||
|
||||
joined =
|
||||
if v6config.bits == 128
|
||||
then v6config.prefix
|
||||
else if v6config.bits == 0
|
||||
then config.suffix
|
||||
else "${v6config.prefix}${separator}${config.suffix}";
|
||||
in
|
||||
joined;
|
||||
|
||||
cidr = "${config.address}/${toString v6config.bits}";
|
||||
single = "${config.address}/128";
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
v4 = mkOption {
|
||||
default = null;
|
||||
|
||||
type = nullOr (submodule ({config, ...}: {
|
||||
options = {
|
||||
bits = mkOption {
|
||||
type = enum [0 8 16 24 32];
|
||||
};
|
||||
|
||||
prefix = mkOption {
|
||||
type = str;
|
||||
};
|
||||
|
||||
subnet = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
cidr = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
cidr = "${config.subnet}/${toString config.bits}";
|
||||
subnet =
|
||||
if config.bits != 0
|
||||
then config.prefix + strings.replicate (4 - config.bits / 8) ".0"
|
||||
else "0.0.0.0";
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
v6 = mkOption {
|
||||
default = null;
|
||||
|
||||
type = nullOr (submodule ({config, ...}: {
|
||||
options = {
|
||||
bits = mkOption {
|
||||
type =
|
||||
addCheck (ints.between 0 128) (b: mod b 4 == 0)
|
||||
// {
|
||||
description = "IPv6 subnet bits at nibble boundary";
|
||||
};
|
||||
};
|
||||
|
||||
prefix = mkOption {
|
||||
type = str;
|
||||
};
|
||||
|
||||
subnet = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
cidr = mkOption {
|
||||
type = str;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
cidr = "${config.subnet}/${toString config.bits}";
|
||||
subnet =
|
||||
if config.bits == 128 || length (splitString "::" config.prefix) > 1
|
||||
then config.prefix
|
||||
else "${config.prefix}::";
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.sys.steam;
|
||||
in {
|
||||
options.local.sys.steam = {
|
||||
enable = mkEnableOption "steam settings";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
protontricks
|
||||
protonup
|
||||
protonup-ng
|
||||
winetricks
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -19,8 +19,6 @@
|
|||
graphics.enable = true;
|
||||
virtualisation.enable = true;
|
||||
androidSupport.enable = true;
|
||||
steam.enable = true;
|
||||
gtklock.enable = true;
|
||||
|
||||
users = {
|
||||
fabian = {
|
||||
|
|
@ -31,8 +29,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
trivium.sway.enable = true;
|
||||
|
||||
networking = {
|
||||
hostName = "posixlycorrect";
|
||||
networkmanager.enable = true;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ with lib; {
|
|||
flakes.impermanence.nixosModule
|
||||
./hardware-configuration.nix
|
||||
./srv
|
||||
./networkMap.nix
|
||||
];
|
||||
|
||||
local.sys = {
|
||||
|
|
@ -51,67 +50,9 @@ with lib; {
|
|||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedUDPPorts = [51820]; #TODO
|
||||
|
||||
systemd = {
|
||||
extraConfig = ''
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStartSec=900s
|
||||
'';
|
||||
|
||||
network = let
|
||||
inherit (config.local.sys) nets;
|
||||
in {
|
||||
enable = true;
|
||||
|
||||
netdevs = {
|
||||
wg-vpn = {
|
||||
netdevConfig = {
|
||||
Name = "wg-vpn";
|
||||
Kind = "wireguard";
|
||||
};
|
||||
|
||||
wireguardConfig = {
|
||||
PrivateKeyFile = "/var/trust/wg/vpn/key.priv";
|
||||
ListenPort = "51820";
|
||||
};
|
||||
|
||||
wireguardPeers = [
|
||||
{
|
||||
PublicKey = "wwUp3Uu/rSxbp+6J745O+cpnZHGWOJYWfWEsTjRE3yU=";
|
||||
PresharedKeyFile = "/var/trust/wg/vpn/vps-posixlycorrect.psk";
|
||||
AllowedIPs = ["${nets.vpn-posixlycorrect.v6.cidr}"];
|
||||
}
|
||||
{
|
||||
PublicKey = "YFqg/ED26KygSRSmGzvUXpwnXPqMOI3R3caVfAtHVks=";
|
||||
PresharedKeyFile = "/var/trust/wg/vpn/vps-pixel8.psk";
|
||||
AllowedIPs = ["${nets.vpn-pixel8.v6.cidr}"];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
networks = {
|
||||
wg-vpn = {
|
||||
name = "wg-vpn";
|
||||
|
||||
networkConfig = {
|
||||
Address = [
|
||||
nets.vpn-vps.hosts.vps.v6.cidr
|
||||
];
|
||||
};
|
||||
|
||||
routes = [
|
||||
{
|
||||
Destination = nets.vpn.v6.cidr;
|
||||
}
|
||||
{
|
||||
Source = nets.vpn.v6.cidr;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
flakes,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
local.sys.nets = {
|
||||
default = {
|
||||
v4 = {
|
||||
bits = 32;
|
||||
prefix = "37.205.12.34";
|
||||
};
|
||||
|
||||
v6 = {
|
||||
bits = 64;
|
||||
prefix = "2a03:3b40:fe:102";
|
||||
};
|
||||
|
||||
hosts = {
|
||||
vps.v6.suffix = "1";
|
||||
vps.v4.suffix = "";
|
||||
};
|
||||
};
|
||||
|
||||
vpn = {
|
||||
v6 = {
|
||||
bits = 48;
|
||||
prefix = "2a03:3b40:2b";
|
||||
};
|
||||
};
|
||||
|
||||
vpn-vps = {
|
||||
v6 = {
|
||||
bits = 64;
|
||||
prefix = "2a03:3b40:2b:1000";
|
||||
};
|
||||
|
||||
hosts = {
|
||||
vps.v6.suffix = "1";
|
||||
};
|
||||
};
|
||||
|
||||
vpn-posixlycorrect = {
|
||||
v6 = {
|
||||
bits = 64;
|
||||
prefix = "2a03:3b40:2b:1001";
|
||||
};
|
||||
|
||||
hosts = {
|
||||
posixlycorrect.v6.suffix = "1";
|
||||
};
|
||||
};
|
||||
|
||||
vpn-pixel8 = {
|
||||
v6 = {
|
||||
bits = 64;
|
||||
prefix = "2a03:3b40:2b:1002";
|
||||
};
|
||||
|
||||
hosts = {
|
||||
pixel8.v6.suffix = "1";
|
||||
};
|
||||
};
|
||||
|
||||
vpn-t14 = {
|
||||
v6 = {
|
||||
bits = 64;
|
||||
prefix = "2a03:3b40:2b:1003";
|
||||
};
|
||||
|
||||
hosts = {
|
||||
t14.v6.suffix = "1";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -18,7 +18,5 @@ with lib; {
|
|||
./shiori.nix
|
||||
./calibre-web.nix
|
||||
./immich.nix
|
||||
./wiki-js.nix
|
||||
./mealie.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,10 +47,12 @@ with lib; {
|
|||
LANDING_PAGE = "explore";
|
||||
};
|
||||
|
||||
# You can temporarily allow registration to create an admin user.
|
||||
service.DISABLE_REGISTRATION = true;
|
||||
|
||||
# ver https://github.com/nektos/act
|
||||
actions = {
|
||||
ENABLED = true;
|
||||
ENABLED = false;
|
||||
};
|
||||
mailer = {
|
||||
ENABLED = false;
|
||||
|
|
|
|||
|
|
@ -28,46 +28,6 @@ with lib; {
|
|||
environment = {
|
||||
IMMICH_TELEMETRY_EXCLUDE = "host,api,io,repo,job";
|
||||
};
|
||||
settings = {
|
||||
machineLearning = {
|
||||
enabled = false;
|
||||
};
|
||||
job = {
|
||||
backgroundTask = {
|
||||
concurrency = 1;
|
||||
};
|
||||
smartSearch = {
|
||||
concurrency = 1;
|
||||
};
|
||||
metadataExtraction = {
|
||||
concurrency = 1;
|
||||
};
|
||||
faceDetection = {
|
||||
concurrency = 1;
|
||||
};
|
||||
search = {
|
||||
concurrency = 1;
|
||||
};
|
||||
sidecar = {
|
||||
concurrency = 1;
|
||||
};
|
||||
library = {
|
||||
concurrency = 1;
|
||||
};
|
||||
migration = {
|
||||
concurrency = 1;
|
||||
};
|
||||
thumbnailGeneration = {
|
||||
concurrency = 1;
|
||||
};
|
||||
videoConversion = {
|
||||
concurrency = 1;
|
||||
};
|
||||
notifications = {
|
||||
concurrency = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
systemd.services.wiki-js = {
|
||||
requires = ["postgresql.service"];
|
||||
after = ["postgresql.service"];
|
||||
};
|
||||
|
||||
services = {
|
||||
nginx = {
|
||||
virtualHosts."food.posixlycorrect.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
extraConfig = ''
|
||||
proxy_headers_hash_max_size 512;
|
||||
proxy_headers_hash_bucket_size 128;
|
||||
'';
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:9000";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mealie = {
|
||||
enable = true;
|
||||
listenAddress = "127.0.0.1";
|
||||
port = 9000;
|
||||
credentialsFile = "/var/trust/mealie/credentials.env";
|
||||
settings = {
|
||||
ALLOW_SIGNUP = "false";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,11 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
inherit (config.local.sys) nets;
|
||||
in {
|
||||
with lib; {
|
||||
networking = {
|
||||
nftables.enable = false; # learn how to use this later
|
||||
nftables.enable = true;
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [80 443];
|
||||
|
|
@ -52,15 +49,10 @@ in {
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
fail2ban = {
|
||||
enable = true;
|
||||
bantime = "10m";
|
||||
ignoreIP = [
|
||||
nets.default.hosts.vps.v6.cidr
|
||||
nets.default.hosts.vps.v4.address
|
||||
nets.vpn.v6.cidr
|
||||
];
|
||||
ignoreIP = ["37.205.12.34"]; # Never ban the server's own IP
|
||||
bantime-increment = {
|
||||
enable = true;
|
||||
formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ with lib; {
|
|||
openDefaultPorts = true;
|
||||
guiAddress = "127.0.0.1:8384";
|
||||
settings.options.urAccepted = -1;
|
||||
dataDir = "/mnt/export2179/syncthing";
|
||||
relay = {
|
||||
enable = true;
|
||||
pools = [];
|
||||
|
|
@ -21,22 +20,4 @@ with lib; {
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
# calibre web stuff. make this better someday, this is pure duct-tape
|
||||
users.groups."calybresync".members = ["syncthing" "calibre-web"];
|
||||
systemd = {
|
||||
services."calybreown" = {
|
||||
script = ''
|
||||
chgrp -R calybresync /var/lib/calibre-web/calibre_library
|
||||
chmod -R g+w /var/lib/calibre-web/calibre_library
|
||||
'';
|
||||
serviceConfig.Type = "oneshot";
|
||||
};
|
||||
timers."calybreown" = {
|
||||
wantedBy = [
|
||||
"timers.target"
|
||||
];
|
||||
timerConfig.OnCalendar = "*-*-* *:00/30:00";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
systemd.services.wiki-js = {
|
||||
requires = ["postgresql.service"];
|
||||
after = ["postgresql.service"];
|
||||
};
|
||||
|
||||
services = {
|
||||
nginx = {
|
||||
virtualHosts."wjs.posixlycorrect.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
extraConfig = ''
|
||||
proxy_headers_hash_max_size 512;
|
||||
proxy_headers_hash_bucket_size 128;
|
||||
'';
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:3000";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
wiki-js = {
|
||||
enable = true;
|
||||
environmentFile = "/var/trust/wiki-js/env.txt";
|
||||
settings = {
|
||||
bindIP = "127.0.0.1";
|
||||
port = 3000;
|
||||
db = {
|
||||
db = "wiki-js";
|
||||
user = "wiki-js";
|
||||
type = "postgres";
|
||||
host = "/run/postgresql";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = ["wiki-js"];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "wiki-js";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue