diff --git a/flake.lock b/flake.lock index 56b2865..6eaeb75 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1747973023, - "narHash": "sha256-v2OgykASspKAyL+hYKlfa9PM4cwlFZ7/WQ1uvd256ko=", + "lastModified": 1748161689, + "narHash": "sha256-gm1ikRi3L2qpTQUUV/dURDUeg/dfstopzBduTKkIdqw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c7ee05a5dc9b52ba7a6a660537fabaf711b7790a", + "rev": "c60c48473ddf0b439079824cb08ccfa6c703ff87", "type": "gitlab" }, "original": { @@ -246,48 +246,6 @@ "type": "github" } }, - "home-manager-droid": { - "inputs": { - "nixpkgs": [ - "nixpkgs-droid" - ] - }, - "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -362,11 +320,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1747926140, - "narHash": "sha256-j5LAlXg5o8p52+OfzjgOakyyzvG7Zf2IZbanTaHUbmA=", + "lastModified": 1748191712, + "narHash": "sha256-mcTcxv85ljvg49blvLM/xmRtyyLyorpZZJ2ZAZYrYzg=", "ref": "refs/heads/main", - "rev": "bd4733a0ff2b89fd3f22dc6ec9ff00e070753662", - "revCount": 6131, + "rev": "2347050285920925db8bc844e3232bc932eef21e", + "revCount": 6137, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -594,29 +552,6 @@ "type": "github" } }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ], - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", @@ -624,11 +559,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1747965751, - "narHash": "sha256-pR9EjVCElJrcJyn6yhb81zfFdhfnWHTz1NPWLgqsZbo=", + "lastModified": 1748139117, + "narHash": "sha256-20rk3nzu5uFpg3ZGrSoB88VdCr+eJENGnuncKHorXTE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "1f8fff7eb52a43947adf0b372a78d76255b98fc4", + "rev": "3aede7ec07e25d1abdf55e4b9921872d08e4d0a9", "type": "github" }, "original": { @@ -637,32 +572,6 @@ "type": "github" } }, - "nix-on-droid": { - "inputs": { - "home-manager": "home-manager_2", - "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "nixpkgs-droid" - ], - "nixpkgs-docs": "nixpkgs-docs", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd_2" - }, - "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", - "ref": "release-24.05", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", - "revCount": 444, - "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nix-on-droid" - }, - "original": { - "ref": "release-24.05", - "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nix-on-droid" - } - }, "nixpkgs": { "locked": { "lastModified": 1725634671, @@ -679,54 +588,6 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-droid": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "ref": "nixos-24.05", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "revCount": 637546, - "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs" - }, - "original": { - "ref": "nixos-24.05", - "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1740877520, @@ -744,11 +605,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -760,11 +621,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -792,11 +653,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -878,60 +739,6 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", @@ -985,13 +792,10 @@ "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "home-manager-droid": "home-manager-droid", "hyprland": "hyprland", "impermanence": "impermanence", "nix-minecraft": "nix-minecraft", - "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs_4", - "nixpkgs-droid": "nixpkgs-droid", "nixpkgs-us": "nixpkgs-us", "nixvim": "nixvim", "sops-nix": "sops-nix", @@ -1000,22 +804,6 @@ "tokyo-night-sddm": "tokyo-night-sddm" } }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index f622fe7..70d60e3 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-droid.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.05"; - + #nixpkgs-droid.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.05"; +/* home-manager-droid = { url = "github:nix-community/home-manager/release-24.11"; #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05"; @@ -26,7 +26,7 @@ url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nix-on-droid?ref=release-24.05"; inputs.nixpkgs.follows = "nixpkgs-droid"; }; - +*/ disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -73,7 +73,7 @@ }; - outputs = { self, nixpkgs, home-manager, nix-on-droid, ... } @ inputs: { + outputs = { self, nixpkgs, home-manager, ... } @ inputs: { tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation { @@ -143,8 +143,8 @@ ]; }; }; - - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { +/* + nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration { pkgs = import nixpkgs { system = "aarch64-linux"; }; modules = [ @@ -159,5 +159,6 @@ ./system-config ]; }; +*/ }; } diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix index e45c31e..784dc01 100644 --- a/system-config/configuration/laptop/default.nix +++ b/system-config/configuration/laptop/default.nix @@ -95,6 +95,7 @@ { config.homeconfig = { host = "laptop"; + minimal = false; impermanence.enable = false; hyprland.enable = true; swaylock.enable = true;