From 6f0028d75e4023cfe1d36a63ad3f516b623d1176 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Sat, 31 Dec 2022 13:01:38 +0100 Subject: [PATCH] Update flake --- flake.lock | 226 +++++++++++++++++++++++++++++++++++++++-------- flake.nix | 8 ++ hosts/miku.nix | 11 ++- lib/mkSystem.nix | 4 + 4 files changed, 209 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 167cf2c..b70680a 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1668167903, - "narHash": "sha256-5OENaesVk94meyiaDFgxtr4TTuAg52baVHXOnXL98vI=", + "lastModified": 1671818956, + "narHash": "sha256-+jt1dHKfxrWWHN3cz4mAW0zA57AQOXDgoTyz3nX6TK0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7b58afb8604c9d53fe11bfb76e2ce903cb658b66", + "rev": "d89f91c7c5ba124348e097c45f1bf8882f5c60be", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667981810, - "narHash": "sha256-p27zd5M+OkfND46gzbGkaHlNBZsYe95M48OJuFeuuSY=", + "lastModified": 1671786159, + "narHash": "sha256-Aeh1ZlQoeRH1zXGHgNA1s/SoReRJeP9BEMvay23catk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335", + "rev": "eb9ff9556d60f9763aac88de7a50b1a1c7a1e235", "type": "github" }, "original": { @@ -210,19 +210,20 @@ "nixpkgs": [ "ostylk-home", "pkg-stable" - ] + ], + "utils": "utils_3" }, "locked": { - "lastModified": 1656169755, - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "lastModified": 1669992734, + "narHash": "sha256-392j/25MF9IHssvGApM454fAkQ8sFCqaf+24cuCImD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", + "rev": "8f26dec249deb2ad2d53eb3f5a0d558620035642", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -233,7 +234,7 @@ "ostylk-home", "pkg-unstable" ], - "utils": "utils_3" + "utils": "utils_4" }, "locked": { "lastModified": 1665655007, @@ -250,6 +251,98 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "nixpkgs": [ + "nixpkgs" + ], + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1671724331, + "narHash": "sha256-3LmSPx6/8xp06L/QaCwkxn804gJ3QaSsZKY3kiCIHNE=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "e6cbb6072ba0cfc2ec4ad22e6266caa5d134be26", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "flake": false, + "locked": { + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "flake": false, + "locked": { + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_3": { + "flake": false, + "locked": { + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-xdg": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671300042, + "narHash": "sha256-8zapwbbaC+5RtaXVDcqf9X5b/yd/gNg+clF/LZdt+y4=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "45bbf9a3b20b2c97819e2379a10fe351258e35b3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1640808801, @@ -380,11 +473,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1668157555, - "narHash": "sha256-s5rt2FSmV4PWt89rjt4cvBGOhPizStsinkIB0BXnKrk=", + "lastModified": 1671631481, + "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "062c3cca468a4b404ddd964fb444b665e4da982e", + "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", "type": "github" }, "original": { @@ -412,10 +505,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665732960, - "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", - "path": "/nix/store/r2s8wcc8n4c72p9zg5gsacg8nmdhjvka-source", - "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "lastModified": 1669791787, + "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", + "path": "/nix/store/8c75f43ms4brvphrgdy1a8vy5dy1j0si-source", + "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", "type": "path" }, "original": { @@ -441,11 +534,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1667629849, - "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", + "lastModified": 1671200928, + "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", + "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", "type": "github" }, "original": { @@ -457,11 +550,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1667991831, - "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", + "lastModified": 1671722432, + "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", + "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", "type": "github" }, "original": { @@ -563,11 +656,11 @@ }, "nur": { "locked": { - "lastModified": 1668174315, - "narHash": "sha256-oss9lJ30HbgXpVFy5Xv9doB+1mNjQehbFlFYau95odM=", + "lastModified": 1671811449, + "narHash": "sha256-x3lmyHkfaDapYaMgKV3olLAxsdF36xvQFxnEUMVdydM=", "owner": "nix-community", "repo": "nur", - "rev": "5da1d2f59d29cd1bb9c0787db9c1046825ade56a", + "rev": "e369ab33b7d8efc7821335b1e369ae0a7cfa62c5", "type": "github" }, "original": { @@ -618,11 +711,11 @@ "rnix-lsp": "rnix-lsp_2" }, "locked": { - "lastModified": 1666188566, - "narHash": "sha256-q/CQWJ5CkKvVZYKYwfng7EkWvNai7T6HFz6rAxzGUNM=", + "lastModified": 1670704038, + "narHash": "sha256-zxvBi242NJQAQ5ygS5CykTub2QRM7qw6v0LTScPIhYQ=", "ref": "refs/heads/master", - "rev": "a4a2886e495ceadcdc1792e5d0033cdc2d62e197", - "revCount": 110, + "rev": "980b762b6132d0b86bbac0f42ac87f552ec05650", + "revCount": 114, "type": "git", "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" }, @@ -649,16 +742,16 @@ }, "pkg-stable": { "locked": { - "lastModified": 1660215038, - "narHash": "sha256-tqMyd5QB4MZh59wMHXqpro4hkKjz9ubQxkxFSuCuBGE=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45c9736ed69800a6ff2164fb4538c9e40dad25d6", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -707,7 +800,7 @@ "inputs": { "naersk": "naersk_2", "nixpkgs": "nixpkgs_8", - "utils": "utils_4" + "utils": "utils_5" }, "locked": { "lastModified": 1658963292, @@ -729,6 +822,8 @@ "emacs": "emacs", "flake-utils": "flake-utils_2", "home-manager": "home-manager", + "hyprland": "hyprland", + "hyprland-xdg": "hyprland-xdg", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur", @@ -823,6 +918,21 @@ } }, "utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -837,7 +947,7 @@ "type": "github" } }, - "utils_4": { + "utils_5": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -851,6 +961,46 @@ "repo": "flake-utils", "type": "github" } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1669925104, + "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670892912, + "narHash": "sha256-HC1qHrGXivdzNlWuuWcxX/P7OkNrlLbhzaqLx0mslPA=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "9fb4fae94b9bd80395c193dcaf6fdf740550cff1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 908670b..e55a7be 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,14 @@ ostylk-home.url = "git+https://destiny.ostylk.de/gitea/NixDistro/Home.git"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; tablet-mode.url = "git+https://destiny.ostylk.de/gitea/NixDistro/tablet-mode.git"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland-xdg = { + url = "github:hyprwm/xdg-desktop-portal-hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/hosts/miku.nix b/hosts/miku.nix index 204a3bd..8888c8b 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -52,14 +52,15 @@ zoom-vm #lapce + + xdg-desktop-portal-hyprland ]; ptw = { programs = { #bluray.enable = true; mpv = { - primaryScreen = "C27F398"; - enable = true; + primaryScreen = "C27F398"; enable = true; }; sway.enable = false; alacritty.enable = true; @@ -117,6 +118,8 @@ adb.enable = true; gnupg.agent.pinentryFlavor = "qt"; evolution.enable = true; + + hyprland.enable = true; }; virtualisation = { @@ -202,6 +205,10 @@ devicesOffOnScreensaver = true; users = [ "alexander" ]; }; + bluetooth = { + enable = true; + powerOnBoot = true; + }; }; # TODO: Move into modules diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 7ad8f6d..3a9dcec 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -35,6 +35,9 @@ in inputs.nixpkgs.lib.nixosSystem { home-manager.useGlobalPkgs = true; } + # Hyprland + inputs.hyprland.nixosModules.default + # Overlays (util.mkOverlayFromInput "stable" inputs.stable) (util.mkOverlayFromInput "unstable" inputs.nixpkgs) @@ -42,6 +45,7 @@ in inputs.nixpkgs.lib.nixosSystem { nixpkgs.overlays = [ nur.overlay emacs.overlay + inputs.hyprland-xdg.overlays.default (import ../packages) (import ../overlays/simple.nix) (import ../overlays/phosh.nix)