From 6a1867074903676a05823d3f11a5396476382e52 Mon Sep 17 00:00:00 2001
From: m3tam3re <m@m3tam3re.com>
Date: Wed, 28 Aug 2024 16:16:23 +0200
Subject: [PATCH] video2

---
 flake.lock                        |  8 ++++----
 home/m3tam3re/home.nix            | 13 ++++++++-----
 hosts/common/default.nix          |  8 ++++++++
 hosts/common/users/default.nix    |  3 +++
 hosts/common/users/m3tam3re       |  1 +
 hosts/common/users/m3tam3re.nix   | 30 ++++++++++++++++++++++++++++++
 hosts/m3-kratos/configuration.nix |  8 --------
 7 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 hosts/common/users/default.nix
 create mode 120000 hosts/common/users/m3tam3re
 create mode 100644 hosts/common/users/m3tam3re.nix

diff --git a/flake.lock b/flake.lock
index 62a6880..9c1271a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,16 +38,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711668574,
-        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
+        "lastModified": 1724531977,
+        "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
+        "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix
index 201bda7..a8ce00e 100644
--- a/home/m3tam3re/home.nix
+++ b/home/m3tam3re/home.nix
@@ -1,10 +1,12 @@
 # This is a default home.nix generated by the follwing hone-manager command
-# 
+#
 # home-manager init ./
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = lib.mkDefault "your-name";
@@ -21,7 +23,8 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
+  home.packages = with pkgs; [
+    cowsay
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 9f473e6..6e03062 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -5,6 +5,14 @@
   outputs,
   ...
 }: {
+  imports = [
+    ./users
+    inputs.home-manager.nixosModules.home-manager
+  ];
+  home-manager = {
+    useUserPackages = true;
+    extraSpecialArgs = {inherit inputs outputs;};
+  };
   nixpkgs = {
     # You can add overlays here
     overlays = [
diff --git a/hosts/common/users/default.nix b/hosts/common/users/default.nix
new file mode 100644
index 0000000..61a283f
--- /dev/null
+++ b/hosts/common/users/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [./m3tam3re.nix];
+}
diff --git a/hosts/common/users/m3tam3re b/hosts/common/users/m3tam3re
new file mode 120000
index 0000000..69af36b
--- /dev/null
+++ b/hosts/common/users/m3tam3re
@@ -0,0 +1 @@
+../../../home/m3tam3re
\ No newline at end of file
diff --git a/hosts/common/users/m3tam3re.nix b/hosts/common/users/m3tam3re.nix
new file mode 100644
index 0000000..9387387
--- /dev/null
+++ b/hosts/common/users/m3tam3re.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  users.users.m3tam3re = {
+    initialHashedPassword = "$y$j9T$IoChbWGYRh.rKfmm0G86X0$bYgsWqDRkvX.EBzJTX.Z0RsTlwspADpvEF3QErNyCMC";
+    isNormalUser = true;
+    description = "m3tam3re";
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "libvirtd"
+      "flatpak"
+      "audio"
+      "video"
+      "plugdev"
+      "input"
+      "kvm"
+      "qemu-libvirtd"
+    ];
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
+    ];
+    packages = [inputs.home-manager.packages.${pkgs.system}.default];
+  };
+  home-manager.users.m3tam3re =
+    import m3tam3re/${config.networking.hostName}.nix;
+}
diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix
index 671c5d4..e87af75 100644
--- a/hosts/m3-kratos/configuration.nix
+++ b/hosts/m3-kratos/configuration.nix
@@ -46,14 +46,6 @@
     variant = "";
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.m3tam3re = {
-    isNormalUser = true;
-    description = "m3tam3re";
-    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [];
-  };
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;