refactor: drop disko, simplify inputs, centralize fuse/rclone, bump state versions
- Remove disko everywhere: - Delete hosts/Nixbook/disko.nix and hosts/Nixtest/disko.nix - Drop disko input, modules, and disko-install app - Update README to remove disko mention - Simplify flake inputs: - Use nixpkgs = nixos-unstable only - Home Manager -> master (follows nixpkgs) - Remove nixpkgs-unstable and vscode-extensions - Pass allowUnfree via specialArgs - Centralize storage tools: - Add fuse3 and rclone to hosts/common/default.nix - Remove hosts/common/rclone.nix and screen.nix - Add user thiago to "fuse" group - Drop per-host rclone packages - NVIDIA module: - Use pkgs.linuxPackages.nvidiaPackages.latest (no unstable import) - Keep nvidiaSettings=true, open=false - Remove sunshine service block - Hosts: - Nixstation: remove Hyprland block, zramSwap 30% -> 25% - Clean hardware-configuration args - Versions: - system.stateVersion: 24.05 -> 25.11 (Nixstation) - home.stateVersion: 24.05 -> 25.11 - README: adjust Nixbook and common modules descriptions
This commit is contained in:
parent
60eef49dc2
commit
b41147d8e1
14 changed files with 22 additions and 216 deletions
33
flake.nix
33
flake.nix
|
|
@ -2,57 +2,43 @@
|
|||
description = "my NixOS Config";
|
||||
|
||||
inputs = {
|
||||
disko.url = "github:nix-community/disko";
|
||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
};
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
vscode-extensions = {
|
||||
url = "github:nix-community/nix-vscode-extensions";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
flake-utils.follows = "vscode-extensions/flake-utils";
|
||||
flake-utils.inputs.nixpkgs.follows = "nixpkgs";
|
||||
vs-extensions-pkgs.follows = "vscode-extensions/nixpkgs";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs
|
||||
, home-manager
|
||||
, nixpkgs-unstable
|
||||
, ...
|
||||
}@inputs:
|
||||
let
|
||||
inherit (self) outputs;
|
||||
system = "x86_64-linux";
|
||||
unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; };
|
||||
pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
Nixbook = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
allowUnfree = true;
|
||||
};
|
||||
modules = [
|
||||
./hosts/Nixbook
|
||||
./hosts/Nixbook/disko.nix
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
};
|
||||
Nixstation = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs outputs unstable; };
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
allowUnfree = true;};
|
||||
modules = [
|
||||
./hosts/Nixstation
|
||||
];
|
||||
|
|
@ -83,12 +69,5 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
apps.x86_64-linux.disko-install = {
|
||||
type = "app";
|
||||
program = "${inputs.disko.packages.x86_64-linux.disko}/bin/disko-install";
|
||||
};
|
||||
|
||||
devShells.x86_64-linux = { };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue