From e2ae4bee47cf086b5c3a69fe7cc0193f9e030f58 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 18 Mar 2025 16:51:54 -0500 Subject: [PATCH] update hosts, update h002 to new version --- hosts/h002/flake.nix | 112 ++++--- hosts/lio/containers.nix | 4 +- hosts/lio/flake.lock | 636 ++------------------------------------- hosts/lio/flake.nix | 4 +- hosts/oren/flake.nix | 2 +- 5 files changed, 87 insertions(+), 671 deletions(-) diff --git a/hosts/h002/flake.nix b/hosts/h002/flake.nix index f3e7e17..60fb8cd 100644 --- a/hosts/h002/flake.nix +++ b/hosts/h002/flake.nix @@ -1,104 +1,102 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + # Use relative to get current version for testing + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/nvim"; - mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common"; - mod_common.inputs.nixpkgs.follows = "nixpkgs"; - mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets"; - mod_boot_grub.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_grub"; - 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"; - mod_home-manager.inputs.home-manager.url = "github:rycee/home-manager/release-24.11"; - mod_home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { nixpkgs, + common, + ros_neovim, ... - }@inputs: + }: let configuration_name = "h002"; lib = nixpkgs.lib; in { nixosConfigurations = { - "${configuration_name}" = - let - auto_modules = builtins.concatMap ( - input: - lib.optionals - (builtins.hasAttr "nixosModules" input && builtins.hasAttr "default" input.nixosModules) - [ - input.nixosModules.default - ] - ) (builtins.attrValues inputs); - in - (lib.nixosSystem { + "${configuration_name}" = ( + lib.nixosSystem { modules = [ + common.nixosModules.default + ros_neovim.nixosModules.default ./configuration.nix ./hardware-configuration.nix + (import ./containers.nix { inherit common; }) ( - { pkgs, ... }: + { config, pkgs, ... }: { - imports = [ - ../../components/nix/lua.nix - ../../components/nix/rust-repl.nix + environment.systemPackages = with pkgs; [ + lua ]; - mods = { - common = { - systemName = configuration_name; - allowUnfree = true; - primaryUser = "luser"; - docker = true; - zsh = true; + ringofstorms_common = { + systemName = configuration_name; + boot.grub.enable = true; + general = { + disableRemoteBuildsOnLio = true; + }; + desktopEnvironment.gnome.enable = true; + programs = { + rustDev.enable = true; + tailnet.enable = true; + ssh.enable = true; + docker.enable = true; + }; + users = { + # Users are all normal users and default password is password1 + admins = [ "josh" ]; # First admin is also the primary user owning nix config users = { - luser = { + josh = { openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJie9OPheWn/EZWfXJSZ3S0DnISqI3ToCmOqhX/Tkwby nix2h002" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2h002" ]; - initialPassword = "password1"; - isNormalUser = true; extraGroups = [ - "wheel" "networkmanager" "video" "input" ]; shell = pkgs.zsh; + packages = with pkgs; [ + bitwarden + vaultwarden + ]; }; }; }; - home_manager = { + homeManager = { users = { - luser = { - imports = [ - ../../components/hm/tmux/tmux.nix - ../../components/hm/atuin.nix - ../../components/hm/direnv.nix - ../../components/hm/git.nix - ../../components/hm/nix_deprecations.nix - ../../components/hm/postgres.nix - ../../components/hm/slicer.nix - ../../components/hm/ssh.nix - ../../components/hm/starship.nix - ../../components/hm/zoxide.nix - ../../components/hm/zsh.nix + josh = { + imports = with common.homeManagerModules; [ + tmux + atuin + direnv + git + nix_deprecations + postgres + ssh + starship + zoxide + zsh ]; }; }; }; }; + } ) - ] ++ auto_modules; - specialArgs = { - inherit inputs; - }; - }); + ]; + } + ); }; }; } diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 130119c..a58e16d 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -1,4 +1,4 @@ -{ inputs }: +{ common }: { ... }: @@ -10,7 +10,7 @@ options = { }; imports = [ - inputs.common.nixosModules.containers.librechat + common.nixosModules.containers.librechat ]; config = { diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 664b24e..0757dc9 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -5,12 +5,11 @@ "darwin": "darwin", "home-manager": "home-manager_2", "nixpkgs": [ - "common", "common", "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1736955230, @@ -26,102 +25,24 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "common", - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "common": { "inputs": { - "common": "common_2", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1742327593, - "narHash": "sha256-mFBdP15FrmS9AgNISjZyQtZhfBD1HmhRt92BDoKCPGA=", - "ref": "refs/heads/master", - "rev": "f4ff3ad3027dc23cfeacb889e1d932103e951787", - "revCount": 358, - "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" - }, - "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" - } - }, - "common_2": { - "inputs": { - "cosmic": "cosmic", "home-manager": "home-manager", - "hyprland": "hyprland", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1, - "narHash": "sha256-0uw2ufJKp8bok7PveHuzOTF3CIO46fZgWLQLCJmU6zo=", - "path": "./common", - "type": "path" + "lastModified": 1742334390, + "narHash": "sha256-F6PFJoZ8lxjIm0uGYZipT3xTk7wYJK/u0JdTp+BlZsg=", + "ref": "refs/heads/master", + "rev": "097a899f8d9cafbcbc7729549788908941d32b9f", + "revCount": 364, + "type": "git", + "url": "https://git.joshuabell.xyz/dotfiles" }, "original": { - "path": "./common", - "type": "path" - } - }, - "cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1742209773, - "narHash": "sha256-+d9zNzXHK/qQnWfFrjFxmCNJLm1JShsLNNViJxnKIpI=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "0b2d5feae25fe6176b5844a689712a3a13954f12", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" + "type": "git", + "url": "https://git.joshuabell.xyz/dotfiles" } }, "crane": { @@ -142,7 +63,6 @@ "darwin": { "inputs": { "nixpkgs": [ - "common", "common", "ragenix", "agenix", @@ -164,41 +84,9 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "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": 1731533236, @@ -214,33 +102,9 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "common", - "common", - "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": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1742234739, @@ -260,7 +124,6 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "common", "common", "ragenix", "agenix", @@ -281,342 +144,7 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "common", - "common", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "common", - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", - "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_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1742297408, - "narHash": "sha256-Xn3vzG7dhQlK26B0vUeModxYC8UD/6OhOi+5vqYV6Y4=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "cca0f48b74e87f86244f5773c42d9ade84683f3b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "common", - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "common", - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "common", - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1731755305, "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", @@ -632,23 +160,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1742069588, "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -664,23 +192,7 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1742268799, "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", @@ -696,7 +208,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1742225912, "narHash": "sha256-HCD3GrAAJb1jYTEc221DPlBk2VDkBt43hww7DXC1tyc=", @@ -1623,37 +1135,12 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742058297, - "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1673,13 +1160,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "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", @@ -1756,7 +1243,6 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "common", "common", "ragenix", "nixpkgs" @@ -1799,16 +1285,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" } }, @@ -1826,74 +1312,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": [ - "common", - "common", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "common", - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", - "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 39f2204..20d29e4 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -16,7 +16,7 @@ common, ros_neovim, ... - }@inputs: + }: let configuration_name = "lio"; lib = nixpkgs.lib; @@ -30,7 +30,7 @@ ros_neovim.nixosModules.default ./configuration.nix ./hardware-configuration.nix - (import ./containers.nix { inherit inputs; }) + (import ./containers.nix { inherit common; }) ( { config, pkgs, ... }: { diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 1de2208..86166ba 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -16,7 +16,7 @@ common, ros_neovim, ... - }@inputs: + }: let configuration_name = "oren"; lib = nixpkgs.lib;