diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 574f548..43c5612 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -9,7 +9,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1723293904, @@ -25,43 +25,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "mod_de_hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "mod_de_hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736102453, - "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "4846091641f3be0ad7542086d52769bb7932bde6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1725409566, @@ -101,25 +64,9 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -135,29 +82,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -203,244 +127,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "mod_de_hyprland", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "mod_de_hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1736873552, - "narHash": "sha256-VByeYPOu3I0a5r5Nn45loSaEV8M9fmZrTByUdu9sjfY=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprutils": [ - "mod_de_hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736114838, - "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "mod_de_hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "mod_boot_systemd": { "locked": { "lastModified": 1735793935, @@ -478,21 +164,18 @@ "url": "https://git.joshuabell.xyz/dotfiles" } }, - "mod_de_hyprland": { - "inputs": { - "hyprland": "hyprland" - }, + "mod_de_gnome": { "locked": { - "lastModified": 1736963622, - "narHash": "sha256-O7hYPHaAi1XGknRHZ7nO8tuzwUr66X2X4hlFnDw937s=", - "ref": "mod_de_hyprland", - "rev": "a379094e008572828cff5dff28c6260dffd54c20", - "revCount": 9, + "lastModified": 1736973533, + "narHash": "sha256-qQC5l8sTFu8A9tyhq6JQFF/J/UsvY6+GauzxTZI9N3E=", + "ref": "mod_de_gnome", + "rev": "dd83588ddb8872a3d0fcfda157a7ab0f5986c14e", + "revCount": 7, "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" }, "original": { - "ref": "mod_de_hyprland", + "ref": "mod_de_gnome", "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" } @@ -589,22 +272,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -620,7 +287,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -636,7 +303,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1736867362, "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", @@ -652,7 +319,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1736848588, "narHash": "sha256-9B6fQqphF3j9lpcxQnKyIUgp3NyGi7ikb9CjCYqixcY=", @@ -1579,36 +1246,12 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1628,7 +1271,7 @@ "ringofstorms-stormd": { "inputs": { "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { @@ -1649,18 +1292,18 @@ "inputs": { "mod_boot_systemd": "mod_boot_systemd", "mod_common": "mod_common", - "mod_de_hyprland": "mod_de_hyprland", + "mod_de_gnome": "mod_de_gnome", "mod_home-manager": "mod_home-manager", "mod_nebula": "mod_nebula", "mod_ros_stormd": "mod_ros_stormd", "mod_secrets": "mod_secrets", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1801,16 +1444,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1828,68 +1471,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "mod_de_hyprland", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "mod_de_hyprland", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "mod_de_hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "mod_de_hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "mod_de_hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "mod_de_hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 7735c15..1200443 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -8,7 +8,8 @@ mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets"; mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd"; # mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic"; - mod_de_hyprland.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_hyprland"; + # mod_de_hyprland.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_hyprland"; + mod_de_gnome.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_gnome"; mod_ros_stormd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_stormd"; mod_nebula.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_nebula"; mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";