ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update lio deps

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-03-18 15:38:18 -05:00
parent f4ff3ad302
commit 02b89592d1
2 changed files with 92 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

89
hosts/lio/flake.lock generated
View file

@ -5,6 +5,7 @@
"darwin": "darwin",
"home-manager": "home-manager_2",
"nixpkgs": [
"common",
"common",
"ragenix",
"nixpkgs"
@ -28,21 +29,25 @@
"aquamarine": {
"inputs": {
"hyprutils": [
"common",
"common",
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"common",
"common",
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -63,6 +68,25 @@
}
},
"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",
@ -72,11 +96,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-0uw2ufJKp8bok7PveHuzOTF3CIO46fZgWLQLCJmU6zo=",
"path": "../../common",
"path": "./common",
"type": "path"
},
"original": {
"path": "../../common",
"path": "./common",
"type": "path"
}
},
@ -118,6 +142,7 @@
"darwin": {
"inputs": {
"nixpkgs": [
"common",
"common",
"ragenix",
"agenix",
@ -192,6 +217,7 @@
"gitignore": {
"inputs": {
"nixpkgs": [
"common",
"common",
"hyprland",
"pre-commit-hooks",
@ -234,6 +260,7 @@
"home-manager_2": {
"inputs": {
"nixpkgs": [
"common",
"common",
"ragenix",
"agenix",
@ -257,16 +284,19 @@
"hyprcursor": {
"inputs": {
"hyprlang": [
"common",
"common",
"hyprland",
"hyprlang"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -289,16 +319,19 @@
"hyprgraphics": {
"inputs": {
"hyprutils": [
"common",
"common",
"hyprland",
"hyprutils"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -350,11 +383,13 @@
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -377,18 +412,21 @@
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"common",
"common",
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"hyprland-qtutils",
@ -413,11 +451,13 @@
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"common",
"common",
"hyprland",
"hyprlang"
],
"hyprutils": [
"common",
"common",
"hyprland",
"hyprland-qtutils",
@ -425,11 +465,13 @@
"hyprutils"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -452,16 +494,19 @@
"hyprlang": {
"inputs": {
"hyprutils": [
"common",
"common",
"hyprland",
"hyprutils"
],
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -484,11 +529,13 @@
"hyprutils": {
"inputs": {
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -511,11 +558,13 @@
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
],
"systems": [
"common",
"common",
"hyprland",
"systems"
@ -617,11 +666,27 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1740463929,
"narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"lastModified": 1741173522,
"narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github"
},
"original": {
@ -631,7 +696,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1742225912,
"narHash": "sha256-HCD3GrAAJb1jYTEc221DPlBk2VDkBt43hww7DXC1tyc=",
@ -1563,6 +1628,7 @@
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"common",
"common",
"hyprland",
"nixpkgs"
@ -1607,13 +1673,13 @@
"root": {
"inputs": {
"common": "common",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"ros_neovim": "ros_neovim"
}
},
"ros_neovim": {
"inputs": {
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"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",
@ -1690,6 +1756,7 @@
"rust-overlay": {
"inputs": {
"nixpkgs": [
"common",
"common",
"ragenix",
"nixpkgs"
@ -1778,31 +1845,37 @@
"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"

31
hosts/lio/flake.nix
View file

@ -4,9 +4,8 @@
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Use relative to get current version for testing
common.url = "path:../../common";
# Pin to specific version
# common.url = "git+https://git.joshuabell.xyz/dotfiles?rev=88f2d95e6a871f084dccfc4f45ad9d2b31720998";
# common.url = "path:../../common";
common.url = "git+https://git.joshuabell.xyz/dotfiles";
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
};
@ -15,6 +14,7 @@
{
nixpkgs,
common,
ros_neovim,
...
}@inputs:
let
@ -23,19 +23,11 @@
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 inputs; })
@ -129,11 +121,10 @@
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
}
)
] ++ auto_modules;
specialArgs = {
inherit inputs;
};
});
];
}
);
};
};
}