rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-31 09:55:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

flake cleanups

Browse source
This commit is contained in:
Rouven Seifert 2023-03-05 10:48:43 +01:00
parent 6454f8c69c
commit a5164282fa
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
2 changed files with 127 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
flake.lock generated
View file

@ -23,7 +23,7 @@
"nixpkgs" "nixpkgs"
], ],
"poetry2nix": "poetry2nix", "poetry2nix": "poetry2nix",
"utils": "utils_2" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1669854260, "lastModified": 1669854260,
@ -59,14 +59,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1677783711, "lastModified": 1678006026,
"narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=", "narHash": "sha256-cGOfrU7JsKHAWXbPVDTOu2yyMb7GeWdUtJQNQSqht+w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664", "rev": "68ba59578352815ac372b17fb3df9db39afb1407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +180,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677676435, "lastModified": 1677932085,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +211,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1677560965, "lastModified": 1677948530,
"narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=", "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa", "rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,7 +228,9 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"beautysh": "beautysh", "beautysh": "beautysh",
"flake-utils": "flake-utils", "flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -274,6 +278,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
@ -294,11 +299,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1677833841, "lastModified": 1677987270,
"narHash": "sha256-yHZFGe7dhBE43FFWKiWc29NuveH+nfyTT6oKyFDEMys=", "narHash": "sha256-NRqhY8jbrmP1C6oiVqv1T0T1r560eo4ZpmEdHoQmKj4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "128e9b29ddd88ceb634a28f7dbbfee7b895f005f", "rev": "7cff56b43952edc5a2c212076d5fc922f764240f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,21 +327,6 @@
"type": "github" "type": "github"
} }
}, },
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {

164
flake.nix
View file

@ -1,66 +1,116 @@
{ {
description = "My nix setup"; description = "My nix setup";
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs = {
home-manager.url = github:nix-community/home-manager; url = github:nixos/nixpkgs/nixos-unstable;
hyprland.url = github:hyprwm/Hyprland; };
sops-nix.url = github:Mic92/sops-nix; flake-utils = {
nix-colors.url = github:Misterio77/nix-colors; url = github:numtide/flake-utils;
hyprpaper.url = github:hyprwm/hyprpaper; };
hyprland-protocols.url = github:hyprwm/hyprland-protocols; nixos-hardware = {
xdph.url = github:hyprwm/xdg-desktop-portal-hyprland; url = github:nixos/nixos-hardware;
nixos-hardware.url = github:nixos/nixos-hardware; };
nixvim.url = github:pta2002/nixvim;
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager = {
hyprland.inputs.nixpkgs.follows = "nixpkgs"; url = github:nix-community/home-manager;
hyprland.inputs.hyprland-protocols.follows = "hyprland-protocols"; inputs = {
hyprland.inputs.xdph.follows = "xdph"; nixpkgs.follows = "nixpkgs";
hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; utils.follows = "flake-utils";
hyprland-protocols.inputs.nixpkgs.follows = "nixpkgs";
xdph.inputs.nixpkgs.follows = "nixpkgs";
xdph.inputs.hyprland-protocols.follows = "hyprland-protocols";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nixvim.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, xdph, sops-nix, nix-colors, nixos-hardware, nixvim, ... }@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs.inputs = attrs;
modules = [
./hosts/thinkpad
./users/rouven
nixos-hardware.nixosModules.common-pc-laptop-ssd
home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops
{
home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = {
imports = [
nix-colors.homeManagerModules.default
hyprland.homeManagerModules.default
nixvim.homeManagerModules.nixvim
sops-nix.homeManagerModules.sops
];
config = {
colorScheme = nix-colors.colorSchemes.dracula;
};
};
}
];
}; };
nuc = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux";
specialArgs.inputs = attrs; nix-colors = {
modules = [ url = github:Misterio77/nix-colors;
nixos-hardware.nixosModules.intel-nuc-8i7beh };
./hosts/nuc
sops-nix.nixosModules.sops sops-nix = {
]; url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland-protocols = {
url = github:hyprwm/hyprland-protocols;
inputs.nixpkgs.follows = "nixpkgs";
};
xdph = {
url = github:hyprwm/xdg-desktop-portal-hyprland;
inputs = {
nixpkgs.follows = "nixpkgs";
hyprland-protocols.follows = "hyprland-protocols";
};
};
hyprland = {
url = github:hyprwm/Hyprland;
inputs = {
nixpkgs.follows = "nixpkgs";
hyprland-protocols.follows = "hyprland-protocols";
xdph.follows = "xdph";
};
};
hyprpaper = {
url = github:hyprwm/hyprpaper;
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = github:pta2002/nixvim;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
}; };
}; };
}; };
outputs =
{ self
, nixpkgs
, home-manager
, hyprland
, sops-nix
, nix-colors
, nixos-hardware
, nixvim
, ...
}@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs.inputs = attrs;
modules = [
./hosts/thinkpad
./users/rouven
nixos-hardware.nixosModules.common-pc-laptop-ssd
home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops
{
home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = {
imports = [
nix-colors.homeManagerModules.default
hyprland.homeManagerModules.default
nixvim.homeManagerModules.nixvim
sops-nix.homeManagerModules.sops
];
config = {
colorScheme = nix-colors.colorSchemes.dracula;
};
};
}
];
};
nuc = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs.inputs = attrs;
modules = [
nixos-hardware.nixosModules.intel-nuc-8i7beh
./hosts/nuc
sops-nix.nixosModules.sops
];
};
};
};
} }