diff --git a/.gitignore b/.gitignore index b928f5e..ae639be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ config/nvim/pack config/nvim/undodir config/qtile/__pycache__ etc/nixos/hardware-configuration.nix +nixos/hardware-configuration.nix diff --git a/nixos/flake.lock b/nixos/flake.lock index b7a152d..d01b11f 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -21,18 +39,37 @@ "type": "github" } }, + "intelfetch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1762005542, + "narHash": "sha256-oFE6raeSV/37OJUbR4F1/iqJR23Hij4jccv/BgrDciU=", + "ref": "refs/heads/master", + "rev": "090578fae67055f39155f677e8079f8b47c26cca", + "revCount": 19, + "type": "git", + "url": "https://git.sr.ht/~coasteen/intelfetch" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~coasteen/intelfetch" + } + }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -53,12 +90,44 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "intelfetch": "intelfetch", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/nixos/flake.nix b/nixos/flake.nix index 4c484eb..f552f14 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -4,40 +4,49 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + intelfetch.url = "git+https://git.sr.ht/~coasteen/intelfetch"; home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { nixpkgs, nixpkgs-unstable, home-manager, ... }: let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - config = { allowUnfree = true; }; - }; - pkgsUnstable = import nixpkgs-unstable { inherit system; }; - in - { - nixosConfigurations.gloria = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./configuration/configuration.nix { inherit pkgs pkgsUnstable; }) - ./configuration/sys/coreutils-configuration.nix - ./hardware-configuration.nix - home-manager.nixosModules.home-manager { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - backupFileExtension = "home-backup"; - users.coast = { ... }: { - imports = [ - ./home-configuration/configuration.nix - ./home-configuration/apps/sway.nix - ./home-configuration/apps/zsh.nix - ]; - }; + outputs = { nixpkgs, nixpkgs-unstable, home-manager, intelfetch, ... }: let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + config = { allowUnfree = true; }; + }; + pkgsUnstable = import nixpkgs-unstable { inherit system; }; + in { + nixosConfigurations.gloria = nixpkgs.lib.nixosSystem { + inherit system; + + modules = [ + (import ./configuration/configuration.nix { inherit pkgs pkgsUnstable; }) + ./configuration/sys/coreutils-configuration.nix + ./hardware-configuration.nix + + { + environment.systemPackages = [ + intelfetch.packages.${system}.intelfetch + ]; + } + + home-manager.nixosModules.home-manager { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "home-backup"; + + users.coast = { ... }: { + imports = [ + ./home-configuration/configuration.nix + ./home-configuration/apps/sway.nix + ./home-configuration/apps/zsh.nix + ]; }; - } - ]; - }; + }; + } + ]; }; + }; }