From 2f0fa12da4481a0898c2e727d2377ca80556c4b3 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sun, 11 Jun 2023 10:18:23 +0200
Subject: [PATCH] nix: update and add wolfi user

---
 nix/configuration.nix | 38 +++++++++++++++++++++++++++++---------
 nix/flake.lock        | 24 ++++++++++++------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/nix/configuration.nix b/nix/configuration.nix
index 8cc9827..c962360 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -9,7 +9,8 @@
     ./hardware-configuration.nix
   ];
 
-  # Bootloader.
+  # Bootloader
+  # Use this for simple nix boot menu, if no dual boot required
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
@@ -77,7 +78,7 @@
   services.xserver.windowManager.i3.extraPackages = with pkgs; [
     rofi
     i3lock
-    i3status-rust
+    unstable.i3status-rust
     nitrogen
   ];
 
@@ -127,12 +128,6 @@
     shell = pkgs.zsh;
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      firefox
-      thunderbird
-      nextcloud-client
-      qalculate-gtk
-      schildichat-desktop
-      tdesktop
       hunspell
       hunspellDicts.de_DE
       hunspellDicts.en_US
@@ -142,10 +137,27 @@
       unstable.zoom-us
       qutebrowser
       evince
+
+      unetbootin
+
+      # For SSS exercises
+      pwndbg
+      gcc
+      hexedit
     ];
   };
 
   users.groups.julian = { gid = 1000; };
+  users.groups.wolfi = { gid = 1001; };
+
+  users.users.wolfi = {
+    isNormalUser = true;
+    description = "Wolfi";
+    uid = 1001;
+    group = "wolfi";
+    shell = pkgs.fish;
+    extraGroups = [ "networkmanager" "wheel" ];
+  };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -171,6 +183,13 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    firefox
+    thunderbird
+    nextcloud-client
+    qalculate-gtk
+    schildichat-desktop
+    tdesktop
+
     tealdeer
     gcolor2 # gcolor3 does not work
     vim
@@ -214,7 +233,7 @@
     python3
     black
     libnotify
-#     unstable.tor-browser-bundle-bin
+    #     unstable.tor-browser-bundle-bin
     libclang
     libreoffice
     killall
@@ -232,6 +251,7 @@
     gradle
     maven
     android-tools
+    scrcpy
     dvdisaster
     mate.engrampa
     # toybox
diff --git a/nix/flake.lock b/nix/flake.lock
index 9aaffad..050adfe 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -22,11 +22,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1681398073,
-        "narHash": "sha256-EOctfPaRaJGi9qrhWRG4Zjbnc0Rbg51uOY0HOaBftp0=",
+        "lastModified": 1686409329,
+        "narHash": "sha256-anq+tPJ/GyH6TJa9N+ln7klg5e+hmR1Megd0TXIKLEU=",
         "owner": "doronbehar",
         "repo": "nix-matlab",
-        "rev": "5d5b91151627c86d8a6f2bfa846fd0ccf02edb72",
+        "rev": "7b4a236e3b525f41c53b73013ad05f115a779835",
         "type": "gitlab"
       },
       "original": {
@@ -37,11 +37,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681358109,
-        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
+        "lastModified": 1686398752,
+        "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
+        "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1681303793,
-        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
+        "lastModified": 1686319658,
+        "narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
+        "rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1681269223,
-        "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=",
+        "lastModified": 1686392259,
+        "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9",
+        "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88",
         "type": "github"
       },
       "original": {