From 7a7d48a0c1cf5dbb2870649319f33b05fd9b8d27 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 26 Apr 2024 09:23:28 -0500 Subject: [PATCH] hyprland overlay accomplished what exactly? --- flake.lock | 247 +++++++++++++------ flake.nix | 12 +- hosts/othalan/system.nix | 7 +- modules/desktop/window-managers/hyprland.nix | 27 +- modules/languages/misc.nix | 12 +- 5 files changed, 204 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index 1e45201..aa59f6e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,7 @@ "nodes": { "f1multiviewer": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1712592932, @@ -60,11 +58,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -179,11 +177,11 @@ ] }, "locked": { - "lastModified": 1713214463, - "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -197,19 +195,18 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "nixpkgs": [ - "nixpkgs" - ], + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_2", "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713214647, - "narHash": "sha256-YWFPKrId5zGSQykdkRMyvCS7H8KwgRS6m5nwR8qkiko=", + "lastModified": 1714133690, + "narHash": "sha256-vnqz+kFcTQPO0AWPmI9P4j428P4EKRVFjWEamoNPoBU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "79a139c9495568f69dd995bce1ca579247a98a17", + "rev": "d9ec2785cb7f6493576232057752688e57925655", "type": "github" }, "original": { @@ -221,16 +218,14 @@ }, "hyprland-contrib": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712505318, - "narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=", + "lastModified": 1713780596, + "narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=", "owner": "hyprwm", "repo": "contrib", - "rev": "5870244b592c22558b658dbaf94f9e41afb0316f", + "rev": "110e6dc761d5c3d352574def3479a9c39dfc4358", "type": "github" }, "original": { @@ -289,16 +284,41 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713989318, + "narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "langref": { "flake": false, "locked": { - "narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=", + "narHash": "sha256-Kz+m9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4=", "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" }, "original": { "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" } }, "lib-aggregate": { @@ -307,11 +327,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1713105314, - "narHash": "sha256-X3URKbcgIy4UaQGrsy3DmY5x+fePQ5IYaa76YewoUE0=", + "lastModified": 1713701427, + "narHash": "sha256-v6z8hz/UDaC/rbnkH+hxGFUxlNyseVntRetVpSxLU6c=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "f347ed9a1cab12c27541ed4d173e2f2d5c9bc0bb", + "rev": "3b32a98eb3053f8c8ca55497d1881443ef2996e6", "type": "github" }, "original": { @@ -324,15 +344,15 @@ "inputs": { "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1705242886, - "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", + "lastModified": 1713858845, + "narHash": "sha256-StJq7Zy+/iVBUAKFzhHWlsirFucZ3gNtzXhAYXAsNnw=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", + "rev": "7b6640f2a10701bf0db16aff048070f400e8ea7c", "type": "github" }, "original": { @@ -350,11 +370,11 @@ ] }, "locked": { - "lastModified": 1701208414, - "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", "type": "github" }, "original": { @@ -370,11 +390,11 @@ ] }, "locked": { - "lastModified": 1713067146, - "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", + "lastModified": 1713869268, + "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", + "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", "type": "github" }, "original": { @@ -385,27 +405,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713254108, - "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1713055793, - "narHash": "sha256-vIrZQykYW32RnlI2lT/gCcB59BOIqqrAmPirBdiirrc=", + "lastModified": 1713660444, + "narHash": "sha256-2bVnrEGyWJhRNKspzfTJmVD/fsH9HQURD4cWpz79Ulw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "361d8a4f443bbfab20bd6d222f9022b8c6665906", + "rev": "6882347415e352cfc9c277cc01f73e0f5cb7b93c", "type": "github" }, "original": { @@ -419,16 +439,14 @@ "flake-compat": "flake-compat", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1713266011, - "narHash": "sha256-QTHblIaEflaqAAU+UMcSlDoMQ40Hyx4J7qWSiOJLgeU=", + "lastModified": 1714134515, + "narHash": "sha256-BJIMHy45EagFDqd9lSzfwaf2IOHK0AeJ1kmQBzPBbtE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "2ecdcd3d94dc14f00352628f4790ee15566414e2", + "rev": "92a8f2be2f3ca1ab278f7ed7410865135ee03c74", "type": "github" }, "original": { @@ -439,11 +457,59 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { @@ -453,6 +519,37 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1706063522, + "narHash": "sha256-o1m9en7ovSjyktXgX3n/6GJEwG06WYa/9Mfx5hTTf5g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95c1439b205d507f3cb88aae76e02cd6a01ac504", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, "pinix": { "inputs": { "nixpkgs": [ @@ -479,7 +576,7 @@ "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "pinix": "pinix", "stable": "stable", @@ -490,11 +587,11 @@ }, "stable": { "locked": { - "lastModified": 1713145326, - "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -573,11 +670,11 @@ ] }, "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", "type": "github" }, "original": { @@ -611,17 +708,17 @@ "wlroots": { "flake": false, "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" }, "original": { "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" } }, @@ -645,11 +742,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { @@ -668,11 +765,11 @@ ] }, "locked": { - "lastModified": 1712794997, - "narHash": "sha256-H1sVVagnlL6xmvSVELGMEAhvJHv4auAY3B97Oi2I8uo=", + "lastModified": 1714133353, + "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "9687044a467176bea9e3f0a972143bcbad5dae90", + "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba", "type": "github" }, "original": { @@ -684,9 +781,7 @@ "zig2nix": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1713576181, @@ -713,11 +808,11 @@ "zig-overlay": "zig-overlay" }, "locked": { - "lastModified": 1713110866, - "narHash": "sha256-ddSLREpgBq87dcbSisliSoSNqKl2x7kVf3E/tFumIXw=", + "lastModified": 1714140769, + "narHash": "sha256-lsHUbYKRrqPdM38kdjYmcwlw6hG6XoNLFR7FlMPWz+Y=", "owner": "zigtools", "repo": "zls", - "rev": "172c8f2ef81c95731d7bff6f69f8d497902fe999", + "rev": "e96503d9c11c061573fa68cc8aafa575138418a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a24d93b..9986621 100644 --- a/flake.nix +++ b/flake.nix @@ -4,18 +4,18 @@ outputs = inputs: (import ./lib inputs).oizysFlake; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; stable.url = "github:nixos/nixpkgs/nixos-23.11"; tsm.url = "github:daylinmorgan/tsm?dir=nix"; tsm.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland/main"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland-contrib.url = "github:hyprwm/contrib"; - hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; + # nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; pinix.url = "github:remi-dupre/pinix"; pinix.inputs.nixpkgs.follows = "nixpkgs"; @@ -24,13 +24,13 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; zig2nix.url = "github:Cloudef/zig2nix"; - zig2nix.inputs.nixpkgs.follows = "nixpkgs"; + # zig2nix.inputs.nixpkgs.follows = "nixpkgs"; zls.url = "github:zigtools/zls"; zls.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; - f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; + # f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; }; nixConfig = { diff --git a/hosts/othalan/system.nix b/hosts/othalan/system.nix index 34ce156..b20440b 100644 --- a/hosts/othalan/system.nix +++ b/hosts/othalan/system.nix @@ -33,6 +33,9 @@ in { runeKind = "ascii"; }; + networking.hostName = "othalan"; + time.timeZone = "US/Central"; + # catppuccin/tty move to "module" boot.kernelParams = [ "vt.default_red=30,243,166,249,137,245,148,186,88,243,166,249,137,245,148,166" @@ -40,8 +43,8 @@ in { "vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200" ]; - networking.hostName = "othalan"; - time.timeZone = "US/Central"; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest; + boot.loader = { systemd-boot = enabled diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix index 6e4ed6e..362cbd5 100644 --- a/modules/desktop/window-managers/hyprland.nix +++ b/modules/desktop/window-managers/hyprland.nix @@ -3,18 +3,23 @@ pkgs, config, mkOizysModule, + lib, ... -}: let - lock = pkgs.writeShellApplication { - name = "lock"; - runtimeInputs = with pkgs; [swaylock]; - text = '' - swaylock -c 1e1e2e - ''; - }; +}: +# let +# lock = pkgs.writeShellApplication { +# name = "lock"; +# runtimeInputs = with pkgs; [swaylock]; +# text = '' +# swaylock -c 1e1e2e +# ''; +# }; +let inherit (lib) enabled; in mkOizysModule config "hyprland" { - programs.hyprland.enable = true; + programs.hyprland = enabled // { + package = inputs.hyprland.packages.${pkgs.system}.default; + }; security.pam.services.swaylock = {}; # Optional, hint electron apps to use wayland: environment.sessionVariables.NIXOS_OZONE_WL = "1"; @@ -50,6 +55,8 @@ in nixpkgs.overlays = [ inputs.hyprland-contrib.overlays.default inputs.nixpkgs-wayland.overlay - inputs.hyprland.overlays.default + # when this was active I was forced to recompile VirtualBox myself, which would just fail to compile... + # Must have been one of the other non-hyprland packages modified in the overlay + # inputs.hyprland.overlays.default ]; } diff --git a/modules/languages/misc.nix b/modules/languages/misc.nix index c925449..e2cf5d4 100644 --- a/modules/languages/misc.nix +++ b/modules/languages/misc.nix @@ -8,11 +8,9 @@ cfg = config.oizys.languages; in { config = mkIfIn "misc" cfg { - environment.systemPackages = with pkgs; - [ - go - rustup - ]; - }; - + environment.systemPackages = with pkgs; [ + go + rustup + ]; + }; }