diff --git a/flake.lock b/flake.lock index dc55ac8..0d8d3c6 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1667882772, - "narHash": "sha256-hoVW9/xcfZTsKn++nGYwEMgBLfh+iq7i8+eEcAhOxy0=", + "lastModified": 1668167903, + "narHash": "sha256-5OENaesVk94meyiaDFgxtr4TTuAg52baVHXOnXL98vI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f04cb6f6724ba4568a7f6dae0863e507477667b7", + "rev": "7b58afb8604c9d53fe11bfb76e2ce903cb658b66", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667830176, - "narHash": "sha256-TNm8W88Jf9qELqKI8rGMr0sZWlTV9WKIlqN4dzvuKUA=", + "lastModified": 1667981810, + "narHash": "sha256-p27zd5M+OkfND46gzbGkaHlNBZsYe95M48OJuFeuuSY=", "owner": "nix-community", "repo": "home-manager", - "rev": "886675991b643b701a33f533443db165c70692d1", + "rev": "6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1667861486, - "narHash": "sha256-+UKjPI025RgjILaz3ihoIaYskGF9sT6Hf++L+IYn6G8=", + "lastModified": 1668175475, + "narHash": "sha256-Hqn18O5oH4SGl/zJJXz9IpmY13zOjIutTv4q46v2Xh8=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "1d2e4243dc8bc983369ef49eada08d2322658bc6", + "rev": "61995e3b4ef526274519528278fd62089240e3fc", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1667768008, - "narHash": "sha256-PGbX0s2hhXGnZDFVE6UIhPSOf5YegpWs5dUXpT/14F0=", + "lastModified": 1668157555, + "narHash": "sha256-s5rt2FSmV4PWt89rjt4cvBGOhPizStsinkIB0BXnKrk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6483e0def85efb9c1e884efbaff45a5e7aabb34", + "rev": "062c3cca468a4b404ddd964fb444b665e4da982e", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667702334, - "narHash": "sha256-2oihoCZvQvg+oUrMz8OGc1z4J9HflqEjkk666VKm9jw=", + "lastModified": 1667991831, + "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adc7d07c0c8162ecb9fe0b075386d549680ef914", + "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1667875464, - "narHash": "sha256-0rO2Pzn//ANT3AphpEUantCbm86XcmKNEKhM73LFr04=", + "lastModified": 1668134765, + "narHash": "sha256-pPTpucjGejrv5aYBj1PElWl2SV//wmTUeGfyzakmqKM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9235990723630e1a55e1ed6bca5954e4e31cfbd7", + "rev": "d9917a612b3d09f26f0ead5b793009a9f6047c16", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index beb01d8..aa534f3 100644 --- a/flake.nix +++ b/flake.nix @@ -152,34 +152,34 @@ ( system: let - # pkgs = import nixpkgs { - # inherit system; - # overlays = [ - # self.overlays.default - # ha-now-playing.overlays.${system} - # pamedia.overlays.${system} - # ]; - # config = { - # allowUnsupportedSystem = true; - # allowUnfree = true; - # }; - # }; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import nixpkgs { + inherit system; + overlays = [ + self.overlays.default + ha-now-playing.overlays.${system} + pamedia.overlays.${system} + ]; + config = { + allowUnsupportedSystem = true; + allowUnfree = true; + }; + }; + # pkgs = nixpkgs.legacyPackages.${system}; in { - # packages = flake-utils.lib.flattenTree { - # rofi-wayland = pkgs.rofi-wayland; - # nix-plugins = pkgs.nix-plugins; - # backscrub = pkgs.backscrub; - # bl3auto = pkgs.bl3auto; - # xmake = pkgs.xmake; - # }; + packages = flake-utils.lib.flattenTree { + rofi-wayland = pkgs.rofi-wayland; + nix-plugins = pkgs.nix-plugins; + backscrub = pkgs.backscrub; + bl3auto = pkgs.bl3auto; + xmake = pkgs.xmake; + }; - # apps = { - # rofi-wayland = flake-utils.lib.mkApp { drv = packages.rofi-wayland; }; - # nix-plugins = flake-utils.lib.mkApp { drv = packages.nix-plugins; }; - # backscrub = flake-utils.lib.mkApp { drv = packages.backscrub; }; - # }; + apps = { + rofi-wayland = flake-utils.lib.mkApp { drv = packages.rofi-wayland; }; + nix-plugins = flake-utils.lib.mkApp { drv = packages.nix-plugins; }; + backscrub = flake-utils.lib.mkApp { drv = packages.backscrub; }; + }; devShells.default = with pkgs; mkShell {