diff --git a/core/users.nix b/core/users.nix index be6fbd9..7394725 100644 --- a/core/users.nix +++ b/core/users.nix @@ -13,13 +13,21 @@ inputs.home-manager.nixosModules.default ]; - + # To add a user, copy the template and adjust it to match, + # then the same with the home-manager block below, then + # add new $user.nix file in home/users/ by copyoing the + # existing template + # + # + # A suite of programs and applications has been provided + # via a shared home.nix file, as well as a common config + # across machines and users. Please do not add or remove + # entries outside of these mentioned locations, thankyou& + users.users = { - # To add users, copy and adjust to needs. - - # coffee = { - # description = "Coffee Beans"; + # TEMPLATE = { + # description = "TEMPLATE"; # isNormalUser = true; # initialPassword = "password"; # shell = pkgs.fish; @@ -29,6 +37,17 @@ # ]; # }; + coffee = { + description = "Coffee Beans"; + isNormalUser = true; + initialPassword = "password"; + shell = pkgs.fish; + extraGroups = [ + "wheel" + "networkmanager" + ]; + }; + serenity = { description = "Serenity Amalgam"; isNormalUser = true; @@ -49,7 +68,7 @@ users = { # coffee = { - # imports = [ ../home/home.nix ]; + # imports = [ ../home/users/coffee.nix ]; # home = { # username = "coffee"; # homeDirectory = "/home/coffee"; diff --git a/flake.lock b/flake.lock index c0c32a6..b72ec4f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1712356478, + "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", "type": "github" }, "original": { @@ -20,41 +20,62 @@ "type": "github" } }, - "nixos-hardware": { + "hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", - "owner": "NixOS", + "lastModified": 1712566108, + "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=", + "owner": "nixos", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "master", + "owner": "nixos", "repo": "nixos-hardware", "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712462372, + "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", - "owner": "NixOS", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "disko": "disko", - "nixos-hardware": "nixos-hardware", + "hardware": "hardware", + "home-manager": "home-manager", "nixpkgs": "nixpkgs" } } diff --git a/home/home.nix b/home/home.nix new file mode 100644 index 0000000..11c888e --- /dev/null +++ b/home/home.nix @@ -0,0 +1,44 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ./hyprland + ./theme + ./kitty.nix + ./git.nix + ]; + + home = { + username = "serenity"; + homeDirectory = "/home/serenity"; + + packages = with pkgs; [ + firefox + lagrange + tor-browser-bin + discord + obsidian + vscode + kitty + micro + pipes + cbonsai + hyfetch + cmatrix + peaclock + ]; + + stateVersion = "23.11"; + }; + + programs.home-manager.enable = true; + + systemd.user.startServices = "sd-switch"; + +} diff --git a/home/users/coffee.nix b/home/users/coffee.nix new file mode 100644 index 0000000..8861e62 --- /dev/null +++ b/home/users/coffee.nix @@ -0,0 +1,23 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ../home.nix + ]; + + home = { + + packages = with pkgs; [ + + ]; + + stateVersion = "23.11"; + }; + +} diff --git a/home/users/serenity.nix b/home/users/serenity.nix new file mode 100644 index 0000000..8861e62 --- /dev/null +++ b/home/users/serenity.nix @@ -0,0 +1,23 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ../home.nix + ]; + + home = { + + packages = with pkgs; [ + + ]; + + stateVersion = "23.11"; + }; + +}