Compare commits

..

No commits in common. "49e9fad6142ba3a1f861a36af8417e19eec47ae5" and "750fb580e17342aabde9f220461740c9ef1ed520" have entirely different histories.

2 changed files with 2 additions and 31 deletions

21
flake.lock generated
View File

@ -21,26 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1705806513,
"narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705641746, "lastModified": 1705641746,
@ -92,7 +72,6 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"pkg-android-tools": "pkg-android-tools" "pkg-android-tools": "pkg-android-tools"

View File

@ -14,12 +14,6 @@
# 33.0.3p2 as suggested by https://xdaforums.com/t/guide-january-3-2024-root-pixel-7-pro-unlock-bootloader-pass-safetynet-both-slots-bootable-more.4505353/ # 33.0.3p2 as suggested by https://xdaforums.com/t/guide-january-3-2024-root-pixel-7-pro-unlock-bootloader-pass-safetynet-both-slots-bootable-more.4505353/
# android tools versions [ 34.0.0, 34.0.5 ) causes bootloops somehow and 34.0.5 isn't in nixpkgs yet # android tools versions [ 34.0.0, 34.0.5 ) causes bootloops somehow and 34.0.5 isn't in nixpkgs yet
pkg-android-tools.url = "github:NixOS/nixpkgs/55070e598e0e03d1d116c49b9eff322ef07c6ac6"; pkg-android-tools.url = "github:NixOS/nixpkgs/55070e598e0e03d1d116c49b9eff322ef07c6ac6";
# provides an up-to-date database for comma
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs:
@ -53,7 +47,7 @@
# This function produces a module that adds the home-manager module to the # This function produces a module that adds the home-manager module to the
# system and configures the given module to the user's Home Manager # system and configures the given module to the user's Home Manager
# configuration # configuration
homeManagerInit = {system, username ? _username , module ? _ : {}, rootModule ? _:{}, userModules ? { ${username} = [ module ] ; root = [ rootModule ]; }, stateVersion }: homeManagerInit = {system, username ? _username , module ? _ : {}, userModules ? { ${username} = [ module ] ;}, stateVersion }:
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
mapUserModules = lib.attrsets.mapAttrs (user: modules: {...}: mapUserModules = lib.attrsets.mapAttrs (user: modules: {...}:
@ -134,11 +128,9 @@
./system/android.nix ./system/android.nix
# ./system/hyprland.nix # ./system/hyprland.nix
(homeManagerInit { (homeManagerInit {
# module = import ./hosts/slab/home.nix; module = import ./hosts/slab/home.nix;
inherit system; inherit system;
stateVersion = "23.11"; stateVersion = "23.11";
# rootModule = import ./home/root.nix;
userModules = { ${username} = [(import ./hosts/slab/home.nix)]; root = [(import ./home/root.nix)]; };
}) })
]; ];
specialArgs = { specialArgs = {