Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2026-01-17 17:25:23 +00:00
53 changed files with 746 additions and 675 deletions

View File

@@ -18,12 +18,12 @@
./system-modules/gpg.nix ./system-modules/gpg.nix
./system-modules/hardware-configuration.nix ./system-modules/hardware-configuration.nix
./system-modules/health_reminder.nix ./system-modules/health_reminder.nix
./system-modules/hsmw.nix
./system-modules/kanata.nix ./system-modules/kanata.nix
./system-modules/terminal.nix ./system-modules/terminal.nix
./system-modules/kodi.nix ./system-modules/kodi.nix
./system-modules/networking.nix ./system-modules/networking.nix
./system-modules/nixd.nix ./system-modules/nixd.nix
./system-modules/nix.nix
./system-modules/nvidia.nix ./system-modules/nvidia.nix
./system-modules/obs.nix ./system-modules/obs.nix
./system-modules/ollama.nix ./system-modules/ollama.nix
@@ -42,7 +42,7 @@
./system-modules/users.nix ./system-modules/users.nix
./system-modules/virtualisation.nix ./system-modules/virtualisation.nix
./system-modules/ydotool.nix ./system-modules/ydotool.nix
] ++ (if (hyper.host == "NxACE") then [ ] ++ (if hyper.isServer then [
./system-modules/nx2site.nix ./system-modules/nx2site.nix
./system-modules/hugo.nix ./system-modules/hugo.nix
./system-modules/postgres.nix ./system-modules/postgres.nix
@@ -58,13 +58,11 @@
./system-modules/calendar/lec.nix ./system-modules/calendar/lec.nix
./system-modules/calendar/lr.nix ./system-modules/calendar/lr.nix
./system-modules/calendar/dicos.nix ./system-modules/calendar/dicos.nix
] else [ ] else [ ]);
]);
environment.systemPackages = import ./system-modules/base-packages.nix pkgs; environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
systemd.extraConfig = "DefaultLimitNOFILE=2048"; system.stateVersion = hyper.main-pkgs-version;
system.stateVersion = hyper.pkgs-version;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
programs.bash.shellInit = '' programs.bash.shellInit = ''
if [[ "$USER" == "${hyper.user}" ]]; then if [[ "$USER" == "${hyper.user}" ]]; then
source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

View File

@@ -1,43 +1,31 @@
{ pkgs: rec {
unfree = [ predicate = pkg: (
builtins.elem (pkgs.lib.getName pkg) unfree.packages || builtins.all (
license: license.free || builtins.elem license.shortName unfree.licenses
) (if builtins.isList pkg.meta.license then pkg.meta.license else [ pkg.meta.license ])
);
unfree = {
packages = [
"antigravity" "antigravity"
"cursor" "cursor"
"discord" "discord"
"spotify"
"obsidian" "obsidian"
"spotify"
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
"zoom-us" "vscode-extension-mhutchie-git-graph"
"zoom" "zoom"
"zoom-us"
"nvidia-x11" "nvidia-x11"
"nvidia-settings" "nvidia-settings"
"nvidia-persistenced"
"cudatoolkit"
"cuda-merged"
"cuda_cuobjdump"
"cuda_gdb"
"cuda_nvcc"
"cuda_nvdisasm"
"cuda_nvprune"
"cuda_cccl"
"cuda_cudart"
"cuda_cupti"
"cuda_cuxxfilt"
"cuda_nvml_dev"
"cuda_nvrtc"
"cuda_nvtx"
"cuda_profiler_api"
"cuda_sanitizer_api"
"libcublas"
"libcufft"
"libcurand"
"libcusolver"
"libnvjitlink"
"libcusparse"
"libnpp"
"vscode-extension-mhutchie-git-graph"
]; ];
insecure = [ ]; licenses = [
"CUDA EULA"
"cuDNN EULA"
"cuTENSOR EULA"
"NVidia OptiX EULA"
];
};
# insecure = [ ];
} }

View File

@@ -1,13 +1,41 @@
{ {
"NxXPS": {
"base": { "base": {
"foreground": "#eddbef", "foreground": "#fecccc",
"background": "#100711" "background": "#190000"
}, },
"to_alter": { "to_alter": {
"accent": "#ba71c0", "accent": "#ff3232",
"secondary": "#3266ff", "secondary": "#ff3232",
"tertiary": "#4bb6e6", "tertiary": "#ff3232",
"special": "#76c071", "special": "#31feff",
"weird": "#c08571" "weird": "#baff31"
}
},
"NxACE": {
"base": {
"foreground": "#dddddd",
"background": "#111111"
},
"to_alter": {
"accent": "#ff6666",
"secondary": "#ff8866",
"tertiary": "#ff6688",
"special": "#8888ff",
"weird": "#88ff66"
}
},
"NxNORTH": {
"base": {
"foreground": "#ddccfe",
"background": "#080019"
},
"to_alter": {
"accent": "#7736fb",
"secondary": "#ff5332",
"tertiary": "#f33e8e",
"special": "#b9fb35",
"weird": "#fb3578"
}
} }
} }

46
flake-modules/hyper.nix Normal file
View File

@@ -0,0 +1,46 @@
let hyper-base = rec {
host = "BaseHost";
system = "x86_64-linux";
user = "nx2";
domain = "nx2.site";
home = "/home/${user}";
webroot = "/var/lib/hugo/nx2site/public";
main-pkgs-version = "25.11";
isServer = false;
isMobile = false;
isPersonal = false;
isNOD = false;
isWorkstation = false;
nvidia = {
enable = false;
prime = false;
};
}; in host: if host == "NxNORTH" then hyper-base // { inherit host;
nvidia = {
enable = true;
prime = false;
};
isPersonal = true;
isWorkstation = true;
} else if host == "NxXPS" then hyper-base // { inherit host;
nvidia = {
enable = true;
prime = true;
};
isMobile = true;
isPersonal = true;
isWorkstation = true;
} else if host == "NxACE" then hyper-base // { inherit host;
isServer = true;
} else if host == "NxDCS" then hyper-base // { inherit host;
isWorkstation = true;
isMobile = true;
} else if host == "NxS23U" then hyper-base // { inherit host;
isMobile = true;
isNOD = true;
isPersonal = true;
main-pkgs-version = "24.05";
system = "aarch64-linux";
user = "nix-on-droid";
home = "/data/data/com.termux.nix/files/home";
} else assert false "unkown host"; {}

View File

@@ -1,4 +0,0 @@
{
enable = false;
prime = false;
}

View File

@@ -0,0 +1,43 @@
lib: let
# takes in "ff0044" (no hash!) and returns { r = "ff", g = "00", b = "44" }
slice-hex = hex: with builtins; { r = substring 0 2 hex; g = substring 2 2 hex; b = substring 4 2 hex; };
# takes in "44" and returns 64
drune-to-255 = drune: with builtins; (rune-to-num (substring 0 1 drune)) * 16 + (rune-to-num (substring 1 1 drune));
num-to-drune = num: "${num-to-rune (num / 16)}${num-to-rune (num - ((num / 16) * 16))}";
# takes in "D" and returns 13
# inspiration from https://github.com/bertof/nix-rice
rune-to-num = rune: let
dict = { "0" = 0; "1" = 1; "2" = 2; "3" = 3; "4" = 4; "5" = 5; "6" = 6; "7" = 7; "8" = 8; "9" = 9; "A" = 10; "B" = 11; "C" = 12; "D" = 13; "E" = 14; "F" = 15; };
in assert(builtins.hasAttr (lib.strings.toUpper rune) dict); builtins.getAttr (lib.strings.toUpper rune) dict;
# takes in 15 and returns "F"
num-to-rune = num: let
num-string = builtins.toString num;
dict = { "0" = "0"; "1" = "1"; "2" = "2"; "3" = "3"; "4" = "4"; "5" = "5"; "6" = "6"; "7" = "7"; "8" = "8"; "9" = "9"; "10" = "A"; "11" = "B"; "12" = "C"; "13" = "D"; "14" = "E"; "15" = "F"; };
in assert(builtins.hasAttr num-string dict); builtins.getAttr num-string dict;
# Keeps num between 0 and 255
# Make sure to pass in an int not a float
cap-255 = num: (if (num>255) then 255 else if (num<0) then 0 else num);
nohash = hex: with builtins; assert((stringLength hex) == 7); substring 1 6 hex;
in {
## USEFUL FUNCTIONS
# takes in a string like "#ff0044" and returns "ff0044" symbol
inherit nohash;
# This takes in something like "#ff0044" and returns "255,0,64"
hex-to-rgb-comma-string = hex: with (slice-hex (nohash hex)); with builtins; assert(isString hex); "${toString (drune-to-255 r)},${toString (drune-to-255 g)},${toString (drune-to-255 b)}";
# This is useful if you have a float (like a transparency value) and want a drune representation of it
# So 0.0 -> "00" and 1.0 -> "FF"
float-to-drune = f: with builtins; assert(isFloat f); "${num-to-rune (floor((255*f) / 16))}${num-to-rune (floor(255*f) - (floor((255*f) / 16) * 16))}";
# Takes in hex and a float. 0.5 is +50% brightness and (-0.5) is -50% brightness.
# So "#ff0044": 0.3 -> "#ff0055"
alter-luminace-hex = hex: amount: let
color-num = with (slice-hex (nohash hex)); { r = drune-to-255 r; g = drune-to-255 g; b = drune-to-255 b; };
alter = num: (num-to-drune (cap-255 (builtins.floor ((125 * amount) + (num * (1+amount))) )));
in with color-num; "#${alter r}${alter g}${alter b}";
}

29
flake-modules/pkgs.nix Normal file
View File

@@ -0,0 +1,29 @@
inputs: simple-pkgs: hyper: let
args = {
system = hyper.system;
config = {
allowUnfreePredicate = (import ./allowed.nix simple-pkgs).predicate;
cudaSupport = hyper.nvidia.enable;
cudaForwardCompat = hyper.nvidia.enable;
};
};
overlays = [(final: prev: {
unstable = import inputs.nixpkgs-unstable args;
latest = import inputs.nixpkgs-latest args;
pkgs-version = hyper.main-pkgs-version;
})] ++ (if hyper.isServer then [
inputs.copyparty.overlays.default
] else []);
in if !hyper.isNOD then
(import inputs.nixpkgs (args // { inherit overlays; }))
else (
(import inputs.nixpkgs (args // { inherit overlays; })) // # normal as base
(import inputs.nixpkgs24 (args // { # overwrite with old versions
overlays = [(final: prev: {
pkgs-version = "24.05";
})];
}))
)

View File

@@ -1,6 +1,6 @@
pkgs: rec { pkgs: hyper: rec {
lib = import ../nxlib/ricelib.nix pkgs.lib; lib = import ./nxlib/ricelib.nix pkgs.lib;
transparency = 0.8; transparency = 0.8;
rounding = 3; rounding = 3;
@@ -36,17 +36,12 @@ pkgs: rec {
red = "#dd4444"; # "#dd1111" "#00aa00"; red = "#dd4444"; # "#dd1111" "#00aa00";
yellow = "#dddd44"; # "#dddd11" "#ffff00"; yellow = "#dddd44"; # "#dddd11" "#ffff00";
}; };
facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json))."${hyper.host}".to_alter;
fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json))."${hyper.host}".base;
fcolor = facolor // fbcolor; fcolor = facolor // fbcolor;
xcolor = with ccolor; with fcolor; { xcolor = with ccolor; with fcolor; {
# background = "#000000"; # background = "#000000";
# foreground = "#dddddd"; # foreground = "#dddddd";
# accent = blue;
# secondary = cyan;
# tertiary = magenta;
# special = yellow;
# weird = green;
subtle = { darker = "#111111"; dark = "#444444"; base = "#777777"; bright = "#999999"; brighter = "#cccccc"; }; subtle = { darker = "#111111"; dark = "#444444"; base = "#777777"; bright = "#999999"; brighter = "#cccccc"; };
positive = alter "#00dd00"; positive = alter "#00dd00";
negative = alter "#dd0000"; negative = alter "#dd0000";
@@ -61,8 +56,6 @@ pkgs: rec {
regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf"; regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
}; };
base = { base = {
# name = "NewComputerModern08";
# package = pkgs.newcomputermodern;
name = "Atkinson Hyperlegible"; name = "Atkinson Hyperlegible";
package = pkgs.atkinson-hyperlegible-next; package = pkgs.atkinson-hyperlegible-next;
}; };

184
flake.lock generated
View File

@@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762356719, "lastModified": 1767024902,
"narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1763901903, "lastModified": 1768172937,
"narHash": "sha256-w7YsxTjldwhUBP5ypbcZvWyZgRQqp3NBfyk5BAfrFjQ=", "narHash": "sha256-abU6yVB1dNW3fuUpXb5fakyY3JAWJdJSUbuM+LnqH2A=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "fb9f0441c99833ab7bc035d76b9a89021270675a", "rev": "9d223d6ca7c49f57dc8b31a511f4f3ee975f2653",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -70,15 +70,15 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1767039857,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@@ -102,11 +102,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1765121682,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -220,16 +220,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1767910483,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762462052, "lastModified": 1766946335,
"narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -323,17 +323,18 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1763912895, "lastModified": 1768144432,
"narHash": "sha256-1mdM539nkqTWVHTHPCGHGrLu/UwsxeYWnrnHQaUh1qQ=", "narHash": "sha256-lLV0egdN9VF6BjhG6GVEVMviFuM05XCv35YNsfLzS9w=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2b0fd417d32278159d0ca1d23fb997588c37995b", "rev": "fbf421df889ceff3bac08a9f4b9493def5eecc4d",
"revCount": 6643, "revCount": 6805,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -377,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762755186, "lastModified": 1767023960,
"narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-guiutils", "repo": "hyprland-guiutils",
"rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -402,11 +403,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759610243, "lastModified": 1765214753,
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -431,11 +432,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763254292, "lastModified": 1764612430,
"narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -483,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762463729, "lastModified": 1764592794,
"narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprtoolkit", "repo": "hyprtoolkit",
"rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -508,11 +509,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763323331, "lastModified": 1766253372,
"narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0c6411851cc779d551edc89b83966696201611aa", "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -533,11 +534,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755184602, "lastModified": 1763640274,
"narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -546,6 +547,35 @@
"type": "github" "type": "github"
} }
}, },
"hyprwire": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1767473322,
"narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
"owner": "hyprwm",
"repo": "hyprwire",
"rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwire",
"type": "github"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@@ -627,11 +657,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1763738061, "lastModified": 1765841014,
"narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -690,11 +720,11 @@
}, },
"nixpkgs-latest": { "nixpkgs-latest": {
"locked": { "locked": {
"lastModified": 1763929585, "lastModified": 1768173486,
"narHash": "sha256-uxJ8vJoupgc3oJYOK3UV/kbi1f4mXFsh1BuuozhZpfw=", "narHash": "sha256-pZhr2gYGPQeL3DaI1oQlqeI7wUE12pf258LLUMgcWSU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a5f13fe8d33e5dd3585980b288366665d35ed379", "rev": "cb91fd6650df525625bcf15e7cab3ad50f980c7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -722,11 +752,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1763678758, "lastModified": 1768127708,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -753,11 +783,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1763283776, "lastModified": 1767379071,
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -785,11 +815,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1762977756, "lastModified": 1765472234,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -801,26 +831,26 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1763622513, "lastModified": 1768028080,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1762286042, "lastModified": 1763806073,
"narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=", "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24", "rev": "878e468e02bfabeda08c79250f7ad583037f2227",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -894,11 +924,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763319842, "lastModified": 1767281941,
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -980,11 +1010,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762396738, "lastModified": 1763952169,
"narHash": "sha256-BarSecuxtzp1boERdABLkkoxQTi6s/V33lJwUbWLrLY=", "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c63598992afd54d215d54f2b764adc0484c2b159", "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1016,11 +1046,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763870012, "lastModified": 1768104471,
"narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1107,11 +1137,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1763600401, "lastModified": 1768129250,
"narHash": "sha256-druDd9HC3UxZSzCY+qaFp9QDCGfzrhv+Zrytia6lJUE=", "narHash": "sha256-jsccfsJpyvkZ8dUMR4rS141vnmHT3qh6HtnP+jE2qq4=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "a08b345a02c6b4c65239a0522f67e77a0132e88b", "rev": "41e5717930141c574442ecc53bd4db5f96188d50",
"type": "github" "type": "github"
}, },
"original": { "original": {

121
flake.nix
View File

@@ -2,33 +2,22 @@
description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master"; nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master";
nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05";
home-manager = { home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; };
url = "github:nix-community/home-manager/release-25.05"; home-manager24 = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; };
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager24 ={
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs24";
};
nix-on-droid = { nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05"; url = "github:nix-community/nix-on-droid/release-24.05";
inputs.nixpkgs.follows = "nixpkgs24"; inputs = { nixpkgs.follows = "nixpkgs24"; home-manager.follows = "home-manager24"; };
inputs.home-manager.follows = "home-manager24";
}; };
nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
sops-nix ={ sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2"; lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
@@ -37,101 +26,63 @@
}; };
outputs = { ... }@inputs: with inputs; let outputs = { ... }@inputs: with inputs; let
system = "x86_64-linux"; system = "x86_64-linux";
simple-pkgs = import nixpkgs { inherit system; }; simple-pkgs = import nixpkgs { inherit system; };
config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; }; get-pkgs = import ./flake-modules/pkgs.nix inputs simple-pkgs;
get-hyper = import ./flake-modules/hyper.nix;
hyper-base = rec {
system = "x86_64-linux";
user = "nx2";
domain = "nx2.site";
home = "/home/${user}";
webroot = "/var/lib/hugo/nx2site/public";
pkgs-version = "25.05";
};
get-pkgs = let s = system; in { host, system?s, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
inherit system config;
overlays = [(final: prev: {
unstable = import nixpkgs-unstable { inherit system config; };
latest = import nixpkgs-latest { inherit system config; };
inherit version;
})] ++ (if host == "NxACE" then [
copyparty.overlays.default
] else []);
};
nvidia-base = import ./flake-modules/nvidia.nix;
secrets = import ./git-crypt/secrets.nix; secrets = import ./git-crypt/secrets.nix;
rice = import ./flake-modules/rice.nix simple-pkgs; get-rice = import ./flake-modules/rice.nix simple-pkgs;
in { in {
nixosConfigurations = let nixosConfigurations = let
make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { make-nixos-system = host: let
pkgs = get-pkgs { inherit host; }; hyper = get-hyper host;
rice = get-rice hyeper;
in nixpkgs.lib.nixosSystem {
pkgs = get-pkgs hyper;
modules = [ ./configuration.nix ]; modules = [ ./configuration.nix ];
specialArgs = let specialArgs = { inherit inputs hyper rice secrets; };
hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
in { inherit inputs hyper rice secrets; };
}; };
make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { make-nixos-wsl-system = host: let hyper = get-hyper host; in nixpkgs.lib.nixosSystem {
pkgs = get-pkgs { inherit host; }; pkgs = get-pkgs hyper;
modules = [ ./wsl.nix ]; modules = [ ./wsl.nix ];
specialArgs = let specialArgs = { inherit inputs hyper rice; };
hyper = hyper-base // { inherit host; };
rice = import ./flake-modules/rice.nix pkgs;
in { inherit inputs hyper rice; };
}; };
in { in {
NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; NxNORTH = make-nixos-system "NxNORTH";
NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; NxXPS = make-nixos-system "NxXPS";
NxACE = make-nixos-system "NxACE" { enable = false; }; NxACE = make-nixos-system "NxACE";
NxDCS = make-nixos-wsl-system "NxDCS"; NxDCS = make-nixos-wsl-system "NxDCS";
}; };
nixOnDroidConfigurations = let nixOnDroidConfigurations = let
makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec { makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
pkgs = let hyper = get-hyper host;
options = { inherit host; system = "aarch64-linux"; }; pkgs = get-pkgs hyper;
in (get-pkgs options) //
(get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } )
);
modules = [ ./nod.nix ]; modules = [ ./nod.nix ];
home-manager-path = home-manager24.outPath; home-manager-path = home-manager24.outPath;
extraSpecialArgs = let extraSpecialArgs = { inherit inputs hyper rice; };
hyper = hyper-base // {
inherit host;
system = "aarch64-linux";
user = "nix-on-droid";
home = "/data/data/com.termux.nix/files/home";
pkgs-version = "24.05";
};
rice = import ./flake-modules/rice.nix pkgs;
in { inherit inputs hyper rice; };
}; };
in { NxS23U = makeNODConfiguration "NxS23U"; }; in { NxS23U = makeNODConfiguration "NxS23U"; };
homeConfigurations = let homeConfigurations = let
make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration { make-home-configuration = host: let
pkgs = get-pkgs { inherit host; }; hyper = get-hyper host;
rice = get-rice hyper;
in home-manager.lib.homeManagerConfiguration {
pkgs = get-pkgs hyper;
modules = [ ./home.nix ]; modules = [ ./home.nix ];
extraSpecialArgs = let extraSpecialArgs = { inherit inputs hyper rice secrets; };
hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
in { inherit inputs hyper rice secrets; };
}; };
make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration { make-shell-configuration = host: let hyper = get-hyper host; in home-manager.lib.homeManagerConfiguration {
pkgs = get-pkgs { inherit host; }; pkgs = get-pkgs hyper;
modules = [ ./shell-only.nix ]; modules = [ ./shell-only.nix ];
extraSpecialArgs = let extraSpecialArgs = { inherit inputs hyper rice secrets; };
hyper = hyper-base // { inherit host; };
in { inherit inputs hyper rice secrets; };
}; };
in { in {
"${hyper-base.user}@NxXPS" = make-home-configuration "NxXPS" hyper-base.user { enable = true; prime = true; }; "nx2@NxXPS" = make-home-configuration "NxXPS";
"${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; }; "nx2@NxNORTH" = make-home-configuration "NxNORTH";
"${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; }; "nx2@NxACE" = make-home-configuration "NxACE";
"nx2@NxDCS" = make-shell-configuration "NxDCS";
"${hyper-base.user}@NxDCS" = make-shell-configuration "NxDCS" hyper-base.user;
}; };
}; };
} }

View File

@@ -59,6 +59,8 @@ def get_ongoing_or_next_event(url, username, password):
for calendar in calendars: for calendar in calendars:
for event in calendar.search(start=now): for event in calendar.search(start=now):
if "VEVENT" not in event.data:
continue
calendar_parsed = Calendar(event.data) calendar_parsed = Calendar(event.data)
for ics_event in calendar_parsed.events: for ics_event in calendar_parsed.events:
event_dict = {} event_dict = {}
@@ -73,7 +75,7 @@ def get_ongoing_or_next_event(url, username, password):
return next_event_dict return next_event_dict
except Exception as e: except Exception as e:
print(f"Error accessing {url}: {str(e)[:30]}...") print(f"Error accessing {url}: {str(e)}".splitlines()[0])
return None return None
def is_expired(event_dict: dict): def is_expired(event_dict: dict):
@@ -120,7 +122,7 @@ if __name__ == "__main__":
else: else:
time_string = "in " + hour_string + "and " + minu_string time_string = "in " + hour_string + "and " + minu_string
print(f"\'{event_dict['event_name']}\' {action_string} {time_string}") print(f"\'{event_dict['event_name']}\' {action_string} {time_string}".splitlines()[0])
'') '')
]; ];
} }

View File

@@ -22,7 +22,7 @@
} // pkgs.lib.mkIf (pkgs.version != "24.05") { } // pkgs.lib.mkIf (pkgs.version != "24.05") {
shellInit = init; shellInit = init;
} // pkgs.lib.mkIf (pkgs.version != "25.05") { } // pkgs.lib.mkIf (pkgs.version != "25.11") {
profileExtra = init; profileExtra = init;
}; };
} }

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all;
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden bitwarden-desktop
]; ];
} }

View File

@@ -33,13 +33,13 @@
read-only = true; read-only = true;
type = "ics"; type = "ics";
} }
# { {
# name = "LEC"; name = "LEC";
# url = "https://${domain}/lec.ics"; url = "https://${domain}/lec.ics";
# color = "#A87000"; color = "#A87000";
# read-only = true; read-only = true;
# type = "ics"; type = "ics";
# } }
{ {
name = "Feiertage Hessen"; name = "Feiertage Hessen";
url = "https://ics.tools/Feiertage/hessen.ics"; url = "https://ics.tools/Feiertage/hessen.ics";

View File

@@ -7,18 +7,19 @@ let
# "Caedrel" # "Caedrel"
# "EintrachtSpandau" # "EintrachtSpandau"
# "GamesDoneQuick" # "GamesDoneQuick"
"Odoamne" # "Odoamne"
"iwdominate" "iwdominate"
"imls" # "imls"
"gdolphn" "gdolphn"
"GRONKH" "GRONKH"
"handofblood" "handofblood"
"HisWattson" "HisWattson"
"Jankos" # "Jankos"
# "KuruHS" # "KuruHS"
"LEC" "LEC"
"lol_nemesis" "lol_nemesis"
# "NASA" # "NASA"
"nattynattlol"
"NoWay4u_Sir" "NoWay4u_Sir"
# "OfficialMikeShinoda" # "OfficialMikeShinoda"
"Rekkles" "Rekkles"
@@ -191,7 +192,7 @@ in {
}, },
"misc": { "misc": {
"askOnTabVisibilityToggle": false, "askOnTabVisibilityToggle": false,
"currentVersion": "2.5.3", "currentVersion": "2.5.4",
"lockNotebookLayout": false "lockNotebookLayout": false
}, },
"similarity": { "similarity": {

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; lib.mkIf (hyper.isPersonal) {
lib.mkIf (hyper.host != "NxACE")
{
home.packages = with pkgs; [ home.packages = with pkgs; [
thunderbird thunderbird
]; ];
@@ -136,36 +134,22 @@ lib.mkIf (hyper.host != "NxACE")
settings = OAuth2Settings; settings = OAuth2Settings;
}; };
}; };
# pnx-nix = {
# hsmw = with secrets.email.hsmw; { # address = secrets.email.pnx.mail;
# address = "${un}@hs-mittweida.de";
# userName = "${un}@hs-mittweida.de";
# realName = "Lennart J. Kurzweg"; # realName = "Lennart J. Kurzweg";
# imap = { # flavor = "outlook.office365.com";
# port = 993;
# host = "xc.hs-mittweida.de";
# };
# smtp = {
# port = 587;
# host = "xc.hs-mittweida.de";
# tls.useStartTls = true;
# };
# signature = { # signature = {
# text = '' # text = ''
# MatNr: ${mnr} # Phönix Metallbau GmbH
# SemGr: ${semgr} # Tel: 036374 2270
# About Me: https://nx2.site/about-me
# Contact: https://nx2.site/contact
# GPG: https://nx2.site/gpg
# ''; # '';
# showSignature = "append"; # showSignature = "append";
# }; # };
# thunderbird = { # thunderbird = mkIf config.thunderbird.enable {
# enable = true; # enable = true;
# profiles = [ "nx2" ]; # profiles = [ "nx2" ];
# settings = id: { # # The id given as argument is an automatically generated account identifier.
# "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent"; # # settings = OAuth2Settings;
# };
# }; # };
# }; # };
tuda = with secrets.email.tuda; { tuda = with secrets.email.tuda; {
@@ -205,3 +189,35 @@ lib.mkIf (hyper.host != "NxACE")
# hsmw = with secrets.email.hsmw; {
# address = "${un}@hs-mittweida.de";
# userName = "${un}@hs-mittweida.de";
# realName = "Lennart J. Kurzweg";
# imap = {
# port = 993;
# host = "xc.hs-mittweida.de";
# };
# smtp = {
# port = 587;
# host = "xc.hs-mittweida.de";
# tls.useStartTls = true;
# };
# signature = {
# text = ''
# MatNr: ${mnr}
# SemGr: ${semgr}
# About Me: https://nx2.site/about-me
# Contact: https://nx2.site/contact
# GPG: https://nx2.site/gpg
# '';
# showSignature = "append";
# };
# thunderbird = {
# enable = true;
# profiles = [ "nx2" ];
# settings = id: {
# "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
# };
# };
# };

View File

@@ -122,7 +122,7 @@ in /* css */ ''
background-color: transparent !important; background-color: transparent !important;
} }
header, footer { header, footer {
background-color: rgba(0,0,0,1) !important; background-color: rgba(0,0,0,0.5) !important;
backdrop-filter: blur(100px); backdrop-filter: blur(100px);
border-radius: ${builtins.toString rice.rounding}px; border-radius: ${builtins.toString rice.rounding}px;
} }

View File

@@ -115,7 +115,7 @@
''; '';
nx_backup = let nx_backup = let
destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/"; destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
in pkgs.lib.mkIf (hyper.host == "NxXPS" || hyper.host == "NxNORTH") '' in pkgs.lib.mkIf (hyper.isPersonal) ''
set RPATH (curl -s https://${hyper.domain}/latest-backup) set RPATH (curl -s https://${hyper.domain}/latest-backup)
rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination} rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
''; '';

View File

@@ -1,9 +1,5 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
{
home.packages = with pkgs; [ home.packages = with pkgs; [
# (gimp-with-plugins.override {
# plugins = with gimpPlugins; [ bimp ];
# })
gimp gimp
]; ];
} }

View File

@@ -5,21 +5,15 @@
(writeShellScriptBin "gst" "awk -vOFS='' 'NR==FNR {all[i++] = $0; difffiles[$1] = $0; next;} ! ($2 in difffiles) {print; next;} {gsub($2, difffiles[$2]); print;} END {if (NR != FNR) {exit;} for (i in all) {print all[i];}}' <(git diff --color --stat=$(($(tput cols) - 3)) HEAD | sed '$d; s/^ //') <(git -c color.status=always status -sb)") (writeShellScriptBin "gst" "awk -vOFS='' 'NR==FNR {all[i++] = $0; difffiles[$1] = $0; next;} ! ($2 in difffiles) {print; next;} {gsub($2, difffiles[$2]); print;} END {if (NR != FNR) {exit;} for (i in all) {print all[i];}}' <(git diff --color --stat=$(($(tput cols) - 3)) HEAD | sed '$d; s/^ //') <(git -c color.status=always status -sb)")
]; ];
programs.git = { programs = {
git = {
enable = true; enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
userName = ''Lennart J. Kurzweg (Nx2)''; settings = {
userEmail = "git@${hyper.domain}"; user = {
delta = { Name = ''Lennart J. Kurzweg (Nx2)'';
enable = true; Email = "git@${hyper.domain}";
options = {
line-numbers = true;
side-by-side = false;
features = "unobtrusive-line-numbers decorations";
whitespace-error-style = "22 reverse";
}; };
};
extraConfig = {
credential = { credential = {
"https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg"; "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg";
"https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test"; "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test";
@@ -29,7 +23,17 @@
pull.rebase = false; # true pull.rebase = false; # true
}; };
}; };
programs.lazygit = { delta = {
enable = true;
enableGitIntegration = true;
options = {
line-numbers = true;
side-by-side = false;
features = "unobtrusive-line-numbers decorations";
whitespace-error-style = "22 reverse";
};
};
lazygit = {
enable = true; enable = true;
package = pkgs.lazygit; package = pkgs.lazygit;
settings = { settings = {
@@ -52,4 +56,5 @@
}; };
}; };
}; };
};
} }

View File

@@ -1,5 +1,10 @@
{ pkgs, ... }@all: with all; { { pkgs, ... }@all: with all; {
home.packages = with pkgs; [ pinentry-all ]; home.packages = with pkgs; [
# pinentry-all
# pinentry-curses
pinentry-gtk2
# pinentry-tty
];
programs.gpg = { programs.gpg = {
enable = true; enable = true;
package = pkgs.gnupg; package = pkgs.gnupg;

View File

@@ -212,7 +212,8 @@
} }
{ {
name = "typst"; name = "typst";
language-servers = [ "language-tool" "tinymist" ]; language-servers = [ "tinymist" ];
# language-servers = [ "language-tool" "tinymist" ];
} }
{ {
name = "markdown"; name = "markdown";
@@ -298,7 +299,7 @@
base16 = with rice.color; { base16 = with rice.color; {
"attributes" = foreground; "attributes" = foreground;
"comment" = { "comment" = {
fg = black.bright; fg = subtle.base;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"constant" = accent.bright; "constant" = accent.bright;
@@ -307,7 +308,7 @@
"constructor" = weird.base; "constructor" = weird.base;
"debug" = yellow.base; "debug" = yellow.base;
"diagnostic.modifiers" = [ "underline" ]; "diagnostic.modifiers" = [ "underline" ];
"diff.delta" = blue.bright; "diff.delta" = subtle.bright;
"diff.minus" = negative.bright; "diff.minus" = negative.bright;
"diff.plus" = positive.bright; "diff.plus" = positive.bright;
"error" = red.base; "error" = red.base;
@@ -404,13 +405,13 @@
bg = black.base; bg = black.base;
}; };
"ui.selection" = { "ui.selection" = {
bg = white.dark; bg = accent.dark;
}; };
"ui.selection.primary" = { "ui.selection.primary" = {
bg = black.bright; bg = accent.dark;
}; };
"ui.statusline" = { "ui.statusline" = {
fg = blue.bright; fg = accent.bright;
bg = black.base; bg = black.base;
}; };
"ui.statusline.inactive" = { "ui.statusline.inactive" = {

View File

@@ -185,19 +185,27 @@ in {
]; ];
}; };
gestures = { # gestures = {
workspace_swipe = true; # workspace_swipe = true;
workspace_swipe_fingers = "4"; # workspace_swipe_fingers = "4";
workspace_swipe_distance = "300"; # workspace_swipe_distance = "300";
workspace_swipe_invert = true; # workspace_swipe_invert = true;
workspace_swipe_min_speed_to_force = "30"; # workspace_swipe_min_speed_to_force = "30";
workspace_swipe_cancel_ratio = "0.5"; # workspace_swipe_cancel_ratio = "0.5";
workspace_swipe_create_new = false; # workspace_swipe_create_new = false;
workspace_swipe_direction_lock = false; # workspace_swipe_direction_lock = false;
workspace_swipe_direction_lock_threshold = "10"; # workspace_swipe_direction_lock_threshold = "10";
workspace_swipe_forever = true; # workspace_swipe_forever = true;
workspace_swipe_use_r = false; # workspace_swipe_use_r = false;
}; # };
gesture = [
"4, horizontal, workspace"
# "3, down, mod: ALT, close"
# "3, up, mod: SUPER, scale: 1.5, fullscreen"
# "3, left, scale: 1.5, float"
];
dwindle = { dwindle = {
preserve_split = true; # you probably want this preserve_split = true; # you probably want this
@@ -278,7 +286,7 @@ in {
"dimaround, title:^(terminal-file-picker)$" "dimaround, title:^(terminal-file-picker)$"
"center, title:^(terminal-file-picker)$" "center, title:^(terminal-file-picker)$"
"size 80% 80%, title:^(terminal-file-picker)$" "size 80% 80%, title:^(terminal-file-picker)$"
"size: 30% 30%, initialTitle:^(Select Calendar)$" "size 30% 30%, initialTitle:^(Select Calendar)$"
]; ];

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
lib.mkIf (hyper.host != "NxACE")
{
home.packages = with pkgs; [ home.packages = with pkgs; [
texlab # LSP texlab # LSP
(texlive.combine { inherit (texlive) scheme-full xifthen ifmtarg framed paralist titlesec xcolor; }) (texlive.combine { inherit (texlive) scheme-full xifthen ifmtarg framed paralist titlesec xcolor; })

View File

@@ -32,9 +32,11 @@
thumbfast # thumbnails on timeline hover thumbfast # thumbnails on timeline hover
# uosc # custom ui # uosc # custom ui
sponsorblock sponsorblock
# visualizer
]; ];
bindings = { bindings = {
"O" = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"''; "O" = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"'';
"F5" = ''set contrast 0;set brightness 0;set gamma 0;set saturation 0;set hue 0;set sub-pos 100;set sub-scale 1;set panscan 0;set zoom 0;show-text default'';
# "tab" = ''script-binding uosc/toggle-ui''; # "tab" = ''script-binding uosc/toggle-ui'';
# "space" = ''cycle pause; script-binding uosc/flash-pause-indicator''; # "space" = ''cycle pause; script-binding uosc/flash-pause-indicator'';
# "right" = ''seek 5''; # "right" = ''seek 5'';

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
{
home.packages = [ home.packages = [
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "nx_backup"; name = "nx_backup";

View File

@@ -1,29 +1,60 @@
{ pkgs, ... }@all: with all; { { pkgs, ... }@all: with all; {
home = { programs.opencode = {
packages = with pkgs; [ enable = true;
unstable.opencode package = pkgs.opencode;
]; themes.theme = with rice.color; let
# file.".config/opencode/opencode.json".text = let dl = color: { dark = color; light = color; };
# model = "qwen2.5-coder:7b"; in {
# in builtins.toJSON { accent = dl accent.base;
# "$schema" = "https://opencode.ai/config.json"; background = dl background;
# model = "ollama/${model}"; backgroundElement = dl subtle.dark;
# theme = "matrix"; backgroundPanel = dl subtle.darker;
# provider = { border = dl subtle.base;
# ollama = { borderActive = dl border;
# name = "Ollama (local)"; borderSubtle = dl subtle.dark;
# npm = "@ai-sdk/openai-compatible"; diffAdded = dl positive.base;
# options = { diffAddedBg = dl positive.darker;
# baseURL = "http://localhost:11434/v1"; diffAddedLineNumberBg = dl positive.dark;
# }; diffContext = dl foreground;
# models = { diffContextBg = dl subtle.dark;
# "${model}" = { diffHighlightAdded = dl positive.bright;
# tools = true; diffHighlightRemoved = dl negative.bright;
# }; diffHunkHeader = dl foreground;
# }; diffLineNumber = dl subtle.base;
# }; diffRemoved = dl negative.base;
# }; diffRemovedBg = dl negative.darker;
# }; diffRemovedLineNumberBg = dl negative.dark;
error = dl negative.dark;
info = dl special.base;
markdownBlockQuote = dl accent.base;
markdownCode = dl secondary.base;
markdownCodeBlock = dl secondary.base;
markdownEmph = dl accent.base;
markdownHeading = dl accent.base;
markdownHorizontalRule = dl border;
markdownImage = dl accent.base;
markdownImageText = dl accent.bright;
markdownLink = dl accent.base;
markdownLinkText = dl accent.bright;
markdownListEnumeration = dl foreground;
markdownListItem = dl foreground;
markdownStrong = dl accent.base;
markdownText = dl foreground;
primary = dl accent.base;
secondary = dl secondary.base;
success = dl positive.base;
syntaxComment = dl subtle.base;
syntaxFunction = dl accent.base;
syntaxKeyword = dl special.base;
syntaxNumber = dl tertiary.base;
syntaxOperator = dl accent.base;
syntaxPunctuation = dl foreground;
syntaxString = dl accent.base;
syntaxType = dl tertiary.base;
syntaxVariable = dl accent.base;
text = dl foreground;
textMuted = dl subtle.bright;
warning = dl weird.base;
};
}; };
} }

View File

@@ -14,5 +14,6 @@
wl-clipboard wl-clipboard
xclip xclip
wlr-randr wlr-randr
cava
]; ];
} }

View File

@@ -1,21 +1,23 @@
{ pkgs, hyper, ... }: { { pkgs, hyper, ... }: {
home.packages = with pkgs; [ home.packages = (with pkgs; [
chromium chromium
gnome-clocks gnome-clocks
gnome-calculator gnome-calculator
gnome-characters gnome-characters
gnome-2048 gnome-2048
element-desktop
qbittorrent qbittorrent
wl-clipboard wl-clipboard
xfce.thunar xfce.thunar
] ++ (if (hyper.host != "NxACE") then [ ]) ++ (if hyper.isWorkstation then (with pkgs; [
signal-desktop signal-desktop
unstable.code-cursor-fhs unstable.code-cursor-fhs
latest.antigravity latest.antigravity
element-desktop
obsidian obsidian
zoom-us zoom-us
inkscape inkscape
audacity audacity
] else []); gemini-cli
libreoffice
]) else []);
} }

View File

@@ -5,7 +5,7 @@
cmake cmake
cmatrix cmatrix
dig dig
du-dust dust
dysk dysk
exiftool exiftool
eza eza

View File

@@ -1,7 +1,7 @@
{ ... }: { { ... }: {
imports = [ imports = [
./programming/c.nix ./programming/c.nix
./programming/gleam.nix # ./programming/gleam.nix
./programming/glsl.nix ./programming/glsl.nix
./programming/go.nix ./programming/go.nix
./programming/java.nix ./programming/java.nix

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
lib.mkIf (hyper.host != "NxACE")
{
home.packages = with pkgs; [ home.packages = with pkgs; [
erlang erlang
rebar3 rebar3

View File

@@ -2,6 +2,6 @@
programs.go = { programs.go = {
enable = true; enable = true;
package = pkgs.go; package = pkgs.go;
goPath = "${config.xdg.dataHome}/go"; env.goPath = "${config.xdg.dataHome}/go";
}; };
} }

View File

@@ -1,10 +1,9 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
{
home = let home = let
python-with-packages = pkgs.python3.withPackages (pp: with pp; [ python-with-packages = pkgs.python3.withPackages (pp: with pp; [
ipython ipython
requests requests
debugpy # debugpy
black black
uv uv
uv-build uv-build
@@ -13,7 +12,7 @@
packages = [ packages = [
python-with-packages python-with-packages
] ++ (with pkgs; [ ] ++ (with pkgs; [
python311Packages.python-lsp-server python313Packages.python-lsp-server
ruff ruff
pyright pyright
]); ]);

View File

@@ -1,6 +1,7 @@
{ pkgs, ... }@all: with all; { { pkgs, ... }@all: with all; {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
gdb
cargo cargo
clippy clippy
rustc rustc

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }@all: with all; { { pkgs, ... }@all: with all; {
home = { home = {
packages = with pkgs; [ rofi-wayland ]; packages = with pkgs; [ rofi ];
file = let # the home-manager module sucks file = let # the home-manager module sucks
trdr = "${rice.lib.float-to-drune rice.transparency}"; trdr = "${rice.lib.float-to-drune rice.transparency}";
ts = builtins.toString; ts = builtins.toString;

View File

@@ -3,31 +3,39 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
package = pkgs.openssh; package = pkgs.openssh;
addKeysToAgent = "yes"; enableDefaultConfig = false;
matchBlocks = let matchBlocks = let
nxace = name: { default = {
addKeysToAgent = "yes";
forwardAgent = false;
compression = false;
serverAliveInterval = 0;
serverAliveCountMax = 3;
hashKnownHosts = false;
userKnownHostsFile = "~/.ssh/known_hosts";
controlMaster = "no";
controlPath = "~/.ssh/master-%r@%n:%p";
controlPersist = "no";
};
nxace = name: default // {
host = name; host = name;
hostname = "ssh.${hyper.domain}"; hostname = "ssh.${hyper.domain}";
user = "nx2"; user = "nx2";
port = 50022; port = 50022;
identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"; identityFile = [ "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}" ];
}; };
in { in {
"*".identityFile = [ "*" = default;
"ssh.nx2.site" = default // { identityFile = [
"${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}" "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}"
"${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"
"${hyper.home}/vault/ssh/tg-dm-informatik-tuda" ]; };
(pkgs.lib.mkIf (hyper.host == "NxDCS") "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}") "tg.dm.informatik.tu-darmstadt.de" = default // { identityFile = [ "${hyper.home}/vault/ssh/tg-dm-informatik-tuda" ]; };
]; "git.da.dicos.de" = default // { identityFile = [ "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}" ]; };
"github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ]; "github.com" = default // { identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ]; };
"nxace" = nxace "nxace"; "nxace" = (nxace "nxace" );
"nxacel" = (nxace "nxacel") // { hostname = "10.0.1.1"; }; "nxacel" = (nxace "nxacel") // { hostname = "10.0.1.1"; };
"nxrpli" = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; }; "nxrpli" = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };
"nxgit" = (nxace "nxgit") // {
user = "git";
identityFile = "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}";
# addKeysToAgent = "1h";
};
}; };
}; };
services.ssh-agent = { services.ssh-agent = {

View File

@@ -1,8 +1,8 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all;
{ {
home.packages = with pkgs; [ home.packages = [
(writers.writePython3Bin "change_colors_json" { (pkgs.writers.writePython3Bin "change_colors_json" {
libraries = with python3Packages; [ numpy pillow scikit-learn ]; libraries = with pkgs.python3Packages; [ numpy pillow scikit-learn ];
flakeIgnore = [ "E302" "E305" "E226" "E501" ]; flakeIgnore = [ "E302" "E305" "E226" "E501" ];
} /*python */ '' } /*python */ ''
from colorsys import hls_to_rgb, rgb_to_hls from colorsys import hls_to_rgb, rgb_to_hls
@@ -141,7 +141,10 @@
foreground = alter_l(accent, 0.9) foreground = alter_l(accent, 0.9)
background = alter_l(accent, 0.05) background = alter_l(accent, 0.05)
d = { with open("${hyper.home}/nix-dots/flake-modules/colors.json", "r") as f:
full_d = json.load(f)
full_d['${hyper.host}'] = {
"base": { "base": {
"foreground": list_to_hex(foreground), "foreground": list_to_hex(foreground),
"background": list_to_hex(background) "background": list_to_hex(background)
@@ -155,8 +158,8 @@
} }
} }
with open("/home/nx2/nix-dots/flake-modules/colors.json", "w") as f: with open("${hyper.home}/nix-dots/flake-modules/colors.json", "w") as f:
f.write(json.dumps(d, indent=4)) f.write(json.dumps(full_d, indent=4))
'') '')
]; ];
} }

View File

@@ -1,5 +1,5 @@
{ pkgs, ... }@all: with all; let { pkgs, ... }@all: with all; let
nox-var = (pkgs.version != "24.05"); nox-var = (pkgs.pkgs-version != "24.05");
tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser; tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
in { in {
home.packages = [ home.packages = [
@@ -47,7 +47,7 @@ in {
{ on = [ "g" "t" ]; run = "cd /tmp"; desc = "Go to the /tmp directory"; } { on = [ "g" "t" ]; run = "cd /tmp"; desc = "Go to the /tmp directory"; }
{ on = [ "g" "v" ]; run = "cd ~/Videos"; desc = "Go to the Videos directory"; } { on = [ "g" "v" ]; run = "cd ~/Videos"; desc = "Go to the Videos directory"; }
{ on = [ "g" "<Space>" ]; run = "cd --interactive"; desc = "Go to a directory interactively"; } { on = [ "g" "<Space>" ]; run = "cd --interactive"; desc = "Go to a directory interactively"; }
(pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; }) (pkgs.lib.mkIf (hyper.isServer) { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; })
# Navigation # Navigation
{ on = "h"; run = "leave"; desc = "Go back to the parent directory"; } { on = "h"; run = "leave"; desc = "Go back to the parent directory"; }
{ on = "l"; run = "enter"; desc = "Enter the child directory"; } { on = "l"; run = "enter"; desc = "Enter the child directory"; }
@@ -160,6 +160,9 @@ in {
{ on = "<Tab>"; run = "spot"; desc = "Show Spot View"; } { on = "<Tab>"; run = "spot"; desc = "Show Spot View"; }
# Tasks # Tasks
{ on = "w"; run = "tasks:show"; desc = "Show Task View"; } { on = "w"; run = "tasks:show"; desc = "Show Task View"; }
# Magic
{ on = "<C-h>"; run = "shell 'hx .' --block"; desc = "Open current directoy in Helix"; }
{ on = "<C-g>"; run = "shell 'lazygit' --block"; desc = "Open current directoy in Lazygit"; }
]; ];
tasks.keymap = [ tasks.keymap = [
# Task # Task
@@ -206,64 +209,62 @@ in {
}; };
opener = { opener = {
"edit" = [ "edit" = [
{ run = ''hx "$0" "$@"''; desc = "Helix"; block = true; } { run = ''hx "$@"''; desc = "Helix"; block = true; }
{ run = ''codium "$0" "$@"''; desc = "VS Code"; orphan = true; } { run = ''codium "$@"''; desc = "VS Code"; orphan = true; }
{ run = ''antigravity "$0" "$0"''; desc = "Antigravity"; orphan = true; } { run = ''cat "$@" | wl-copy''; desc = "Copy Contents"; }
{ run = ''cat "$0" "$@" | wl-copy''; desc = "Copy Contents"; }
]; ];
"play" = [ "play" = [
{ run = ''mpv "$0" "$@"''; desc = "mpv"; orphan = true; } { run = ''mpv "$@"''; desc = "MPV"; orphan = true; }
{ run = ''mpv --vf=negate "$0" "$@"''; desc = "mpv inverted"; orphan = true; } { run = ''mpv --vf=negate "$@"''; desc = "MPV inverted"; orphan = true; }
{ run = ''mediainfo "$0"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; } { run = ''mediainfo "$1"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; }
]; ];
"archive" = [ "archive" = [
{ run = ''unar "$0" "$@"''; desc = "Extract here"; } { run = ''unar "$@"''; desc = "Extract here"; }
{ run = ''tar -x "$0" "$@"''; desc = "tar -x"; } { run = ''tar -x "$@"''; desc = "tar -x"; }
{ run = ''unzip "$0" "$@"''; desc = "unzip"; } { run = ''unzip "$@"''; desc = "unzip"; }
]; ];
"image" = [ "image" = [
{ run = ''imv "$0" "$@"''; desc = "imv"; orphan = true; } { run = ''imv "$@"''; desc = "IMV"; orphan = true; }
{ run = ''gimp "$0" "$@"''; desc = "gimp"; orphan = true; } { run = ''gimp "$@"''; desc = "Gimp"; orphan = true; }
{ run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; } { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$1"''; desc = "swww wallpaper"; }
{ run = ''exiftool "$0"; echo "Press enter to return to yazi"; read''; desc = "View Exif Data"; } { run = ''exiftool "$1"; echo "Press enter to return to yazi"; read''; desc = "View Exif Data"; }
{ run = ''for f in "$0"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; } { run = ''for f in "$1"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
]; ];
"svg" = [ "svg" = [
{ run = ''inkscape "$0" "$@"''; desc = "inkscape"; orphan = true; } { run = ''inkscape "$@"''; desc = "Inkscape"; orphan = true; }
{ run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
]; ];
"font" = [ "font" = [
{ run = ''fontpreview "$0" "$@"''; desc = "fontpreview"; orphan = true; } { run = ''fontpreview "$@"''; desc = "Fontpreview"; orphan = true; }
{ run = ''fontforge "$0" "$@"''; desc = "fortforge"; orphan = true; } { run = ''fontforge "$@"''; desc = "Fortforge"; orphan = true; }
]; ];
"document" = [ "document" = [
{ run = ''zathura "$0" "$@"''; desc = "zathura"; orphan = true; } { run = ''zathura "$@"''; desc = "Zathura"; orphan = true; }
{ run = ''xournal "$0" "$@"''; desc = "xournal"; orphan = true; } { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
{ run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } { run = ''nxgs flip "$@"''; desc = "nxgs flip"; }
{ run = ''nxgs flip "$0" "$@"''; desc = "nxgs flip"; } { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; }
{ run = ''nxgs rotate "$0" "$@"''; desc = "nxgs rotate"; } { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; }
{ run = ''nxgs interactive-merge "$0" "$@"''; block = true; desc = "nxgs merge"; }
]; ];
"browser" = [ "browser" = [
{ run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; } { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
{ run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$0" "$@"''; desc = "chromium"; orphan = true; } { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "Chromium"; orphan = true; }
{ run = ''w3m "$0" "$@"''; desc = "w3m"; } { run = ''w3m "$@"''; desc = "w3m"; }
{ run = ''lynx "$0" "$@"''; desc = "lynx"; } { run = ''lynx "$@"''; desc = "Lynx"; }
]; ];
"office" = [ "office" = [
{ run = ''libreoffice "$0" "$@"''; desc = "libreoffice"; orphan = true; } { run = ''libreoffice "$@"''; desc = "LibreOffice"; orphan = true; }
{ run = ''libreoffice --view "$0" "$@"''; desc = "libreoffice read-only"; orphan = true; } { run = ''libreoffice --view "$@"''; desc = "LibreOffice read-only"; orphan = true; }
]; ];
"shell" = [ "shell" = [
{ run = ''bash -c "$0"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; } { run = ''bash -c "$1"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; }
{ run = ''fish -c "$0"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; } { run = ''fish -c "$1"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; }
{ run = ''sh -c "$0"; echo "Press enter to return to yazi"; read''; desc = "sh -c"; } { run = ''sh -c "$1"; echo "Press enter to return to yazi"; read''; desc = "sh -c"; }
]; ];
"python" = [ "python" = [
{ run = ''python "$@"; echo "Press enter to return to yazi"; read''; desc = "python"; block = true; } { run = ''python "$@"; echo "Press enter to return to yazi"; read''; desc = "Python"; block = true; }
]; ];
"directory" = [ "directory" = [
{ run = ''lazygit "$0"''; desc = "lazygit"; } { run = ''lazygit "$1"''; desc = "LazyGit"; }
]; ];
}; };
open.rules = [ open.rules = [
@@ -326,27 +327,73 @@ in {
tabs = { tabs = {
active = { fg = secondary.dark; bg = secondary.base; }; active = { fg = secondary.dark; bg = secondary.base; };
inactive = { fg = secondary.base; bg = secondary.dark; }; inactive = { fg = secondary.base; bg = secondary.dark; };
# sep_inner = { open = "[", close = "]" };
# sep_outer = { open = "[", close = "]" };
};
mode = {
main_main = { fg = yellow.bright; bg = yellow.dark; };
select_main = { fg = cyan.bright; bg = cyan.dark; };
unset_main = { fg = blue.bright; bg = blue.dark; };
main_alternative = { fg = yellow.brighter; bg = yellow.dark; };
select_alternative = { fg = cyan.brighter; bg = cyan.dark; };
unset_alternative = { fg = blue.brighter; bg = blue.dark; };
};
confirm = {
border = { fg = border; };
title = { fg = accent.bright; };
body = { fg = "#ff0000"; };
list = { fg = "#ff0000"; };
btn_yes = { fg = positive.base; bg = positive.dark; };
btn_no = { fg = negative.base; bg = negative.dark; };
btn_labels = [ " BET " " HELLNAW " ];
};
spot = {
border = { fg = border; };
title = { fg = accent.bright; };
tbl_col = { fg = accent.base; };
tbl_cell = { fg = secondary.base; };
};
notify = {
title_info = { fg = accent.base; };
title_warn = { fg = weird.base; };
title_error = { fg = special.base; };
};
pick = {
border = { fg = border; };
active = { fg = accent.base; };
inactive = { fg = subtle.base; };
}; };
status = { status = {
separator_open = " "; #""; # sep_right = { open = ""; close = ""; };
separator_close = " "; #""; # sep_left = { open = ""; close = ""; };
separator_style = { fg = accent.base; bg = black.base; }; sepr_style = { fg = accent.base; bg = black.base; };
mode_normal = { fg = yellow.bright; bg = yellow.dark; };
mode_select = { fg = cyan.bright; bg = cyan.dark; };
mode_unset = { fg = blue.bright; bg = blue.dark; };
progress_label = { fg = secondary.base; bold = true; }; progress_label = { fg = secondary.base; bold = true; };
progress_normal = { fg = accent.base; bg = black.base; }; progress_normal = { fg = accent.base; bg = black.base; };
progress_error = { fg = negative.base; bg = black.base; }; progress_error = { fg = negative.base; bg = black.base; };
permissions_t = { fg = special.base; }; perm_type = { fg = special.base; };
permissions_r = { fg = accent.base; }; perm_read = { fg = accent.base; };
permissions_w = { fg = secondary.base; }; perm_write = { fg = secondary.base; };
permissions_x = { fg = tertiary.base; }; perm_exec = { fg = tertiary.base; };
permissions_s = { fg = special.base; }; perm_sep = { fg = special.base; };
};
indicator = { # your "cursor"
parent = { fg = secondary.darker; bg = secondary.base; };
current = { fg = accent.darker; bg = accent.base; };
preview = { fg = secondary.base; bg = secondary.dark; };
# padding = { open = " "; close = " "; };
};
cmp = {
border = { fg = border; };
active = { fg = accent.base; };
inactive = { fg = subtle.base; };
# icon_file =
# icon_folder =
# icon_command
}; };
input = { input = {
border = { fg = border; }; border = { fg = border; };
title = {}; title = { fg = accent.bright; };
value = {}; value = { fg = foreground; };
selected = { reversed = true; }; selected = { reversed = true; };
}; };
select = { select = {
@@ -368,11 +415,11 @@ in {
separator_style = { fg = foreground; }; separator_style = { fg = foreground; };
}; };
help = { help = {
on = { fg = "#fe8019"; }; on = { fg = accent.base; };
exec = { fg = "#83a598"; }; run = { fg = secondary.base; };
desc = { fg = "#928374"; }; desc = { fg = tertiary.base; italic = true; };
hovered = { bg = "#504945"; bold = true; }; hovered = { bg = accent.bright; bold = true; };
footer = { fg = "#3c3836"; bg = "#a89984"; }; footer = { fg = accent.base; bg = subtle.dark; };
}; };
filetype = { filetype = {
rules = [ rules = [
@@ -380,17 +427,17 @@ in {
{ mime = "inode/x-empty"; fg = white.dark; } { mime = "inode/x-empty"; fg = white.dark; }
{ mime = "inode/directory"; fg = accent.base; } { mime = "inode/directory"; fg = accent.base; }
{ name = "*"; is = "link"; fg = tertiary.base; } { url = "*"; is = "link"; fg = tertiary.base; }
{ name = "*"; is = "orphan"; fg = negative.base; } { url = "*"; is = "orphan"; fg = negative.base; }
{ name = "*"; is = "block"; fg = special.base; } { url = "*"; is = "block"; fg = special.base; }
{ name = "*"; is = "char"; fg = special.bright; } { url = "*"; is = "char"; fg = special.bright; }
{ name = "*"; is = "exec"; fg = secondary.base; } { url = "*"; is = "exec"; fg = secondary.base; }
{ name = "*"; is = "fifo"; fg = weird.base; } { url = "*"; is = "fifo"; fg = weird.base; }
{ name = "*"; is = "sock"; fg = weird.bright; } { url = "*"; is = "sock"; fg = weird.bright; }
{ name = "*"; is = "sticky"; fg = special.base; } { url = "*"; is = "sticky"; fg = special.base; }
# Fallback # Fallback
{ name = "*"; fg = foreground; } { url = "*"; fg = foreground; }
]; ];
}; };
}; };
@@ -413,6 +460,13 @@ in {
" ", " ",
} }
end, 500, Status.RIGHT) end, 500, Status.RIGHT)
Header:children_add(function()
if ya.target_family() ~= "unix" then
return ""
end
return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
end, 500, Header.LEFT)
''; '';
plugins = with pkgs; { plugins = with pkgs; {
inherit glow git; inherit glow git;
@@ -424,11 +478,11 @@ in {
force = true; force = true;
text = '' text = ''
[filechooser] [filechooser]
cmd=${tfc}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh cmd=/home/nx2/wrapper.sh
default_dir=$HOME default_dir=$HOME
env=TERMCMD=ghostty --title="terminal-file-picker -e" env=TERMCMD=ghostty --title="terminal-file-picker -e"
open_mode=suggested open_mode=suggested
save_mode=last save_mode=suggested
''; '';
}; };
portal = { portal = {

View File

@@ -25,7 +25,7 @@
./home-modules/hyprland-autoname-workspaces.nix ./home-modules/hyprland-autoname-workspaces.nix
./home-modules/hyprland.nix ./home-modules/hyprland.nix
./home-modules/kitty.nix ./home-modules/kitty.nix
./home-modules/latex.nix # ./home-modules/latex.nix
./home-modules/mako.nix ./home-modules/mako.nix
# ./home-modules/matrix.nix # ./home-modules/matrix.nix
./home-modules/mpv.nix ./home-modules/mpv.nix
@@ -34,7 +34,7 @@
./home-modules/nvidia.nix ./home-modules/nvidia.nix
./home-modules/nxgs.nix ./home-modules/nxgs.nix
./home-modules/obs.nix ./home-modules/obs.nix
./home-modules/office.nix # ./home-modules/office.nix
./home-modules/ollama.nix ./home-modules/ollama.nix
./home-modules/opencode.nix ./home-modules/opencode.nix
./home-modules/pandoc.nix ./home-modules/pandoc.nix
@@ -63,7 +63,7 @@
./home-modules/yazi.nix ./home-modules/yazi.nix
./home-modules/zathura.nix ./home-modules/zathura.nix
./home-modules/zoxide.nix ./home-modules/zoxide.nix
] ++ (if (hyper.host == "NxACE") then [ ] ++ (if hyper.isServer then [
./home-modules/nx2site.nix ./home-modules/nx2site.nix
./home-modules/nx2site-backup.nix ./home-modules/nx2site-backup.nix
./home-modules/calendar-campuszeit-fix.nix ./home-modules/calendar-campuszeit-fix.nix
@@ -71,6 +71,6 @@
home.username = hyper.user; home.username = hyper.user;
home.homeDirectory = hyper.home; home.homeDirectory = hyper.home;
# home.homeDirectory = "/home/${hyper.user}"; # home.homeDirectory = "/home/${hyper.user}";
home.stateVersion = hyper.pkgs-version; home.stateVersion = hyper.main-pkgs-version;
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

View File

@@ -1,96 +0,0 @@
lib:
let
# takes in "ff0044" (no hash!) and returns { r = "ff", g = "00", b = "44" }
slice-hex = hex: with builtins; { r = substring 0 2 hex; g = substring 2 2 hex; b = substring 4 2 hex; };
# takes in "44" and returns 64
drune-to-255 = drune: with builtins; (rune-to-num (substring 0 1 drune)) * 16 + (rune-to-num (substring 1 1 drune));
num-to-drune = num: "${num-to-rune (num / 16)}${num-to-rune (num - ((num / 16) * 16))}";
# takes in "D" and returns 13
rune-to-num = rune: # inspiration from https://github.com/bertof/nix-rice
let
dict = {
"0" = 0;
"1" = 1;
"2" = 2;
"3" = 3;
"4" = 4;
"5" = 5;
"6" = 6;
"7" = 7;
"8" = 8;
"9" = 9;
"A" = 10;
"B" = 11;
"C" = 12;
"D" = 13;
"E" = 14;
"F" = 15;
};
in
assert(builtins.hasAttr (lib.strings.toUpper rune) dict);
builtins.getAttr (lib.strings.toUpper rune) dict;
# takes in 15 and returns "F"
num-to-rune = num:
let
num-string = builtins.toString num;
dict = {
"0" = "0";
"1" = "1";
"2" = "2";
"3" = "3";
"4" = "4";
"5" = "5";
"6" = "6";
"7" = "7";
"8" = "8";
"9" = "9";
"10" = "A";
"11" = "B";
"12" = "C";
"13" = "D";
"14" = "E";
"15" = "F";
};
in
assert(builtins.hasAttr num-string dict);
builtins.getAttr num-string dict;
# Keeps num between 0 and 255
# Make sure to pass in an int not a float
cap-255 = num: (if (num>255) then 255 else if (num<0) then 0 else num);
nohash = hex: with builtins; assert((stringLength hex) == 7); substring 1 6 hex;
in
{
## USEFUL FUNCTIONS
# --------------------------------------------------------------------------------
# takes in a string like "#ff0044" and returns "ff0044" symbol
inherit nohash;
# --------------------------------------------------------------------------------
# This takes in something like "#ff0044" and returns "255,0,64"
hex-to-rgb-comma-string = hex:
with (slice-hex (nohash hex));
with builtins;
assert(isString hex);
"${toString (drune-to-255 r)},${toString (drune-to-255 g)},${toString (drune-to-255 b)}";
# --------------------------------------------------------------------------------
# This is useful if you have a float (like a transparency value) and want a drune representation of it
# So 0.0 -> "00" and 1.0 -> "FF"
float-to-drune = f: with builtins; assert(isFloat f); "${num-to-rune (floor((255*f) / 16))}${num-to-rune (floor(255*f) - (floor((255*f) / 16) * 16))}";
# --------------------------------------------------------------------------------
# Takes in hex and a float. 0.5 is +50% brightness and (-0.5) is -50% brightness.
# So "#ff0044": 0.3 -> "#ff0055"
alter-luminace-hex = hex: amount:
let
color-num = with (slice-hex (nohash hex)); { r = drune-to-255 r; g = drune-to-255 g; b = drune-to-255 b; };
alter = num: (num-to-drune (cap-255 (builtins.floor ((125 * amount) + (num * (1+amount))) )));
in
with color-num; "#${alter r}${alter g}${alter b}";
}

View File

@@ -30,7 +30,7 @@
home = { home = {
username = hyper.user; username = hyper.user;
homeDirectory = hyper.home; homeDirectory = hyper.home;
stateVersion = hyper.pkgs-version; stateVersion = hyper.main-pkgs-version;
}; };
xdg = { xdg = {
enable = true; enable = true;

View File

@@ -5,7 +5,7 @@ pkgs: with pkgs; [
git-crypt git-crypt
wget wget
curlHTTP3 curl
zip zip
unzip unzip
p7zip p7zip

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all;
{ {
systemd.timers."nx_cal_lec" = { systemd.timers."nx_cal_lec" = {
enable = false; enable = true;
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
timerConfig = { timerConfig = {
OnBootSec = "40m"; OnBootSec = "40m";

View File

@@ -3,7 +3,7 @@
enable = true; enable = true;
settings = rec { settings = rec {
hyprland = { hyprland = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5"; command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
user = hyper.user; user = hyper.user;
}; };
default_session = hyprland; default_session = hyprland;

View File

@@ -1,88 +1,14 @@
{ pkgs, ... }@all: with all; { pkgs, ... }@all: with all; {
{
# i18n.inputMethod = {
# type = "fcitx5";
# enable = true;
# fcitx5.addons = with pkgs; [
# fcitx5-gtk # alternatively, kdePackages.fcitx5-qt
# fcitx5-chinese-addons # table input method support
# fcitx5-nord # a color theme
# ];
# };
i18n.inputMethod = { i18n.inputMethod = {
enable = true; enable = true;
type = "fcitx5"; type = "fcitx5";
fcitx5.waylandFrontend = true; fcitx5 = {
fcitx5.addons = with pkgs; [ waylandFrontend = true;
fcitx5-gtk # alternatively, kdePackages.fcitx5-qt addons = with pkgs; [
fcitx5-chinese-addons # table input method support fcitx5-gtk
fcitx5-nord # a color theme kdePackages.fcitx5-chinese-addons
fcitx5-nord
]; ];
}; };
# i18n.inputMethod = { };
# enabled = "fcitx5";
# ignoreUserConfig = true;
# waylandFrontend = true;
# fcitx5 = {
# addons = with pkgs-unstable; [
# rime-data
# fcitx5-rime
# # Chinese
# fcitx5-chinese-addons
# fcitx5-table-extra
# fcitx5-pinyin-moegirl
# fcitx5-pinyin-zhwiki
# # Japanese
# # fcitx5-mozc
# ];
# settings = {
# globalOptions = {
# Hotkey = {
# # Enumerate when press trigger key repeatedly
# EnumerateWithTriggerKeys = "True";
# # Skip first input method while enumerating
# EnumerateSkipFirst = "False";
# };
# "Hotkey/EnumerateForwardKeys" = { "0" = "Control+space"; };
# "Hotkey/EnumerateBackwardKeys" = { "0" = "Control+Shift+space"; };
# "Hotkey/PrevPage" = { "0" = "Up"; };
# "Hotkey/NextPage" = { "0" = "Down"; };
# "Hotkey/PrevCandidate" = { "0" = "Shift+Tab"; };
# "Hotkey/NextCandidate" = { "0" = "Tab"; };
# Behavior = {
# ActiveByDefault = "False"; # Active By Default
# ShareInputState = "No"; # Share Input State
# PreeditEnabledByDefault = "True"; # Show preedit in application
# ShowInputMethodInformation = "True"; # Show Input Method Information when switch input method
# showInputMethodInformationWhenFocusIn = "False"; # Show Input Method Information when changing focus
# CompactInputMethodInformation = "True"; # Show compact input method information
# ShowFirstInputMethodInformation = "True"; # Show first input method information
# DefaultPageSize = "5"; # Default page size
# OverrideXkbOption = "False"; # Override Xkb Option
# PreloadInputMethod = "True"; # Preload input method to be used by default
# };
# };
# inputMethod = {
# "Groups/0" = {
# "Name" = "Default";
# "Default Layout" = "us";
# "DefaultIM" = "mozc";
# };
# "Groups/0/Items/0" = {
# "Name" = "keyboard-us";
# "Layout" = null;
# };
# "Groups/0/Items/1" = {
# "Name" = "mozc";
# "Layout" = null;
# };
# "GroupOrder" = {
# "0" = "Default";
# };
# };
# };
# };
# };
} }

View File

@@ -4,7 +4,7 @@
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-color-emoji
newcomputermodern newcomputermodern
atkinson-hyperlegible atkinson-hyperlegible
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono

View File

@@ -27,8 +27,6 @@
"hsmw-vpn-secret" = { path = "/etc/ipsec.d/hsmw.secret"; mode = "600"; }; "hsmw-vpn-secret" = { path = "/etc/ipsec.d/hsmw.secret"; mode = "600"; };
}; };
networking.networkmanager.enableStrongSwan = true;
services.strongswan = { services.strongswan = {
enable = true; enable = true;
setup = { setup = {

14
system-modules/nix.nix Normal file
View File

@@ -0,0 +1,14 @@
{ ... }: {
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [
"https://cache.nixos.org/"
"https://cache.nixos-cuda.org"
"https://nix-community.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
];
};
}

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }@all: with all; lib.mkIf hyper.nvidia.enable { { pkgs, ... }@all: with all; lib.mkIf hyper.nvidia.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
lshw lshw
glxinfo mesa-demos
(pkgs.writeShellScriptBin "nvidia-offload" '' (pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0

View File

@@ -26,7 +26,7 @@ let git-user = "git"; in
user = git-user; user = git-user;
appName = "NxGit"; appName = "NxGit";
stateDir = "/var/lib/gitea"; # default stateDir = "/var/lib/gitea"; # default
useWizard = false; # default # useWizard = false; # default
# camoHmacKeyFile = ; # camoHmacKeyFile = ;
database = { database = {
createDatabase = false; # default createDatabase = false; # default

View File

@@ -50,7 +50,7 @@
defaultSSLListenPort = 443; defaultSSLListenPort = 443;
enableQuicBPF = true; enableQuicBPF = true;
enableReload = true; enableReload = true;
package = pkgs.nginxQuic; package = pkgs.nginx;
proxyResolveWhileRunning = false; proxyResolveWhileRunning = false;
proxyTimeout = "20s"; proxyTimeout = "20s";
recommendedBrotliSettings = true; recommendedBrotliSettings = true;
@@ -58,7 +58,7 @@
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
recommendedZstdSettings = true; # recommendedZstdSettings = true;
serverTokens = false; serverTokens = false;
sslDhparam = config.sops.secrets."nx2site/dhparams.pem".path; sslDhparam = config.sops.secrets."nx2site/dhparams.pem".path;
sslProtocols = "TLSv1.2 TLSv1.3"; sslProtocols = "TLSv1.2 TLSv1.3";

View File

@@ -2,12 +2,9 @@
{ {
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
# home.packages = with pkgs; [
# via
# ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
via # via
qmk qmk
]; ];
services.udev.packages = [ pkgs.via ]; # services.udev.packages = [ pkgs.via ];
} }