minor refractor

This commit is contained in:
js0ny 2025-10-11 18:13:54 +01:00
parent fec83b860d
commit d31cb14b88
7 changed files with 55 additions and 14 deletions

34
nixcfgs/flake.lock generated
View file

@ -1,5 +1,23 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -97,12 +115,28 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
"plasma-manager": "plasma-manager"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -1,9 +1,11 @@
# ~/.dotfiles/nixcfgs/flake.nix
{
description = "A simple NixOS flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-flatpak.url = "github:gmodena/nix-flatpak";
flake-utils.url = "github:numtide/flake-utils";
nix-darwin = {
url = "github:nix-darwin/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs";
@ -28,39 +30,40 @@
plasma-manager,
...
} @ inputs: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
specialArgs = {inherit inputs;};
in {
nixosConfigurations.zp = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [
nix-flatpak.nixosModules.nix-flatpak
./hosts/zp.nix
./hardware-configuration.nix
./hosts/zp
];
};
nixosConfigurations.zephyrus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [
./hosts/zephyrus
home-manager.nixosModules.home-manager
{
# nix-flatpak.homeManagerModules.nix-flatpak
home-manager.sharedModules = [plasma-manager.homeModules.plasma-manager nix-flatpak.homeManagerModules.nix-flatpak];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.js0ny = import ./users/js0ny;
nixpkgs.config.allowUnfree = true;
}
];
};
darwinConfigurations."zen" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
inherit specialArgs;
modules = [
./hosts/zen
];
};
homeConfigurations.js0ny = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny
plasma-manager.homeModules.plasma-manager
nix-flatpak.homeManagerModules.nix-flatpak
];
};
};
}

View file

@ -22,6 +22,7 @@
./packages.nix
];
nixpkgs.config.allowUnfree = true;
networking.hostName = "zephyrus";
system.stateVersion = "25.05";
}

View file

@ -28,6 +28,7 @@
../../modules/home/programs/zoxide.nix
# ./flatpak.nix
];
nixpkgs.config.allowUnfree = true;
home.username = "js0ny";
home.homeDirectory = "/home/js0ny";

View file

@ -5,7 +5,7 @@
ni = "touch";
cls = "clear";
ii = "open";
c = "codium";
c = "code";
aic = "aichat -s";
};
in {

View file

@ -0,0 +1,2 @@
aaa
d: