mirror of
https://github.com/Moe1369/nixos-config.git
synced 2024-10-18 04:34:08 +02:00
more flake experiments
This commit is contained in:
parent
4fbc1b8c68
commit
1a73be1ff7
12
flake.lock
12
flake.lock
@ -27,11 +27,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723607977,
|
||||
"narHash": "sha256-ueu9wxOlTYyxhmPEwlRB5uhPOdDXY4n7+rd+hiPBAzU=",
|
||||
"lastModified": 1723743257,
|
||||
"narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "9b87c1c781af3cd837847f7042723b76f6d7472e",
|
||||
"rev": "e4e0ca14918919300e04e80c34036028b4370640",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -104,11 +104,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723712959,
|
||||
"narHash": "sha256-+QFsotDeSKF9L1NvqVMp0V/Sk4C+aPQ1HGMMmLUXSPY=",
|
||||
"lastModified": 1723804780,
|
||||
"narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "39f77980d14e007990fb30b7ab859057c307e05c",
|
||||
"rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
21
flake.nix
21
flake.nix
@ -1,6 +1,5 @@
|
||||
{
|
||||
description = "Moe.OS";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
@ -19,8 +18,7 @@
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system;};
|
||||
lib = nixpkgs.lib;
|
||||
in
|
||||
{
|
||||
|
||||
systemModules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
./modules/system/apps-shell
|
||||
@ -39,11 +37,15 @@
|
||||
./modules/user/git
|
||||
./modules/user/homeversion
|
||||
];
|
||||
in
|
||||
{
|
||||
|
||||
nixosConfigurations = {
|
||||
computer-mo = nixpkgs.lib.nixosSystem {
|
||||
hostName = "computer-mo";
|
||||
computer-mo = let
|
||||
user = "mo";
|
||||
hostName = "computer-mo";
|
||||
in lib.nixosSystem {
|
||||
specialArgs = {inherit systemModules; inherit userModules; inherit system;};
|
||||
system = system;
|
||||
modules = systemModules ++ [
|
||||
jovian.nixosModules.jovian
|
||||
@ -56,11 +58,10 @@
|
||||
./modules/system/plasma
|
||||
./modules/system/steam
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.${user} = import ./modules/user/plasma;
|
||||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.extraSpecialArgs = { inherit pkgs; };
|
||||
|
||||
home-manager.users.${user}.imports = userModules ++ [
|
||||
./modules/user/plasma
|
||||
];
|
||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||
}
|
||||
];
|
||||
|
7
modules/system/home-manager/default.nix
Normal file
7
modules/system/home-manager/default.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ home-manager, pkgs, ... }:
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit pkgs; };
|
||||
home-manager.backupFileExtension = "backup";
|
||||
}
|
@ -2,6 +2,6 @@
|
||||
{
|
||||
users.users.${user} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "Networkmanager" ];
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user