diff --git a/flake.lock b/flake.lock index b3575ae..0495ab8 100644 --- a/flake.lock +++ b/flake.lock @@ -64,26 +64,9 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-file": { - "locked": { - "lastModified": 1772176329, - "narHash": "sha256-8MmT7QcVsRPlaJOSnJobqyDf3E/0q3kcgs6CJ6NkBw0=", - "owner": "vic", - "repo": "flake-file", - "rev": "1bf87eeb57ea517d4a6a96b4529f4f5d78a49e84", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "flake-file", - "type": "github" - } - }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs-lib" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1769996383, @@ -125,11 +108,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772164835, - "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=", + "lastModified": 1772218752, + "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a39b0828bbffce0d73769a61e46e780488d098b", + "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9", "type": "github" }, "original": { @@ -140,11 +123,11 @@ }, "import-tree": { "locked": { - "lastModified": 1772159371, - "narHash": "sha256-AkfVgWWxt1pa1SlfKzcL1oQpMzgP70U3fBtzXqEGOms=", + "lastModified": 1772263719, + "narHash": "sha256-4TRO+jUycfR3g4KAbyK0wQEEJ7Xcmid2Ry+tWv4HPLw=", "owner": "vic", "repo": "import-tree", - "rev": "78c35e32f2b499c25e0671e41662537a6b1edbf0", + "rev": "205675fa599ff8a74b6c8c2cc5149cdaeac76f5f", "type": "github" }, "original": { @@ -200,11 +183,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772180467, - "narHash": "sha256-n6nZTXJRnpM4ST+poeynOasYm+XOASxHWXT/kLWI/lg=", + "lastModified": 1772211154, + "narHash": "sha256-BdXKcWd1LE+APzyaJ/xszDXcA5KKPenjNyC5VOd3x4E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "68dcbb4f04e6fd8e7072cee1b30dba669d1c47ca", + "rev": "599b3f8d4215470dd50066119c81007b2670b6e1", "type": "github" }, "original": { @@ -233,11 +216,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771849386, - "narHash": "sha256-CFvjBjS2LxbBMR3Lu6wZhME6ck3CXyKUufRoJA5tlmw=", + "lastModified": 1772207631, + "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "2dc6f4482c4eeed75ea8b133d89cad8658d38429", + "rev": "e708f546153f74acf33eb183b3b2992587a701e5", "type": "github" }, "original": { @@ -246,36 +229,16 @@ "type": "github" } }, - "nix-auto-follow": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754073254, - "narHash": "sha256-CQp/v2HQ7AtGJQqFGRZLHt4MZAK3NF94I6GDaRyhbsc=", - "owner": "fzakaria", - "repo": "nix-auto-follow", - "rev": "5baa00b79d4cc46523da0b8b3532c5163d151be4", - "type": "github" - }, - "original": { - "owner": "fzakaria", - "repo": "nix-auto-follow", - "type": "github" - } - }, "nix-wrapper-modules": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1771743990, - "narHash": "sha256-KNTuqLytdRE0MVhM1hd3IJTlcOG6In/6klbiEDWYOaA=", + "lastModified": 1772285008, + "narHash": "sha256-tR5c3MreHZ3uasglb9lxX/SEFvGnCjOrasCF+s+ORNI=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "0ea455457dac3de9129498f5c50a35153ab56484", + "rev": "7025a67a1410015bf225903333f12021fd0bdff0", "type": "github" }, "original": { @@ -316,6 +279,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1772047000, @@ -382,11 +360,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1772082373, - "narHash": "sha256-OgUF+EoJ36hz3jo8qBuizb8suT0mu1n7mzmcGdeOjWE=", - "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", + "lastModified": 1772173633, + "narHash": "sha256-BHKMR414WpfUddNyUtx2GR1VPl0R9sWGQs/opgYm9rc=", + "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre954674.26eaeac4e409/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre955350.c0f3d81a7ddb/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -395,11 +373,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -447,11 +425,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772163795, - "narHash": "sha256-1Y5IrQIJ3MKY+yd5FeZejnko1wEKpTaF2r5qt6Sn1HU=", + "lastModified": 1772283575, + "narHash": "sha256-Avh/W7rFoyx9JAgwkMfpQG7J9+AtytZ6EmqFLtADPh4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "72cc11f98c7ccb75fe542a0034176de3710f1590", + "rev": "d886dd7861b8e6ff53dad320c53f665930396b02", "type": "github" }, "original": { @@ -468,11 +446,11 @@ ] }, "locked": { - "lastModified": 1771796397, - "narHash": "sha256-lbZkAMNQl5Ymqhdvp46K8hubZ7n7KQRPnTP5bNJzMSk=", + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "1711c5a20b74a31b703394164c5d2d9561f13ee9", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", "type": "github" }, "original": { @@ -491,11 +469,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1772136464, - "narHash": "sha256-tkD/hT8goPEP4Jh03DzE7eqRqm74OzAjkRkbLKH4nM0=", + "lastModified": 1772219256, + "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", "owner": "notashelf", "repo": "nvf", - "rev": "ace53a0ceea8bd5eb7325f63389ea4f28525db0c", + "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", "type": "github" }, "original": { @@ -509,18 +487,13 @@ "den": "den", "disko": "disko", "flake-aspects": "flake-aspects", - "flake-file": "flake-file", "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", "niri": "niri", - "nix-auto-follow": "nix-auto-follow", "nix-wrapper-modules": "nix-wrapper-modules", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", - "nixpkgs-lib": [ - "nixpkgs" - ], "noctalia": "noctalia", "nvf": "nvf", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 8c9c5b2..9dddffb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,33 +1,22 @@ -# DO-NOT-EDIT. This file was auto-generated using github:vic/flake-file. -# Use `nix run .#write-flake` to regenerate it. { - - outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); + description = "NixOS Configuration"; inputs = { den.url = "github:vic/den"; disko.url = "github:nix-community/disko"; flake-aspects.url = "github:vic/flake-aspects"; - flake-file.url = "github:vic/flake-file"; - flake-parts = { - inputs.nixpkgs-lib.follows = "nixpkgs-lib"; - url = "github:hercules-ci/flake-parts"; - }; + flake-parts.url = "github:hercules-ci/flake-parts"; home-manager.url = "github:nix-community/home-manager"; import-tree.url = "github:vic/import-tree"; niri.url = "github:sodiboo/niri-flake"; - nix-auto-follow = { - inputs.nixpkgs.follows = "nixpkgs"; - url = "github:fzakaria/nix-auto-follow"; - }; nix-wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; - nixpkgs-lib.follows = "nixpkgs"; noctalia.url = "github:noctalia-dev/noctalia-shell"; nvf.url = "github:notashelf/nvf"; sops-nix.url = "github:Mic92/sops-nix"; systems.url = "github:nix-systems/default"; }; + outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); } diff --git a/modules/dendritic.nix b/modules/dendritic.nix index 90b4510..8e93b65 100644 --- a/modules/dendritic.nix +++ b/modules/dendritic.nix @@ -1,15 +1,7 @@ { inputs, ... }: { imports = [ - (inputs.flake-file.flakeModules.dendritic or { }) (inputs.den.flakeModules.dendritic or { }) (inputs.den.namespace "lux" true) ]; - - # other inputs may be defined at a module using them. - flake-file.inputs = { - den.url = "github:vic/den"; - flake-file.url = "github:vic/flake-file"; - home-manager.url = "github:nix-community/home-manager"; - }; } diff --git a/modules/flake-file.nix b/modules/flake-file.nix deleted file mode 100644 index 23bedef..0000000 --- a/modules/flake-file.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ inputs, ... }: -{ - imports = [ - inputs.flake-file.flakeModules.nix-auto-follow - ]; -} diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 5936fbb..b3b56f6 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -1,6 +1,5 @@ { inputs, ... }: { - flake-file.inputs.nix-wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; lux.neovim.homeManager = { pkgs, diff --git a/modules/niri.nix b/modules/niri.nix index 277917c..aa70d6a 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake-file.inputs.niri.url = "github:sodiboo/niri-flake"; - lux.niri = { nixos = { pkgs, ... }: diff --git a/modules/noctalia.nix b/modules/noctalia.nix index 9b1b122..78e2fb4 100644 --- a/modules/noctalia.nix +++ b/modules/noctalia.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake-file.inputs.noctalia.url = "github:noctalia-dev/noctalia-shell"; - lux.noctalia = { homeManager = { pkgs, ... }: diff --git a/modules/nvf.nix b/modules/nvf.nix index 7d22dcb..cb2b726 100644 --- a/modules/nvf.nix +++ b/modules/nvf.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake-file.inputs.nvf.url = "github:notashelf/nvf"; - lux.nvf = { homeManager = { pkgs, ... }: diff --git a/modules/orion-disk-config.nix b/modules/orion-disk-config.nix index 181c29a..3a4a64f 100644 --- a/modules/orion-disk-config.nix +++ b/modules/orion-disk-config.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake-file.inputs.disko.url = "github:nix-community/disko"; - den.aspects.orion = { nixos = { lib, ... }: diff --git a/modules/polaris.nix b/modules/polaris.nix index 63ca090..7172e04 100644 --- a/modules/polaris.nix +++ b/modules/polaris.nix @@ -1,7 +1,5 @@ { inputs, den, ... }: { - flake-file.inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - den.aspects.polaris = { includes = [ den.ful.lux.workstation ]; nixos.imports = with inputs.nixos-hardware.nixosModules; [ diff --git a/modules/secrets/sops.nix b/modules/secrets/sops.nix index dd8736c..e1642ef 100644 --- a/modules/secrets/sops.nix +++ b/modules/secrets/sops.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake-file.inputs.sops-nix.url = "github:Mic92/sops-nix"; - den.default = { nixos = { pkgs, ... }: