diff --git a/flake.lock b/flake.lock index 128c0d5..32514a7 100644 --- a/flake.lock +++ b/flake.lock @@ -64,39 +64,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1725753098, - "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "blog": { "inputs": { "nixpkgs": "nixpkgs_2", @@ -439,7 +406,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -457,7 +424,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -475,7 +442,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -493,7 +460,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1694529238, @@ -643,35 +610,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, "hypridle": { "inputs": { "hyprlang": "hyprlang", @@ -695,62 +633,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_7", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1726071051, - "narHash": "sha256-eZPhLQ8DM8AsP+zM1KmUzxWQaiTpOUbFS1xeOyjgwvg=", - "ref": "refs/heads/main", - "rev": "8b9e385943d1a9fd0f8c6070fa1eae507ae26145", - "revCount": 5213, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -780,35 +662,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -834,56 +687,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1724966483, - "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "kb-gui": { "inputs": { "flake-utils": [ @@ -1351,7 +1154,7 @@ "resume": { "inputs": { "nixpkgs": "nixpkgs_9", - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1721842409, @@ -1374,7 +1177,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1726078997, @@ -1399,7 +1202,6 @@ "catppuccin": "catppuccin", "home-manager": "home-manager_2", "hypridle": "hypridle", - "hyprland": "hyprland", "kb-gui": "kb-gui", "lanzaboote": "lanzaboote", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -1410,7 +1212,7 @@ "rio-term": "rio-term", "snowfall-lib": "snowfall-lib", "spicetify-nix": "spicetify-nix", - "systems": "systems_14", + "systems": "systems_13", "waybar": "waybar" } }, @@ -1550,21 +1352,6 @@ } }, "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_12": { "flake": false, "locked": { "lastModified": 1681028828, @@ -1580,7 +1367,7 @@ "type": "github" } }, - "systems_13": { + "systems_12": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1595,7 +1382,7 @@ "type": "github" } }, - "systems_14": { + "systems_13": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1687,16 +1474,16 @@ }, "systems_7": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1772,36 +1559,6 @@ "repo": "Waybar", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726046979, - "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7f3ed41..a7df575 100644 --- a/flake.nix +++ b/flake.nix @@ -49,10 +49,10 @@ catppuccin.url = "github:catppuccin/nix"; - hyprland = { - url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # hyprland = { + # url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; kb-gui = { url = "github:zackartz/kb-gui"; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index b8eebec..f130caa 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -41,7 +41,7 @@ in { config = mkIf cfg.enable { wayland.windowManager.hyprland = { enable = true; - # xwayland.enable = true; + xwayland.enable = true; # package = inputs.hyprland.packages.${system}.default; systemd = { diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index ad4d736..de043aa 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -71,7 +71,8 @@ in { extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr - inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + # inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-hyprland pkgs.xwaylandvideobridge ]; }; diff --git a/modules/nixos/services/vpn/default.nix b/modules/nixos/services/vpn/default.nix index 16daff9..cb68d2c 100644 --- a/modules/nixos/services/vpn/default.nix +++ b/modules/nixos/services/vpn/default.nix @@ -21,7 +21,6 @@ in { work = { config = ''config /home/zoey/Downloads/zachary_myers.ovpn''; updateResolvConf = true; - extraArgs = ['''']; }; }; }; diff --git a/modules/nixos/ui/fonts/default.nix b/modules/nixos/ui/fonts/default.nix index 9c34d3a..e8f6b34 100644 --- a/modules/nixos/ui/fonts/default.nix +++ b/modules/nixos/ui/fonts/default.nix @@ -35,7 +35,6 @@ in { noto-fonts-emoji jetbrains-mono (nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];}) - custom.zed-fonts ]; enableDefaultPackages = false; @@ -48,7 +47,7 @@ in { "Iosevka" "Noto Color Emoji" ]; - sansSerif = ["Zed Sans" "Noto Color Emoji"]; + sansSerif = ["Iosevka" "Noto Color Emoji"]; serif = ["Noto Serif" "Noto Color Emoji"]; emoji = ["Noto Color Emoji"]; }; diff --git a/packages/zed-fonts/default.nix b/packages/zed-fonts/default.nix deleted file mode 100644 index b972d88..0000000 --- a/packages/zed-fonts/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ - buildNpmPackage, - fetchFromGitHub, - remarshal, - ttfautohint-nox, - nerd-font-patcher, - stdenv, - findutils, - lib, - darwin, - privateBuildPlan ? null, - extraParameters ? null, - ... -}: -buildNpmPackage rec { - version = "1.2.0"; - pname = "zed-mono"; - - src = fetchFromGitHub { - owner = "zackartz"; - repo = "zed-fonts"; - rev = "${version}"; - hash = "sha256-cGtkQ9BDY/nGUf81pwhOcEeLNyARHZMd9a++nw8CAE0="; - }; - - npmDepsHash = "sha256-M2GmTWEvNv485EdexDZoShuGeRmVvoGFV9EvQR3jE1c="; - - nativeBuildInputs = - [ - remarshal - ttfautohint-nox - nerd-font-patcher - findutils - ] - ++ lib.optionals stdenv.isDarwin [ - # libtool - darwin.cctools - ]; - - buildPlan = - if builtins.isAttrs privateBuildPlan - then builtins.toJSON {buildPlans.${pname} = privateBuildPlan;} - else privateBuildPlan; - - inherit extraParameters; - passAsFile = - ["extraParameters"] - ++ lib.optionals - (!(builtins.isString privateBuildPlan - && lib.hasPrefix builtins.storeDir privateBuildPlan)) ["buildPlan"]; - - configurePhase = '' - runHook preConfigure - ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' - remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml - ''} - ${lib.optionalString (builtins.isString privateBuildPlan - && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlanPath" private-build-plans.toml - ''} - ${lib.optionalString (builtins.isString privateBuildPlan - && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlan" private-build-plans.toml - ''} - ${lib.optionalString (extraParameters != null) '' - echo -e "\n" >> params/parameters.toml - cat "$extraParametersPath" >> params/parameters.toml - ''} - runHook postConfigure - ''; - - buildPhase = '' - export HOME=$TMPDIR - runHook preBuild - npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES --verbose=9 ttf::zed-mono - cd dist/zed-mono/ttf - find . -type f -name "*.ttf" | xargs -P $NIX_BUILD_CORES -I {} nerd-font-patcher -c -s {} - cd ../../../ - npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES --verbose=9 ttf::zed-sans - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - fontdir="$out/share/fonts/truetype" - install -d "$fontdir" - install "dist/zed-sans/ttf"/* "$fontdir" - install "dist/zed-mono/ttf"/* "$fontdir" - runHook postInstall - ''; - - enableParallelBuilding = true; - - # this is here because as of 2024-05-27 the offical build doesn't have good ligature support with kitty :/ - meta = with lib; { - homepage = "https://zed.dev"; - downloadPage = "https://github.com/zed-industries/zed-fonts/releases"; - description = "Fonts for Zed Editor, based on Iosevka (with Nerd Font Patches)"; - longDescription = '' - Zed Mono & Zed Sans are custom builds of Iosevka liscensed under the SIL Open Font License, Version 1.1. - - They are built for use in Zed. Zed Sans uses a quasi-proportional spacing to allow the font to still feel monospace while not having such wide gaps in a UI setting. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ - zackartz - ]; - }; -}