a
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
prompt=Meklēt...
|
prompt=Meklēt...
|
||||||
allow_images=true
|
allow_images=true
|
||||||
allow_markup=true
|
allow_markup=true
|
||||||
term=ghostty
|
term=kitty
|
||||||
dynamic_lines=true
|
dynamic_lines=true
|
||||||
normal_window=false
|
normal_window=false
|
||||||
insensitive=true
|
insensitive=true
|
||||||
|
|||||||
107
flake.lock
generated
107
flake.lock
generated
@@ -132,11 +132,11 @@
|
|||||||
"rev": "1d6e67feddff299e5a5a07305d91897bb98d8732",
|
"rev": "1d6e67feddff299e5a5a07305d91897bb98d8732",
|
||||||
"revCount": 1,
|
"revCount": 1,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.ocbwoy3.dev/kris/deltarune-grub-theme"
|
"url": "https://tangled.org/did:plc:s7cesz7cr6ybltaryy4meb6y/deltarune-grub-theme"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.ocbwoy3.dev/kris/deltarune-grub-theme"
|
"url": "https://tangled.org/did:plc:s7cesz7cr6ybltaryy4meb6y/deltarune-grub-theme"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"disko": {
|
"disko": {
|
||||||
@@ -348,29 +348,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ghostty": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"home-manager": "home-manager_2",
|
|
||||||
"nixpkgs": "nixpkgs_4",
|
|
||||||
"systems": "systems",
|
|
||||||
"zig": "zig",
|
|
||||||
"zon2nix": "zon2nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1774618114,
|
|
||||||
"narHash": "sha256-3/flZanNntwcVvkB1pGK/HY+elOnYZuTN6NN98JgO3Y=",
|
|
||||||
"owner": "ghostty-org",
|
|
||||||
"repo": "ghostty",
|
|
||||||
"rev": "b8b0896324d60582e23896cb23febe19c72126cd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ghostty-org",
|
|
||||||
"repo": "ghostty",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -1479,22 +1456,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_14": {
|
"nixpkgs_14": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1771419570,
|
|
||||||
"narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-25.11",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_15": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773389992,
|
"lastModified": 1773389992,
|
||||||
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
|
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
|
||||||
@@ -1645,11 +1606,11 @@
|
|||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774631252,
|
"lastModified": 1774687915,
|
||||||
"narHash": "sha256-SBPYPLuM+KSaauKsWa7sETRf26NT7LH0ilUw36V5nkA=",
|
"narHash": "sha256-cv2Yx6EAsDgbhhf3UbDR2zqEzVvZgFH2RtbvxzgyYlA=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "5836038ead139a0c54269ecde45cba262fb3a3db",
|
"rev": "ac5cf327c84ff5c8c929de73e352972ab7fe68b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1753,7 +1714,6 @@
|
|||||||
"chaotic": "chaotic",
|
"chaotic": "chaotic",
|
||||||
"deltarune-grub-theme": "deltarune-grub-theme",
|
"deltarune-grub-theme": "deltarune-grub-theme",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"ghostty": "ghostty",
|
|
||||||
"home-manager": "home-manager_3",
|
"home-manager": "home-manager_3",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprlock": "hyprlock",
|
"hyprlock": "hyprlock",
|
||||||
@@ -1767,7 +1727,6 @@
|
|||||||
"spacebar": "spacebar",
|
"spacebar": "spacebar",
|
||||||
"tangled": "tangled",
|
"tangled": "tangled",
|
||||||
"vscode-server": "vscode-server",
|
"vscode-server": "vscode-server",
|
||||||
"wafrn": "wafrn",
|
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1997,17 +1956,17 @@
|
|||||||
"sqlite-lib-src": "sqlite-lib-src"
|
"sqlite-lib-src": "sqlite-lib-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774607445,
|
"lastModified": 1774691944,
|
||||||
"narHash": "sha256-Iefcxr89SgQujiIXKGgX31H2J/aVznD9hBQXv+eNeWA=",
|
"narHash": "sha256-oZS+XQlxOHSmey93fd9q7F64bYDEG2Uxeivae1Vcjms=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "5a17af77bf13448e49a3b0b00cf93baa7821ce30",
|
"rev": "2677d2b115aceea71bc759f6f391972e34579e80",
|
||||||
"revCount": 2120,
|
"revCount": 2121,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://tangled.sh/tangled.sh/core"
|
"url": "https://tangled.org/did:plc:wshs7t2adsemcrrd4snkeqli/core"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://tangled.sh/tangled.sh/core"
|
"url": "https://tangled.org/did:plc:wshs7t2adsemcrrd4snkeqli/core"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vscode-server": {
|
"vscode-server": {
|
||||||
@@ -2029,42 +1988,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"wafrn": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_14",
|
|
||||||
"wafrn-src": "wafrn-src"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1771530828,
|
|
||||||
"narHash": "sha256-U9gTyZILNGjK4kbSKsR6xPGFV/sjvzDFRreDXWyg5hE=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "715d83e0a1730b2bb4e649941863ed67d964ad65",
|
|
||||||
"revCount": 11,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.ocbwoy3.dev/kris/wafrn-nix"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.ocbwoy3.dev/kris/wafrn-nix"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"wafrn-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1770394446,
|
|
||||||
"narHash": "sha256-yUGn0HjwEDJOLlwcNP+ZfCjU04x9Y6PkmeahdcEP23A=",
|
|
||||||
"ref": "main",
|
|
||||||
"rev": "01e89d8fd0ba56d5781e4671a54531563d1a46c6",
|
|
||||||
"revCount": 6083,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://codeberg.org/wafrn/wafrn"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"ref": "main",
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://codeberg.org/wafrn/wafrn"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"xdph": {
|
"xdph": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": [
|
"hyprland-protocols": [
|
||||||
@@ -2109,14 +2032,14 @@
|
|||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager_5",
|
"home-manager": "home-manager_5",
|
||||||
"nixpkgs": "nixpkgs_15"
|
"nixpkgs": "nixpkgs_14"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774605342,
|
"lastModified": 1774673612,
|
||||||
"narHash": "sha256-VEcy7N8TExxCsDem0SUsqJJlTcUm0y4vaSPYCghe5W8=",
|
"narHash": "sha256-z4SWAbnq3KMBxKiUTJcvve7ZoPC3KaNCLUe30F67K+4=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "4916e4d7ab444c544c3f36cc9fafe58cdb0f7237",
|
"rev": "660cf61b157f014f4e09f316da150e9ab1f6ea6a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
};
|
};
|
||||||
hyprlock.url = "github:hyprwm/hyprlock";
|
hyprlock.url = "github:hyprwm/hyprlock";
|
||||||
hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo";
|
hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo";
|
||||||
ghostty.url = "github:ghostty-org/ghostty";
|
|
||||||
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
||||||
quickshell = {
|
quickshell = {
|
||||||
url = "github:outfoxxed/quickshell";
|
url = "github:outfoxxed/quickshell";
|
||||||
@@ -29,8 +28,7 @@
|
|||||||
nvf.url = "github:notashelf/nvf";
|
nvf.url = "github:notashelf/nvf";
|
||||||
|
|
||||||
# Extras
|
# Extras
|
||||||
tangled.url = "git+https://tangled.sh/tangled.sh/core";
|
tangled.url = "git+https://tangled.org/did:plc:wshs7t2adsemcrrd4snkeqli/core";
|
||||||
wafrn.url = "git+https://git.ocbwoy3.dev/kris/wafrn-nix";
|
|
||||||
vscode-server.url = "github:nix-community/nixos-vscode-server";
|
vscode-server.url = "github:nix-community/nixos-vscode-server";
|
||||||
spacebar = {
|
spacebar = {
|
||||||
url = "github:spacebarchat/server";
|
url = "github:spacebarchat/server";
|
||||||
@@ -40,7 +38,7 @@
|
|||||||
# slop
|
# slop
|
||||||
openclaw.url = "github:openclaw/nix-openclaw";
|
openclaw.url = "github:openclaw/nix-openclaw";
|
||||||
deltarune-grub-theme = {
|
deltarune-grub-theme = {
|
||||||
url = "git+https://git.ocbwoy3.dev/kris/deltarune-grub-theme";
|
url = "git+https://tangled.org/did:plc:s7cesz7cr6ybltaryy4meb6y/deltarune-grub-theme";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -85,7 +83,6 @@
|
|||||||
modules = [
|
modules = [
|
||||||
inputs.catppuccin.nixosModules.catppuccin
|
inputs.catppuccin.nixosModules.catppuccin
|
||||||
inputs.tangled.nixosModules.knot
|
inputs.tangled.nixosModules.knot
|
||||||
inputs.wafrn.nixosModules.default
|
|
||||||
inputs.tangled.nixosModules.spindle
|
inputs.tangled.nixosModules.spindle
|
||||||
inputs.vscode-server.nixosModules.default
|
inputs.vscode-server.nixosModules.default
|
||||||
inputs.chaotic.nixosModules.nyx-cache
|
inputs.chaotic.nixosModules.nyx-cache
|
||||||
|
|||||||
@@ -129,7 +129,6 @@ in {
|
|||||||
kdePackages.qt6ct
|
kdePackages.qt6ct
|
||||||
hyfetch
|
hyfetch
|
||||||
kitty
|
kitty
|
||||||
inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty
|
|
||||||
];
|
];
|
||||||
|
|
||||||
qt.enable = true;
|
qt.enable = true;
|
||||||
@@ -145,10 +144,9 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# environment.variables.XDG_TERMINAL = "${inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty}/bin/ghostty";
|
|
||||||
# environment.variables.XDG_SYSTEM_MONITOR = "${pkgs.htop}/bin/htop";
|
# environment.variables.XDG_SYSTEM_MONITOR = "${pkgs.htop}/bin/htop";
|
||||||
|
|
||||||
environment.variables.XDG_TERMINAL = "ghostty";
|
environment.variables.XDG_TERMINAL = "kitty";
|
||||||
environment.variables.XDG_SYSTEM_MONITOR = "htop";
|
environment.variables.XDG_SYSTEM_MONITOR = "htop";
|
||||||
|
|
||||||
environment.variables.GTK_USE_PORTAL = "1";
|
environment.variables.GTK_USE_PORTAL = "1";
|
||||||
@@ -253,11 +251,6 @@ in {
|
|||||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dotfile_deps/DotfilesFont.otf";
|
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dotfile_deps/DotfilesFont.otf";
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file.".config/ghostty" = {
|
|
||||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/ghostty";
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".config/wlogout" = {
|
home.file.".config/wlogout" = {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wlogout";
|
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wlogout";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ in
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./modules/atproto-pds.nix
|
./modules/atproto-pds.nix
|
||||||
./modules/wafrn.nix
|
|
||||||
./modules/cloudflare.nix
|
./modules/cloudflare.nix
|
||||||
./modules/tangled.nix
|
./modules/tangled.nix
|
||||||
../../modules/force.nix
|
../../modules/force.nix
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
# DONT ENABLE YET!!
|
|
||||||
services.wafrn = {
|
|
||||||
enable = false;
|
|
||||||
stateDir = "/var/lib/wafrn";
|
|
||||||
secretsFile = "/private/wafrn/secrets.env";
|
|
||||||
caddyConfigDir = "/private/wafrn/caddy";
|
|
||||||
|
|
||||||
# cloudflared doesnt need https
|
|
||||||
httpPort = 6767;
|
|
||||||
httpsPort = null;
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
DOMAIN_NAME = "cyberworld.darkworld.download";
|
|
||||||
CACHE_DOMAIN = "cyberworld-cache.darkworld.download";
|
|
||||||
MEDIA_DOMAIN = "cyberworld-media.darkworld.download";
|
|
||||||
FRONTEND_MEDIA_URL = "https://cyberworld-media.darkworld.download";
|
|
||||||
FRONTEND_CACHE_URL = "https://cyberworld-cache.darkworld.download/api/cache?media=";
|
|
||||||
FRONTEND_FQDN_URL = "https://cyberworld.darkworld.download";
|
|
||||||
ACME_EMAIL = "kris@darkworld.download";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -13,18 +13,15 @@
|
|||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://hyprland.cachix.org"
|
"https://hyprland.cachix.org"
|
||||||
"https://ghostty.cachix.org"
|
|
||||||
"https://wrangler.cachix.org"
|
"https://wrangler.cachix.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-substituters = [
|
trusted-substituters = [
|
||||||
"https://hyprland.cachix.org"
|
"https://hyprland.cachix.org"
|
||||||
"https://ghostty.cachix.org"
|
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||||
"ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
|
|
||||||
"wrangler.cachix.org-1:N/FIcG2qBQcolSpklb2IMDbsfjZKWg+ctxx0mSMXdSs="
|
"wrangler.cachix.org-1:N/FIcG2qBQcolSpklb2IMDbsfjZKWg+ctxx0mSMXdSs="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
"z /private/AT\x20Protocol 0700 root root -"
|
"z /private/AT\x20Protocol 0700 root root -"
|
||||||
"z /private/cloudflared 0700 root root -"
|
"z /private/cloudflared 0700 root root -"
|
||||||
"z /private/cloudflared.pem 0600 root root -"
|
"z /private/cloudflared.pem 0600 root root -"
|
||||||
"z /private/wafrn 0700 root root -"
|
|
||||||
"z /private/tangled.env 0600 root root -"
|
"z /private/tangled.env 0600 root root -"
|
||||||
"z /private/vaultwarden 0700 root root -"
|
"z /private/vaultwarden 0700 root root -"
|
||||||
"d /private/zipline 0700 root root -"
|
"d /private/zipline 0700 root root -"
|
||||||
|
|||||||
Reference in New Issue
Block a user