moe1369/nixos-config
1
0
Fork 0
mirror of https://github.com/Moe1369/nixos-config.git synced 2024-10-18 04:14:08 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

more flake experiments

Browse Source
This commit is contained in:
Mohamed Chrayed 2024-08-16 14:43:41 +02:00
parent 4fbc1b8c68
commit 1a73be1ff7
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -27,11 +27,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1723607977, "lastModified": 1723743257,
"narHash": "sha256-ueu9wxOlTYyxhmPEwlRB5uhPOdDXY4n7+rd+hiPBAzU=", "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9b87c1c781af3cd837847f7042723b76f6d7472e", "rev": "e4e0ca14918919300e04e80c34036028b4370640",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +104,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723712959, "lastModified": 1723804780,
"narHash": "sha256-+QFsotDeSKF9L1NvqVMp0V/Sk4C+aPQ1HGMMmLUXSPY=", "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "39f77980d14e007990fb30b7ab859057c307e05c", "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
flake.nix
View File

@ -1,6 +1,5 @@
{ {
description = "Moe.OS"; description = "Moe.OS";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager = { home-manager = {
@ -19,8 +18,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system;}; pkgs = import nixpkgs { inherit system;};
lib = nixpkgs.lib; lib = nixpkgs.lib;
in
{
systemModules = [ systemModules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./modules/system/apps-shell ./modules/system/apps-shell
@ -39,11 +37,15 @@
./modules/user/git ./modules/user/git
./modules/user/homeversion ./modules/user/homeversion
]; ];
in
{
nixosConfigurations = { nixosConfigurations = {
computer-mo = nixpkgs.lib.nixosSystem { computer-mo = let
hostName = "computer-mo"; user = "mo";
user = "mo"; hostName = "computer-mo";
in lib.nixosSystem {
specialArgs = {inherit systemModules; inherit userModules; inherit system;};
system = system; system = system;
modules = systemModules ++ [ modules = systemModules ++ [
jovian.nixosModules.jovian jovian.nixosModules.jovian
@ -56,11 +58,10 @@
./modules/system/plasma ./modules/system/plasma
./modules/system/steam ./modules/system/steam
{ {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.users.${user}.imports = userModules ++ [
home-manager.users.${user} = import ./modules/user/plasma; ./modules/user/plasma
home-manager.backupFileExtension = "backup"; ];
home-manager.extraSpecialArgs = { inherit pkgs; };
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
} }
]; ];

7
modules/system/home-manager/default.nix Normal file
View 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
modules/system/users/default.nix
View File

@ -2,6 +2,6 @@
{ {
users.users.${user} = { users.users.${user} = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "Networkmanager" ]; extraGroups = [ "wheel" "networkmanager" ];
}; };
} }