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

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2026-02-10 08:47:43 +00:00
20 changed files with 3383 additions and 130 deletions

View File

@@ -48,6 +48,7 @@
./system-modules/postgres.nix ./system-modules/postgres.nix
./system-modules/nx2site/proxy.nix ./system-modules/nx2site/proxy.nix
./system-modules/nx2site/audiobookshelf.nix ./system-modules/nx2site/audiobookshelf.nix
# ./system-modules/nx2site/baikal.nix
./system-modules/nx2site/copyparty.nix ./system-modules/nx2site/copyparty.nix
./system-modules/nx2site/gitea.nix ./system-modules/nx2site/gitea.nix
./system-modules/nx2site/open-web-calendar.nix ./system-modules/nx2site/open-web-calendar.nix
@@ -63,6 +64,7 @@
system.stateVersion = hyper.main-pkgs-version; system.stateVersion = hyper.main-pkgs-version;
programs.nix-ld.enable = true;
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

@@ -27,15 +27,15 @@
}, },
"NxNORTH": { "NxNORTH": {
"base": { "base": {
"foreground": "#ccd6fe", "foreground": "#e7ccfe",
"background": "#000519" "background": "#0d0019"
}, },
"to_alter": { "to_alter": {
"accent": "#325dff", "accent": "#9f35fc",
"secondary": "#ff3233", "secondary": "#324cff",
"tertiary": "#3cff32", "tertiary": "#4a62e7",
"special": "#ffd331", "special": "#91fc34",
"weird": "#ff31e5" "weird": "#fc344f"
} }
}, },
"NxDCS": { "NxDCS": {

116
flake.lock generated
View File

@@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767024902, "lastModified": 1769428758,
"narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1768172937, "lastModified": 1769889994,
"narHash": "sha256-abU6yVB1dNW3fuUpXb5fakyY3JAWJdJSUbuM+LnqH2A=", "narHash": "sha256-uEn3WcpPHe3sMJMgIJ0XW3f4/+TRzZpNgv4vu5/gjmA=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "9d223d6ca7c49f57dc8b31a511f4f3ee975f2653", "rev": "9b436eb52e5cfe7a0a8e59dd9f1a37351f3a2abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -102,11 +102,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765121682, "lastModified": 1767039857,
"narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -220,11 +220,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767910483, "lastModified": 1769580047,
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766946335, "lastModified": 1769284023,
"narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "4af02a3925b454deb1c36603843da528b67ded6c", "rev": "13c536659d46893596412d180449353a900a1d31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -330,11 +330,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1768144432, "lastModified": 1769965155,
"narHash": "sha256-lLV0egdN9VF6BjhG6GVEVMviFuM05XCv35YNsfLzS9w=", "narHash": "sha256-SNj94JmMJ0duRNaZqThIky1bVcT3EJqwGFvYN7ZI+g0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "fbf421df889ceff3bac08a9f4b9493def5eecc4d", "rev": "a0ec2e4daf8e508761f6bc53fc163fbb92ac7aa1",
"revCount": 6805, "revCount": 6857,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -432,11 +432,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764612430, "lastModified": 1767983607,
"narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "0d00dc118981531aa731150b6ea551ef037acddd", "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -563,11 +563,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767473322, "lastModified": 1769202094,
"narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwire", "repo": "hyprwire",
"rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -657,11 +657,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1765841014, "lastModified": 1769217863,
"narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", "rev": "38a5250e57f583662eac3b944830e4b9e169e965",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -720,11 +720,11 @@
}, },
"nixpkgs-latest": { "nixpkgs-latest": {
"locked": { "locked": {
"lastModified": 1768173486, "lastModified": 1769978241,
"narHash": "sha256-pZhr2gYGPQeL3DaI1oQlqeI7wUE12pf258LLUMgcWSU=", "narHash": "sha256-VSbH5Ot7yuZxy/LOvbLo52+i2xnDl01tmMqfjTQM07I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb91fd6650df525625bcf15e7cab3ad50f980c7b", "rev": "149597f1631fffdeb1ff8fe3b6822615821ee562",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -752,11 +752,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1768127708, "lastModified": 1769789167,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -783,11 +783,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767379071, "lastModified": 1769461804,
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fb7944c166a3b630f177938e478f0378e64ce108", "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -815,11 +815,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1765472234, "lastModified": 1768564909,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -831,11 +831,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1768028080, "lastModified": 1769900590,
"narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d03088749a110d52a4739348f39a63f84bb0be14", "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -846,11 +846,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1763806073, "lastModified": 1768875095,
"narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "878e468e02bfabeda08c79250f7ad583037f2227", "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -924,11 +924,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767281941, "lastModified": 1769069492,
"narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1010,11 +1010,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763952169, "lastModified": 1769091129,
"narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=", "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ab726555a9a72e6dc80649809147823a813fa95b", "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1046,11 +1046,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768104471, "lastModified": 1769921679,
"narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1137,11 +1137,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1768129250, "lastModified": 1769971982,
"narHash": "sha256-jsccfsJpyvkZ8dUMR4rS141vnmHT3qh6HtnP+jE2qq4=", "narHash": "sha256-dc8lG9CxtrIk+tOsQx8TJKULQBG27Hoio4O4M/6CxFM=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "41e5717930141c574442ecc53bd4db5f96188d50", "rev": "6757fed5aa82bfdcd5ecd52e8f374dc286220cc0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -36,7 +36,7 @@
nixosConfigurations = let nixosConfigurations = let
make-nixos-system = host: let make-nixos-system = host: let
hyper = get-hyper host; hyper = get-hyper host;
rice = get-rice hyeper; rice = get-rice hyper;
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {
pkgs = get-pkgs hyper; pkgs = get-pkgs hyper;
modules = [ ./configuration.nix ]; modules = [ ./configuration.nix ];

Binary file not shown.

View File

@@ -65,7 +65,8 @@ in /* css */ ''
background : linear-gradient(180deg,rgba(${f secondary.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${f accent.dark}, ${builtins.toString rice.transparency}) 100%) !important; background : linear-gradient(180deg,rgba(${f secondary.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${f accent.dark}, ${builtins.toString rice.transparency}) 100%) !important;
} }
.tabbrowser-tab[selected="true"] { .tabbrowser-tab[selected="true"], .tab-text[selected=""],
.tab-close-button[selected=""] {
color: ${background} !important; color: ${background} !important;
} }
hbox#browser { hbox#browser {

View File

@@ -39,6 +39,9 @@ in /* css */ ''
body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree, #flex-left-nav-container { body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree, #flex-left-nav-container {
background-color: transparent !important; background-color: transparent !important;
} }
#search-dropdown-results-container {
background: rgba(${f background},0.8) !important;
}
#main-content { #main-content {
background-color: rgba(${f background},0.5)!important; background-color: rgba(${f background},0.5)!important;
} }

View File

@@ -96,7 +96,9 @@
interactiveShellInit = /* fish */ '' interactiveShellInit = /* fish */ ''
set -g fish_greeting set -g fish_greeting
if not set -q IN_NIX_SHELL if not set -q IN_NIX_SHELL
if set -q SESSION_FROM_DE if set -q SESSION_FROM_DE; or set -q SESSION_CLONED_FROM_YAZI
set -e SESSION_FROM_DE
set -e SESSION_CLONED_FROM_YAZI
set tmp (mktemp -t "yazi-cwd.XXXXX") set tmp (mktemp -t "yazi-cwd.XXXXX")
yazi --cwd-file="$tmp" ~ yazi --cwd-file="$tmp" ~
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
@@ -105,7 +107,6 @@
rm -f -- "$tmp" rm -f -- "$tmp"
end end
nxfetch nxfetch
set -e SESSION_FROM_DE
end end
''; '';
functions = { functions = {
@@ -115,10 +116,21 @@
''; '';
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.isPersonal) '' in pkgs.lib.mkIf (hyper.isPersonal) /* fish */ ''
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}
''; '';
nx_yazi_into_fish = /* fish */ ''
set tmp (mktemp -t "yazi-cwd.XXXXX")
echo "$PWD" > "$tmp"
yazi --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
builtin cd -- "$cwd"
end
rm -f "$tmp"
set -g SESSION_CLONED_FROM_YAZI TRUE
'';
# gpg = ''; # gpg = '';
# set bold \e[1m # set bold \e[1m
# set green \e[32m # set green \e[32m

View File

@@ -5,6 +5,7 @@
package = pkgs.ghostty; package = pkgs.ghostty;
settings = with rice.color; { settings = with rice.color; {
background = background; background = background;
window-padding-color = "extend";
background-opacity = builtins.toString rice.transparency; background-opacity = builtins.toString rice.transparency;
clipboard-paste-protection = false; clipboard-paste-protection = false;
clipboard-read = "allow"; clipboard-read = "allow";

View File

@@ -305,31 +305,40 @@
"constant" = accent.bright; "constant" = accent.bright;
"constant.character.escape" = special.bright; "constant.character.escape" = special.bright;
"constant.numeric" = foreground; "constant.numeric" = foreground;
"constructor" = weird.base; "constructor" = secondary.bright;
"debug" = yellow.base; "debug" = yellow.base;
"diagnostic.modifiers" = [ "underline" ]; "diagnostic.modifiers" = [ "underline" ];
"diff.delta" = subtle.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" = negative.base;
"function" = secondary.bright; "function" = secondary.bright;
"hint" = tertiary.bright; "hint" = tertiary.bright;
"info" = foreground; "info" = foreground;
"keyword" = special.base; "keyword" = {
"keyword.modifiers" = [ "italic" ]; fg = special.base;
modifiers = [ "bold" ];
};
"label" = foreground; "label" = foreground;
"namespace" = weird.bright; "namespace" = weird.bright;
"operator" = foreground; "operator" = foreground;
"special" = special.base; "special" = special.base;
"string" = secondary.bright; "string" = secondary.bright;
"type" = red.base; "type" = {
"variable" = accent.base; fg = tertiary.base;
"variableother.member" = foreground; };
"warning" = red.base; "variable" = { fg = accent.base; };
"variable.builtin" = { fg = accent.base; bg = subtle.darker; };
"variable.parameter" = { fg = accent.base; bg = accent.darker; };
"warning" = yellow.base;
"markup.heading" = accent.base; "markup.heading" = {
fg = accent.base;
bg = accent.darker;
modifiers = [ "bold" ];
};
"markup.bold" = { "markup.bold" = {
fg = tertiary.bright; fg = secondary.bright;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
}; };
"italic" = { "italic" = {
@@ -339,7 +348,7 @@
"markup.linktext" = accent.base; "markup.linktext" = accent.base;
"markup.linkurl" = { "markup.linkurl" = {
fg = tertiary.dark; fg = tertiary.dark;
modifiers = [ "underlined" ]; underline.style = "line";
}; };
"markup.list" = accent.bright; "markup.list" = accent.bright;
"markup.quote" = weird.bright; "markup.quote" = weird.bright;
@@ -356,7 +365,7 @@
}; };
"ui.bufferline" = { # the top line ("tab"-line) "ui.bufferline" = { # the top line ("tab"-line)
fg = accent.base; fg = accent.base;
bg = black.base; bg = accent.darker;
}; };
"ui.bufferline.active" = { # the active "tab" "ui.bufferline.active" = { # the active "tab"
fg = background; fg = background;
@@ -368,22 +377,22 @@
modifiers = [ "reversed" ]; modifiers = [ "reversed" ];
}; };
"ui.cursorline.primary" = { # the line on which the cursor is on "ui.cursorline.primary" = { # the line on which the cursor is on
bg = black.base; bg = secondary.darker;
}; };
"ui.cursor.match" = { # Matching bracket etc. "ui.cursor.match" = { # Matching bracket etc.
bg = green.dark; bg = special.dark;
modifiers = [ ]; modifiers = [ ];
}; };
"ui.gutter" = { "ui.gutter" = {
bg = black.base; bg = accent.darker;
}; };
"ui.help" = { "ui.help" = {
fg = green.base; fg = accent.base;
bg = black.base; bg = accent.darker;
}; };
"ui.linenr" = { "ui.linenr" = {
fg = white.dark; fg = accent.bright;
bg = black.base; bg = accent.darker;
}; };
"ui.linenr.selected" = { "ui.linenr.selected" = {
fg = accent.bright; fg = accent.bright;
@@ -391,18 +400,18 @@
}; };
"ui.menu" = { "ui.menu" = {
fg = accent.base; fg = accent.base;
bg = black.base; bg = accent.darker;
}; };
"ui.menu.scroll" = { "ui.menu.scroll" = {
fg = yellow.dark; fg = subtle.base;
bg = background; bg = background;
}; };
"ui.menu.selected" = { "ui.menu.selected" = {
fg = red.base; fg = secondary.bright;
bg = blue.dark; bg = secondary.darker;
}; };
"ui.popup" = { "ui.popup" = {
bg = black.base; bg = accent.darker;
}; };
"ui.selection" = { "ui.selection" = {
bg = accent.dark; bg = accent.dark;
@@ -412,11 +421,11 @@
}; };
"ui.statusline" = { "ui.statusline" = {
fg = accent.bright; fg = accent.bright;
bg = black.base; bg = accent.darker;
}; };
"ui.statusline.inactive" = { "ui.statusline.inactive" = {
fg = red.bright; fg = secondary.bright;
bg = red.dark; bg = secondary.dark;
}; };
"ui.statusline.insert" = { "ui.statusline.insert" = {
fg = green.bright; fg = green.bright;
@@ -433,7 +442,7 @@
"ui.text" = foreground; "ui.text" = foreground;
"ui.text.focus" = accent.base; "ui.text.focus" = accent.base;
"ui.virtual.indent-guide" = { "ui.virtual.indent-guide" = {
fg = black.bright; fg = subtle.dark;
}; };
"ui.virtual.inlay-hint" = { "ui.virtual.inlay-hint" = {
fg = subtle.base; fg = subtle.base;
@@ -444,12 +453,12 @@
}; };
"ui.virtual.jump-label" = { "ui.virtual.jump-label" = {
fg = special.base; fg = special.base;
underline = { bg = special.dark;
style = "dotted"; underline.style = "dotted";
}; modifiers = [ "bold" ];
}; };
"ui.window" = { "ui.window" = {
bg = black.base; bg = accent.darker;
}; };
}; };
}; };

View File

@@ -161,6 +161,8 @@ in {
dim_strength = "0.2"; dim_strength = "0.2";
dim_around = "0.8"; dim_around = "0.8";
# screen_shader = "/home/nx2/.config/hypr/shaders/e.glsl";
blur = { blur = {
enabled = true; enabled = true;
size = "2"; size = "2";
@@ -286,6 +288,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)$"
]; ];
@@ -376,7 +379,7 @@ in {
# "SUPER, T, exec, alacritty" # "SUPER, T, exec, alacritty"
# "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
"SUPER, T, exec, SESSION_FROM_DE=TRUE ${terminal}" "SUPER, T, exec, SESSION_FROM_DE=TRUE ${terminal}"
"SUPER SHIFT, T, exec, ${terminal-exec}'ssh nxace'" ''SUPER SHIFT, T, exec, ${terminal-exec}'echo -e "\\e]11;#${rice.color.secondary.darker}\\e\\\\" && ssh nxace' '' # yes this is a double hash.
"SUPER, Z, exec, zathura" "SUPER, Z, exec, zathura"
"SUPER, U, exec, [tile] thunderbird " "SUPER, U, exec, [tile] thunderbird "
"SUPER, I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'" "SUPER, I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'"

View File

@@ -0,0 +1,5 @@
{ pkgs, ... }@all: with all; {
home.packages = with pkgs; [
solaar
];
}

View File

@@ -36,6 +36,6 @@
tldr tldr
w3m w3m
which which
yt-dlp unstable.yt-dlp
]; ];
} }

View File

@@ -163,6 +163,7 @@ in {
# Magic # Magic
{ on = "<C-h>"; run = "shell 'hx .' --block"; desc = "Open current directoy in Helix"; } { 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"; } { on = "<C-g>"; run = "shell 'lazygit' --block"; desc = "Open current directoy in Lazygit"; }
{ on = "<C-y>"; run = ''shell 'ghostty --command="fish -C nx_yazi_into_fish"' --orphan ''; desc = "Open current directoy in a new ghostty window"; }
]; ];
tasks.keymap = [ tasks.keymap = [
# Task # Task
@@ -360,8 +361,8 @@ in {
}; };
pick = { pick = {
border = { fg = border; }; border = { fg = border; };
active = { fg = accent.base; }; active = { fg = accent.bright; };
inactive = { fg = subtle.base; }; inactive = { fg = subtle.bright; };
}; };
status = { status = {
# sep_right = { open = ""; close = ""; }; # sep_right = { open = ""; close = ""; };
@@ -379,7 +380,7 @@ in {
indicator = { # your "cursor" indicator = { # your "cursor"
parent = { fg = secondary.darker; bg = secondary.base; }; parent = { fg = secondary.darker; bg = secondary.base; };
current = { fg = accent.darker; bg = accent.base; }; current = { fg = accent.darker; bg = accent.base; };
preview = { fg = secondary.base; bg = secondary.dark; }; preview = { fg = secondary.base; bg = secondary.darker; };
# padding = { open = " "; close = " "; }; # padding = { open = " "; close = " "; };
}; };
cmp = { cmp = {
@@ -403,8 +404,8 @@ in {
}; };
tasks = { tasks = {
border = { fg = border2; }; border = { fg = border2; };
title = {}; title = { fg = accent.base; bold = true; };
hovered = { underline = true; }; hovered = { fg = accent.bright; };
}; };
which = { which = {
mask = { bg = black.base; }; mask = { bg = black.base; };
@@ -478,7 +479,7 @@ in {
force = true; force = true;
text = '' text = ''
[filechooser] [filechooser]
cmd=/home/nx2/wrapper.sh cmd=${tfc}/share/xdg-desktop-portal-termfilechooser/yazi-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

View File

@@ -26,6 +26,7 @@
./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/logitech.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

View File

@@ -3,6 +3,7 @@
variables = { variables = {
EDITOR = "hx"; EDITOR = "hx";
VISUAL = "hx"; VISUAL = "hx";
TERMINAL = "ghostty";
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
helix helix

View File

@@ -0,0 +1,22 @@
{ pkgs, ... }@all: with all; {
services.baikal = {
enable = true;
# pool =
user = "baikal";
group = "baikal";
package = pkgs.php.buildComposerProject2 (finalAttrs: {
pname = "baikal";
version = "0.10.1";
src = pkgs.fetchFromGitHub {
owner = "sabre-io";
repo = "Baikal";
tag = "0.10.1";
hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04=";
};
# It doesn't provide a composer.lock file, we have to generate manually.
composerLock = ./composer.lock;
vendorHash = "sha256-dYg7cULL4gquR5EenA0lD9ZC9Ge4qNwFFDNhELKgSso=";
});
virtualHost = "baikal.${hyper.domain}";
};
}

3208
system-modules/nx2site/composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -192,6 +192,10 @@
# proxyWebsockets = true; # proxyWebsockets = true;
# }; }; # }; };
# }; # };
# "baikal.${hyper.domain}" = {
# forceSSL = true;
# enableACME = true;
# };
"file.${hyper.domain}" = { # copyparty "file.${hyper.domain}" = { # copyparty
listen = dl; listen = dl;
forceSSL = true; forceSSL = true;

View File

@@ -1,20 +0,0 @@
{ pkgs, ... }@all: with all;
{
environment.systemPackages = [
(pkgs.mkYarnPackage {
name = "rallly";
src = pkgs.fetchFromGitHub {
owner = "lukevella";
repo = "rallly";
rev = "v3.11.2";
hash = "sha256-ej6Y0ouiheoH6dSBWsSIW6qt9UvsLh9ODDQA5Fqt3zs=";
};
packageJson = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
# patchPhase = /* shell */ ''
# cp ........ ?
# '';
})
];
}