diff --git a/flake.lock b/flake.lock index 15ad2c1..459412c 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731088327, + "narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8", "type": "github" }, "original": { @@ -178,7 +178,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -349,11 +349,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1730969692, - "narHash": "sha256-4Ly9zkqnRB6qLjMeddfUyd4iRLvq+RDspBWABS8DGN4=", + "lastModified": 1731086737, + "narHash": "sha256-J/SA5nriNVTzSfjaxBbjUnuRCKOzxnW71yK3fBU5iTs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", + "rev": "3b66351eeb76e802bac37cc892529549efc49905", "type": "github" }, "original": { @@ -542,19 +542,19 @@ }, "matugen": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_4" }, "locked": { - "lastModified": 1711657889, - "narHash": "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc=", + "lastModified": 1731002840, + "narHash": "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=", "owner": "InioX", "repo": "matugen", - "rev": "566277529dadc2b149a8bd8b9859ea791ecdef26", + "rev": "ab0a12f826c194003c69ee2e3d700245fb54f875", "type": "github" }, "original": { "owner": "InioX", - "ref": "v2.2.0", "repo": "matugen", "type": "github" } @@ -648,11 +648,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -712,11 +712,11 @@ }, "nur": { "locked": { - "lastModified": 1731074503, - "narHash": "sha256-1a/dIzqToBgMwPgtXl+s4+eFUo99yzn5BHhF3aFRgOQ=", + "lastModified": 1731101445, + "narHash": "sha256-xQv6BQamIAcw10i0dytZeQkfgAyNmdU1I3cuebul1ZQ=", "owner": "nix-community", "repo": "NUR", - "rev": "b016b006a07be73115fbebba5e96225fb497804b", + "rev": "aa67e54e73d5f45c5f9533065ebe3b1adbc53585", "type": "github" }, "original": { @@ -876,6 +876,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 7b5c5f5..4a9cb68 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ "https://hyprland.cachix.org/" "https://anyrun.cachix.org" "https://wezterm.cachix.org" - "https://hydra.nixos.org/" + "https://hydra.nixos.org/" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -16,7 +16,7 @@ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" - "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" + "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; auto-optimise-store = true; @@ -28,7 +28,8 @@ nur.url = "github:nix-community/NUR"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + url = + "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -37,16 +38,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - matugen.url = "github:InioX/matugen?ref=v2.2.0"; + matugen.url = "github:InioX/matugen"; spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - disko = { + disko = { url = "github:nix-community/disko/master"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { @@ -69,15 +70,15 @@ }; - outputs = { self, nixpkgs, chaotic, nur, home-manager, lix-module, disko, ... }@inputs: - let - system = "x86_64-linux"; + outputs = { self, nixpkgs, chaotic, nur, home-manager, lix-module, disko, ... + }@inputs: + let system = "x86_64-linux"; in { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ - lix-module.nixosModules.default + # lix-module.nixosModules.default ./hosts/nyx/configuration.nix inputs.home-manager.nixosModules.default chaotic.nixosModules.default @@ -93,16 +94,12 @@ # }; theia = nixpkgs.lib.nixosSystem { - modules = [ - ./hosts/theia/configuration.nix - disko.nixosModules.disko - ]; + modules = + [ ./hosts/theia/configuration.nix disko.nixosModules.disko ]; }; epimetheus = nixpkgs.lib.nixosSystem { - modules = [ - ./hosts/epimetheus/configuration.nix - ]; + modules = [ ./hosts/epimetheus/configuration.nix ]; }; }; }; diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 790fcb0..25041b4 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -80,7 +80,6 @@ autoSuspend = false; }; }; - desktopManager.gnome.enable = true; xkb = { layout = "us"; variant = "euro"; @@ -166,7 +165,7 @@ git = { enable = true; lfs.enable = true; - + }; }; @@ -174,6 +173,7 @@ nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; + package = pkgs.lix; settings = { experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ]; max-jobs = "auto"; @@ -205,6 +205,10 @@ qt.enable = true; environment.systemPackages = with pkgs; [ + matugen + nautilus + diff-so-fancy + eog bottles ffmpeg-full gst_all_1.gstreamer