From 85088bdd23b7006791f3d06935fd3c0bb94c6fdb Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Mon, 30 Sep 2024 10:06:37 -0700 Subject: [PATCH] bweh2 --- flake.lock | 469 +++++++++----------------------- flake.nix | 31 ++- hosts/desktop/configuration.nix | 135 +++++---- hosts/desktop/home.nix | 16 +- 4 files changed, 216 insertions(+), 435 deletions(-) diff --git a/flake.lock b/flake.lock index 9e8baf8..55b0f60 100644 --- a/flake.lock +++ b/flake.lock @@ -33,138 +33,6 @@ "type": "github" } }, - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "type": "github" - } - }, - "blocklist-hosts": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1726953087, - "narHash": "sha256-jAayFk25P1OpzrUj7p4CjFbv8KbfUD0RoKMoYJlZ8zM=", - "owner": "StevenBlack", - "repo": "hosts", - "rev": "74500a214cfdf819ae6feb7912839e9d826b5998", - "type": "github" - }, - "original": { - "owner": "StevenBlack", - "repo": "hosts", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -203,22 +71,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -234,7 +86,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -276,6 +128,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -290,9 +160,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1705309234, @@ -308,49 +178,10 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_4": { "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -365,9 +196,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -385,7 +216,7 @@ }, "foundryvtt": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1726638033, @@ -401,22 +232,6 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, "ghostty": { "inputs": { "nixpkgs-stable": "nixpkgs-stable", @@ -438,6 +253,22 @@ } }, "gitignore": { + "flake": false, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "zls", @@ -458,23 +289,6 @@ "type": "github" } }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "46.1", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -496,24 +310,21 @@ "type": "github" } }, - "home-manager_2": { + "hosts": { "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "lastModified": 1727457521, + "narHash": "sha256-2BsHujKUS3L78/BpQg3QJJxLnORHfn/wyU09zOo1T6U=", + "owner": "StevenBlack", + "repo": "hosts", + "rev": "2db6a9f1ce75f3da11310a1f75b675aaa1139c79", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "home-manager", + "owner": "StevenBlack", + "repo": "hosts", "type": "github" } }, @@ -554,7 +365,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -719,6 +530,26 @@ "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" } }, + "nix-options-search": { + "inputs": { + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1721325991, + "narHash": "sha256-eJ9nFrrbWystBX9EhHE3wou+1kqf+CjVeys12z7u3fs=", + "owner": "madsbv", + "repo": "nix-options-search", + "rev": "e7b9b6e4be12bfb5fb6792372f18470e3718027a", + "type": "github" + }, + "original": { + "owner": "madsbv", + "repo": "nix-options-search", + "type": "github" + } + }, "nix-update": { "inputs": { "flake-parts": "flake-parts", @@ -768,14 +599,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", - "path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source", - "type": "path" + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -843,18 +678,14 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", - "type": "github" + "lastModified": 0, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "path": "/nix/store/hiasfhl8f5yy88hcfbr3s8s4bm63wsjw-source", + "type": "path" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_3": { @@ -874,6 +705,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1726755586, "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", @@ -888,22 +735,6 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_6": { "locked": { "lastModified": 1708161998, @@ -938,18 +769,17 @@ }, "root": { "inputs": { - "blocklist-hosts": "blocklist-hosts", "darwin": "darwin", - "flake-utils": "flake-utils", "foundryvtt": "foundryvtt", "ghostty": "ghostty", "home-manager": "home-manager", + "hosts": "hosts", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", + "nix-options-search": "nix-options-search", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_3", - "stylix": "stylix", "zig": "zig_2", "zls": "zls" } @@ -975,36 +805,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-foot": "base16-foot", - "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", - "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726828291, - "narHash": "sha256-pGRPVVm7UXf+fx2NVpH6FFSWR9AynG6eoVlagaqH9i4=", - "owner": "danth", - "repo": "stylix", - "rev": "53bcceb4e46d0b3e8ae6434a7a6bcc3463092093", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1021,21 +821,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1050,6 +835,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1095,21 +895,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1175,7 +960,7 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "ghostty", "nixpkgs-stable" @@ -1197,8 +982,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_6", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "zls", "nixpkgs" @@ -1220,8 +1005,8 @@ }, "zig_2": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -1240,8 +1025,8 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_5", - "gitignore": "gitignore", + "flake-utils": "flake-utils_4", + "gitignore": "gitignore_2", "langref": "langref", "nixpkgs": "nixpkgs_7", "zig-overlay": "zig-overlay" diff --git a/flake.nix b/flake.nix index 26e597e..bbb6994 100644 --- a/flake.nix +++ b/flake.nix @@ -13,11 +13,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - stylix.url = "github:danth/stylix"; - blocklist-hosts = { + hosts = { url = "github:StevenBlack/hosts"; #flake = false; }; + hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; @@ -25,12 +25,11 @@ #flake = false; }; - flake-utils.url = "github:numtide/flake-utils"; - zig.url = "github:mitchellh/zig-overlay"; zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b"; foundryvtt.url = "github:reckenrode/nix-foundryvtt"; + ghostty = { url = "git+ssh://git@github.com/ghostty-org/ghostty"; }; @@ -39,15 +38,19 @@ url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nix-options-search = { + url = "github:madsbv/nix-options-search"; + }; }; outputs = { self, nixpkgs, nixpkgs-stable, + nix-options-search, home-manager, - stylix, darwin, - blocklist-hosts, + hosts, hyprland-plugins, zig, zls, @@ -58,14 +61,16 @@ overlays = [ inputs.zig.overlays.default ]; - inherit (nixpkgs) lib; in { nixosConfigurations = { nixos = lib.nixosSystem { modules = [ {nixpkgs.overlays = overlays;} - nixos-cosmic.nixosModules.default + hosts.nixosModule + { + networking.stevenBlackHosts.enable = true; + } ./hosts/desktop/configuration.nix home-manager.nixosModules.home-manager { @@ -75,7 +80,6 @@ users.nmarks = import ./hosts/desktop/home.nix; }; home-manager.extraSpecialArgs = { - inherit stylix; inherit hyprland-plugins; inherit zls; inherit ghostty; @@ -84,8 +88,6 @@ ]; specialArgs = { inherit inputs; - inherit stylix; - inherit blocklist-hosts; }; }; }; @@ -96,6 +98,10 @@ {nixpkgs.overlays = overlays;} ./hosts/laptop/configuration.nix home-manager.darwinModules.home-manager + hosts.nixosModule + { + networking.stevenBlackHosts.enable = true; + } { home-manager = { useGlobalPkgs = true; @@ -103,7 +109,6 @@ users.nmarks = import ./hosts/laptop/home.nix; }; home-manager.extraSpecialArgs = { - inherit stylix; inherit zls; inherit ghostty; }; @@ -112,8 +117,6 @@ ]; specialArgs = { inherit inputs; - inherit stylix; - inherit blocklist-hosts; inherit ghostty; }; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index e1ab123..9a9c566 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -25,76 +25,75 @@ ratbagd.enable = true; }; - systemd.timers.duckdns = { - wantedBy = ["timers.target"]; - timerConfig = { - OnBootSec = "5m"; - OnUnitActiveSec = "5m"; - Unit = "duckdns.service"; - }; - }; - programs.noisetorch.enable = true; - systemd.services.duckdns = { - enable = true; - script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -''; - serviceConfig = { - Type = "oneshot"; - User = "nmarks"; - }; - }; - - services.foundryvtt = { - enable = true; - hostName = "pathfinder2.duckdns.org"; - proxySSL = true; - proxyPort = 443; - package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11; - }; - - services.cloudflared = { - enable = true; - # user = "nmarks"; - # tunnels = { - # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = { - # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json"; - # default = "http_status:404"; - # }; - # }; - }; - - services.caddy = { - enable = true; - - # virtualHosts."10.154.1.147".extraConfig = '' - # tls internal - # reverse_proxy localhost:30000 - # encode zstd gzip - # ''; - - # virtualHosts."10.154.1.105".extraConfig = '' - # tls internal - # reverse_proxy localhost:30000 - # encode zstd gzip - # ''; - # - # virtualHosts."pathfinder2e.duckdns.org".extraConfig = '' - # reverse_proxy localhost:30000 - # encode zstd gzip - # ''; - virtualHosts."pathfinder2e.duckdns.org".extraConfig = '' - reverse_proxy localhost:30000 - ''; - - # extraConfig = '' - # pathfinder2e.duckdns.org { - # # PROXY ALL REQUEST TO PORT 30000 - # reverse_proxy localhost:30000 - # encode zstd gzip - # } - # ''; - }; + # systemd.timers.duckdns = { + # wantedBy = ["timers.target"]; + # timerConfig = { + # OnBootSec = "5m"; + # OnUnitActiveSec = "5m"; + # Unit = "duckdns.service"; + # }; + # }; + # systemd.services.duckdns = { + # enable = true; + # script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -''; + # serviceConfig = { + # Type = "oneshot"; + # User = "nmarks"; + # }; + # }; + # + # services.foundryvtt = { + # enable = true; + # hostName = "pathfinder2.duckdns.org"; + # proxySSL = true; + # proxyPort = 443; + # package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11; + # }; + # + # services.cloudflared = { + # enable = true; + # # user = "nmarks"; + # # tunnels = { + # # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = { + # # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json"; + # # default = "http_status:404"; + # # }; + # # }; + # }; + # + # services.caddy = { + # enable = true; + # + # # virtualHosts."10.154.1.147".extraConfig = '' + # # tls internal + # # reverse_proxy localhost:30000 + # # encode zstd gzip + # # ''; + # + # # virtualHosts."10.154.1.105".extraConfig = '' + # # tls internal + # # reverse_proxy localhost:30000 + # # encode zstd gzip + # # ''; + # # + # # virtualHosts."pathfinder2e.duckdns.org".extraConfig = '' + # # reverse_proxy localhost:30000 + # # encode zstd gzip + # # ''; + # virtualHosts."pathfinder2e.duckdns.org".extraConfig = '' + # reverse_proxy localhost:30000 + # ''; + # + # # extraConfig = '' + # # pathfinder2e.duckdns.org { + # # # PROXY ALL REQUEST TO PORT 30000 + # # reverse_proxy localhost:30000 + # # encode zstd gzip + # # } + # # ''; + # }; services.flatpak.enable = true; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index a1f6870..c8fe8df 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -4,6 +4,7 @@ pkgs, zls, ghostty, + nix-options-search, ... }: { # wayland.windowManager.hyprland = { @@ -111,7 +112,6 @@ dxvk_2 mangohud vulkan-tools - asdf-vm prismlauncher # for cmpm17 binwalk @@ -126,11 +126,6 @@ sl fallout-ce fallout2-ce - #CSE114 (Haskell stuff) - stack - (haskell-language-server.override {supportedGhcVersions = ["94" "947"];}) - haskell.compiler.ghc947 - ormolu #LSP + formatters/linters lua-language-server nil @@ -169,7 +164,7 @@ programs.kitty = { enable = true; - theme = "Catppuccin-Mocha"; + themeFile = "Catppuccin-Mocha"; extraConfig = "font_family Iosevka NF italic_font auto bold_italic_font auto @@ -188,12 +183,11 @@ } ]; shellAliases = { - hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks"; - sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks"; - full-update = "sys-update; hm-update"; + # hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks"; + # sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks"; + # full-update = "sys-update; hm-update"; reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; }; - shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish "; }; programs.hyfetch = {