From ae956898d99232fd64d97f1707177b032c9b329b Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 2 Sep 2023 15:18:05 +0200
Subject: [PATCH] add user ronja to pc3

---
 home-ronja.nix   | 118 +++++++++++++++++++++++++++++++++++++++++++++++
 home-vinzenz.nix |   2 +-
 vinzenz-lpt.nix  |  18 ++++----
 vinzenz-pc3.nix  |   2 +-
 4 files changed, 130 insertions(+), 10 deletions(-)
 create mode 100644 home-ronja.nix

diff --git a/home-ronja.nix b/home-ronja.nix
new file mode 100644
index 0000000..429e970
--- /dev/null
+++ b/home-ronja.nix
@@ -0,0 +1,118 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Define user account
+  users.users.ronja = {
+    isNormalUser = true;
+    description = "Ronja Spiegelberg";
+    extraGroups = ["networkmanager" "wheel"];
+    shell = pkgs.zsh;
+  };
+
+  # home manager
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.ronja = {
+    config,
+    pkgs,
+    ...
+  }: {
+    home = {
+      username = "ronja";
+      homeDirectory = "/home/ronja";
+      stateVersion = "22.11";
+
+      sessionVariables = {
+        EDITOR = "nano";
+      };
+
+      packages = with pkgs; [
+        ## Apps
+        steam
+        wine-staging
+        telegram-desktop
+        tldr
+        powerline
+        powerline-fonts
+        lutris
+        kdiff3
+
+        (lutris.override {
+          extraPkgs = pkgs: [
+            # List package dependencies here
+          ];
+          extraLibraries = pkgs: [
+            # List library dependencies here
+          ];
+        })
+      ];
+
+      file.".nanorc".text = ''
+        set linenumbers
+        set mouse
+      '';
+    };
+
+    programs = {
+      home-manager.enable = true;
+
+      firefox.enable = true;
+      command-not-found.enable = true;
+      dircolors.enable = true;
+      htop.enable = true;
+
+      zsh = {
+        enable = true;
+
+        enableSyntaxHighlighting = true;
+        enableAutosuggestions = true;
+        enableVteIntegration = true;
+
+        history = {
+          size = 10000;
+          path = "${config.xdg.dataHome}/zsh/history";
+          expireDuplicatesFirst = true;
+        };
+
+        oh-my-zsh = {
+          enable = true;
+          theme = "agnoster";
+          plugins = ["git" "sudo" "systemadmin"];
+        };
+      };
+
+      git = {
+        enable = true;
+        userName = "Ronja Spiegelberg";
+        userEmail = "ronja.spiegelberg@gmail.com";
+
+        extraConfig = {
+          pull.ff = "only";
+          init.defaultBranch = "main";
+          merge.tool = "kdiff3";
+        };
+      };
+
+      gh = {
+        enable = true;
+        enableGitCredentialHelper = true;
+      };
+
+      chromium = {
+        enable = true;
+        extensions = [
+          {
+            # ublock origin
+            id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+          }
+          {
+            id = "dcpihecpambacapedldabdbpakmachpb";
+            updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/home-vinzenz.nix b/home-vinzenz.nix
index 5e3806b..3821c90 100644
--- a/home-vinzenz.nix
+++ b/home-vinzenz.nix
@@ -35,7 +35,7 @@
         wine-staging
         insync
         # gnome-secrets
-        tdesktop
+        telegram-desktop
         simple-scan
         wireguard-tools
         # steamlink
diff --git a/vinzenz-lpt.nix b/vinzenz-lpt.nix
index 882f671..28df583 100644
--- a/vinzenz-lpt.nix
+++ b/vinzenz-lpt.nix
@@ -20,15 +20,17 @@
     loader.efi.efiSysMountPoint = "/boot/efi";
   };
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf";
-    fsType = "btrfs";
-    options = ["subvol=@"];
-  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf";
+      fsType = "btrfs";
+      options = ["subvol=@"];
+    };
 
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/2381-1CD2";
-    fsType = "vfat";
+    "/boot/efi" = {
+      device = "/dev/disk/by-uuid/2381-1CD2";
+      fsType = "vfat";
+    };
   };
 
   swapDevices = [
diff --git a/vinzenz-pc3.nix b/vinzenz-pc3.nix
index b02846a..60ef59a 100644
--- a/vinzenz-pc3.nix
+++ b/vinzenz-pc3.nix
@@ -7,10 +7,10 @@
   networking.hostName = "vinzenz-pc3";
 
   imports = [
-    ./vinzenz-pc3-hardware-configuration.nix
     ./common.nix
     ./kde.nix
     ./home-vinzenz.nix
+    ./home-ronja.nix
   ];
 
   users.users.vinzenz.openssh.authorizedKeys.keys = [