From 805d62549159d2a6b952f2385a324b1c9d26c07d Mon Sep 17 00:00:00 2001
From: bayram-budak <byabdk@icloud.com>
Date: Mon, 6 Nov 2023 22:41:36 +0100
Subject: [PATCH 01/10] first attempt at adding ente public

---
 server/modules/nginx.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/server/modules/nginx.nix b/server/modules/nginx.nix
index 6691ba8..47f5075 100644
--- a/server/modules/nginx.nix
+++ b/server/modules/nginx.nix
@@ -52,6 +52,34 @@
                     '';
                     proxyPass = "http://127.0.0.1:8080";
                 };
+            },
+            #discord bot for tracking useractivity public version 
+            "activitytracker.site" = {
+                root = "/data/website";
+                forceSSL = true;
+                enableACME = true;
+                locations."~* \\.(jpg)$".extraConfig= ''
+                    add_header Access-Control-Allow-Origin *;
+                '';
+                locations."~ ^/(stash|resources|css)".extraConfig=''
+                	client_max_body_size    5000M;
+                	proxy_redirect          off;
+                	proxy_set_header        Host $host;
+                	proxy_set_header        X-Real-IP $remote_addr;
+                	proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+                	proxy_set_header        X-Forwarded-Proto $scheme;
+                	proxy_set_header        X-NginX-Proxy true;
+                	proxy_pass http://localhost:5092;
+                '';
+		        locations."/" = {
+			        tryFiles = "$uri $uri/ /tracker-site/index.html =404";
+		        };
+                locations."/api" = {
+                    extraConfig =''
+                        rewrite /api/(.*) /$1 break;
+                    '';
+                    proxyPass = "http://127.0.0.1:8080";
+                };
             };
             "adguard.local" = {
                 locations."/".proxyPass = "http://127.0.0.1:3000";

From f96765d8fb047a819b80eb2d3056140966d9a0c6 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:31:14 +0000
Subject: [PATCH 02/10] enable direnv

---
 users/anon.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/users/anon.nix b/users/anon.nix
index f6775f4..fda5f03 100644
--- a/users/anon.nix
+++ b/users/anon.nix
@@ -17,6 +17,11 @@ in
     useUserPackages = true;
     users.${user} = {
       programs.git.enable = true;
+        programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+      };
       programs.zsh = {
         enable = true;
         enableCompletion = true;

From 9bcd8c09d0cee086912e54e9bf89f0462749a2d4 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:34:00 +0000
Subject: [PATCH 03/10] extract gnome

---
 flake.nix                   |  1 +
 modules/graphical/gnome.nix | 53 +++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 modules/graphical/gnome.nix

diff --git a/flake.nix b/flake.nix
index 1ffe171..ae3afc6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,6 +95,7 @@
         modules = [
           ./users/kopatz.nix
           # Todo: refactor file layout
+          ./modules/graphical/gnome.nix
           ./laptop/configuration.nix
           ./modules/virt-manager.nix
           ./modules/ssh.nix
diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix
new file mode 100644
index 0000000..0a71908
--- /dev/null
+++ b/modules/graphical/gnome.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    layout = "at";
+    xkbVariant = "";
+    enable = true;
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
+
+  environment.gnome.excludePackages = (with pkgs; [
+  gnome-photos
+  gnome-tour
+  ]) ++ (with pkgs.gnome; [
+    cheese # webcam tool
+    gnome-music
+    gnome-terminal
+    gedit # text editor
+    epiphany # web browser
+    #geary # email reader
+    evince # document viewer
+    gnome-characters
+    totem # video player
+    tali # poker game
+    iagno # go game
+    hitori # sudoku game
+    atomix # puzzle game
+  ]);
+
+  environment.systemPackages = with pkgs; [
+    wmctrl
+    gnome.mutter
+    gnome.adwaita-icon-theme
+    gnome.gnome-settings-daemon
+    gnome.gnome-tweaks
+    gnome.dconf-editor
+    gruvbox-gtk-theme
+    colloid-icon-theme
+    gnomeExtensions.appindicator
+    gnomeExtensions.just-perfection
+    gnomeExtensions.system-monitor
+    gnomeExtensions.dash2dock-lite
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.vitals
+    gnomeExtensions.rounded-window-corners
+    gnomeExtensions.wallpaper-switcher
+    gnomeExtensions.backslide
+    gnomeExtensions.nextcloud-folder
+    gnomeExtensions.tray-icons-reloaded
+    gnomeExtensions.blur-my-shell
+  ];
+}

From 71705b84c0318f2a5fe5c1b578dc299f0d70242a Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Tue, 21 Nov 2023 23:19:35 +0100
Subject: [PATCH 04/10] add pc

---
 flake.nix                             |  15 +++
 modules/graphical/gnome.nix           |   6 ++
 modules/graphical/plasma.nix          |  11 +++
 modules/graphical/shared.nix          |  82 +++++++++++++++++
 systems/pc/configuration.nix          | 127 ++++++++++++++++++++++++++
 systems/pc/hardware-configuration.nix |  37 ++++++++
 users/kopatz.nix                      |   2 +
 7 files changed, 280 insertions(+)
 create mode 100644 modules/graphical/plasma.nix
 create mode 100644 modules/graphical/shared.nix
 create mode 100644 systems/pc/configuration.nix
 create mode 100644 systems/pc/hardware-configuration.nix

diff --git a/flake.nix b/flake.nix
index ae3afc6..bb305b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,6 +85,21 @@
         inherit inputs ;
       };
     };
+    nixosConfigurations."kop-pc" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = {
+          inherit inputs ;
+        };
+        modules = [
+          ./users/kopatz.nix
+          ./modules/graphical/plasma.nix
+          ./modules/graphical/shared.nix
+          ./modules/nix-settings.nix
+          ./systems/pc/configuration.nix
+          agenix.nixosModules.default
+          home-manager.nixosModules.home-manager
+        ];
+    };
     nixosConfigurations."nix-laptop" = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix
index 0a71908..ca59c8d 100644
--- a/modules/graphical/gnome.nix
+++ b/modules/graphical/gnome.nix
@@ -9,6 +9,12 @@
     desktopManager.gnome.enable = true;
   };
 
+  # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
+  systemd.services."getty@tty1".enable = false;
+  systemd.services."autovt@tty1".enable = false;
+
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   environment.gnome.excludePackages = (with pkgs; [
   gnome-photos
   gnome-tour
diff --git a/modules/graphical/plasma.nix b/modules/graphical/plasma.nix
new file mode 100644
index 0000000..4c88c40
--- /dev/null
+++ b/modules/graphical/plasma.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    layout = "at";
+    xkbVariant = "";
+    enable = true;
+    displayManager.sddm.enable = true;
+    desktopManager.plasma5.enable = true;
+  };
+}
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
new file mode 100644
index 0000000..aff693f
--- /dev/null
+++ b/modules/graphical/shared.nix
@@ -0,0 +1,82 @@
+{ config, pkgs, inputs, ... }:
+
+let
+  keepassWithPlugins = pkgs.keepass.override {
+    plugins = [
+      pkgs.keepass-keepassrpc
+    ];
+  };
+in
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+  programs.kdeconnect.enable = true;
+
+  fonts.fontDir.enable = true;
+  fonts.fonts = with pkgs; [
+    nerdfonts
+  ];
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+    allowedUDPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+    wget
+    nixos-option
+    kate
+    keepassWithPlugins
+    jetbrains.idea-ultimate
+    jetbrains.rider
+    dotnet-sdk_7
+    dotnet-runtime_7
+    neovim
+    htop
+    btop
+    git
+    xfce.thunar
+    killall
+    xclip
+    usbutils
+    bun
+    inputs.agenix.packages."x86_64-linux".default
+    insomnia
+    remmina
+    nextcloud-client
+    #podman-compose
+    #arion # docker
+    neofetch
+    thunderbird
+    rofi
+    pdfgrep
+    taisei
+    ncdu
+    localsend
+    element-desktop
+  ];
+
+  environment.sessionVariables = {
+    DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
+  };
+
+  ### docker
+  virtualisation.docker.enable = true;
+}
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
new file mode 100644
index 0000000..3b7d477
--- /dev/null
+++ b/systems/pc/configuration.nix
@@ -0,0 +1,127 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Enable OpenGL
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  services.xserver.videoDrivers = ["nvidia"];
+  hardware.nvidia = {
+    # Modesetting is required.
+    modesetting.enable = true;
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+    powerManagement.enable = false;
+    # Fine-grained power management. Turns off GPU when not in use.
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+    powerManagement.finegrained = false;
+    # Use the NVidia open source kernel module (not to be confused with the
+    # independent third-party "nouveau" open source driver).
+    # Support is limited to the Turing and later architectures. Full list of 
+    # supported GPUs is at: 
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
+    # Only available from driver 515.43.04+
+    # Currently alpha-quality/buggy, so false is currently the recommended setting.
+    open = false;
+    # Enable the Nvidia settings menu,
+	# accessible via `nvidia-settings`.
+    nvidiaSettings = true;
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+  networking.hostName = "kop-pc"; # Define your hostname.
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "Europe/Vienna";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_AT.UTF-8";
+    LC_IDENTIFICATION = "de_AT.UTF-8";
+    LC_MEASUREMENT = "de_AT.UTF-8";
+    LC_MONETARY = "de_AT.UTF-8";
+    LC_NAME = "de_AT.UTF-8";
+    LC_NUMERIC = "de_AT.UTF-8";
+    LC_PAPER = "de_AT.UTF-8";
+    LC_TELEPHONE = "de_AT.UTF-8";
+    LC_TIME = "de_AT.UTF-8";
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = lib.mkForce "de";
+    xkbVariant = lib.mkForce "us";
+  };
+
+  # Configure console keymap
+  console.keyMap = "de";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Enable automatic login for the user.
+  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.user = "kopatz";
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.05"; # Did you read the comment?
+
+}
diff --git a/systems/pc/hardware-configuration.nix b/systems/pc/hardware-configuration.nix
new file mode 100644
index 0000000..b572ac4
--- /dev/null
+++ b/systems/pc/hardware-configuration.nix
@@ -0,0 +1,37 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/dd65bdf8-c003-439c-a1aa-d050cb20959d";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5AA5-45E0";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/users/kopatz.nix b/users/kopatz.nix
index a990c9a..fe16284 100644
--- a/users/kopatz.nix
+++ b/users/kopatz.nix
@@ -33,6 +33,7 @@ in
           theme = "eastwood";
         };
       };
+      programs.git.enable = true;
       home.stateVersion = "23.05";
     };
   };
@@ -47,6 +48,7 @@ in
       (discord.override { withVencord = true; })
       librewolf
       ungoogled-chromium
+      brave
     ];
     openssh.authorizedKeys.keys = [
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas"

From 67f0cf7d6e5eaebcbc58ffa4b2d0643c2b73c027 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Wed, 22 Nov 2023 12:12:11 +0100
Subject: [PATCH 05/10] more pc configuration

---
 flake.nix                                      | 10 ++++++++--
 modules/flatpak.nix                            |  3 +++
 modules/gpg.nix                                | 13 +++++++++++++
 modules/nix/index.nix                          |  7 +++++++
 modules/nix/ld.nix                             |  3 +++
 modules/{nix-settings.nix => nix/settings.nix} |  0
 modules/support/ntfs.nix                       |  3 +++
 modules/wooting.nix                            | 11 +++++++++++
 users/anon.nix                                 |  2 +-
 users/kopatz.nix                               |  5 +++++
 10 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 modules/flatpak.nix
 create mode 100644 modules/gpg.nix
 create mode 100644 modules/nix/index.nix
 create mode 100644 modules/nix/ld.nix
 rename modules/{nix-settings.nix => nix/settings.nix} (100%)
 create mode 100644 modules/support/ntfs.nix
 create mode 100644 modules/wooting.nix

diff --git a/flake.nix b/flake.nix
index bb305b9..96da302 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
         ./modules/motd.nix
         ./modules/postgres.nix
         ./modules/fail2ban.nix
-        ./modules/nix-settings.nix
+        ./modules/nix/settings.nix
         ./modules/adguard.nix
         ./modules/git.nix
         ./modules/github-runner.nix
@@ -94,7 +94,13 @@
           ./users/kopatz.nix
           ./modules/graphical/plasma.nix
           ./modules/graphical/shared.nix
-          ./modules/nix-settings.nix
+          ./modules/nix/settings.nix
+          ./modules/nix/index.nix
+          ./modules/nix/ld.nix
+          ./modules/gpg.nix
+          ./modules/flatpak.nix
+          ./modules/wooting.nix
+          ./modules/support/ntfs.nix
           ./systems/pc/configuration.nix
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
new file mode 100644
index 0000000..e63b2ac
--- /dev/null
+++ b/modules/flatpak.nix
@@ -0,0 +1,3 @@
+{
+      services.flatpak.enable = true;
+}
diff --git a/modules/gpg.nix b/modules/gpg.nix
new file mode 100644
index 0000000..ebd5617
--- /dev/null
+++ b/modules/gpg.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}:
+{
+  #services.pcscd.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "qt";
+  };
+  #environment.systemPackages = with pkgs; [
+  #  pinentry-curses
+ # ];
+}
diff --git a/modules/nix/index.nix b/modules/nix/index.nix
new file mode 100644
index 0000000..e8e93b3
--- /dev/null
+++ b/modules/nix/index.nix
@@ -0,0 +1,7 @@
+{
+    programs.command-not-found.enable = false;
+    programs.nix-index = {
+        enable = true;
+        enableZshIntegration=true;
+    };
+}
diff --git a/modules/nix/ld.nix b/modules/nix/ld.nix
new file mode 100644
index 0000000..4ff6916
--- /dev/null
+++ b/modules/nix/ld.nix
@@ -0,0 +1,3 @@
+{
+  programs.nix-ld.enable = true;
+}
diff --git a/modules/nix-settings.nix b/modules/nix/settings.nix
similarity index 100%
rename from modules/nix-settings.nix
rename to modules/nix/settings.nix
diff --git a/modules/support/ntfs.nix b/modules/support/ntfs.nix
new file mode 100644
index 0000000..4f09762
--- /dev/null
+++ b/modules/support/ntfs.nix
@@ -0,0 +1,3 @@
+{
+  boot.supportedFilesystems = [ "ntfs" ];
+}
diff --git a/modules/wooting.nix b/modules/wooting.nix
new file mode 100644
index 0000000..eec4356
--- /dev/null
+++ b/modules/wooting.nix
@@ -0,0 +1,11 @@
+{ pkgs, ...}:
+{
+  services.udev.extraRules = ''
+    SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess"
+  '';  
+  
+  environment.systemPackages = with pkgs; [
+    wootility
+  ];
+}
diff --git a/users/anon.nix b/users/anon.nix
index fda5f03..f075a6e 100644
--- a/users/anon.nix
+++ b/users/anon.nix
@@ -17,7 +17,7 @@ in
     useUserPackages = true;
     users.${user} = {
       programs.git.enable = true;
-        programs.direnv = {
+      programs.direnv = {
         enable = true;
         enableZshIntegration = true;
         nix-direnv.enable = true;
diff --git a/users/kopatz.nix b/users/kopatz.nix
index fe16284..aa23b93 100644
--- a/users/kopatz.nix
+++ b/users/kopatz.nix
@@ -34,6 +34,11 @@ in
         };
       };
       programs.git.enable = true;
+      programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+      };
       home.stateVersion = "23.05";
     };
   };

From ea53f65f55caa78426b9f8db18e21c17a24a2c0e Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Wed, 22 Nov 2023 12:58:17 +0100
Subject: [PATCH 06/10] fix wooting

---
 flake.nix             |  1 +
 modules/wooting.nix   | 34 +++++++++++++++++++++++++++-------
 modules/wooting.rules | 12 ++++++++++++
 3 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 modules/wooting.rules

diff --git a/flake.nix b/flake.nix
index 96da302..8049576 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,7 @@
           ./modules/nix/ld.nix
           ./modules/gpg.nix
           ./modules/flatpak.nix
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./modules/wooting.nix
           ./modules/support/ntfs.nix
           ./systems/pc/configuration.nix
diff --git a/modules/wooting.nix b/modules/wooting.nix
index eec4356..7dcfda9 100644
--- a/modules/wooting.nix
+++ b/modules/wooting.nix
@@ -1,10 +1,30 @@
-{ pkgs, ...}:
-{
-  services.udev.extraRules = ''
-    SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess"
-  '';  
-  
+{ pkgs, lib, ...}:
+let 
+  wooting-udev = pkgs.stdenv.mkDerivation rec {
+    pname = "wooting-udev-rules";
+    version = "unstable-2023-03-31";
+
+    # Source: https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/
+    src = [ ./wooting.rules ];
+
+    dontUnpack = true;
+
+    installPhase = ''
+      install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules
+    '';
+
+    meta = with lib; {
+      homepage = "https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/";
+      description = "udev rules that give NixOS permission to communicate with Wooting keyboards";
+      platforms = platforms.linux;
+      license = "unknown";
+      maintainers = with maintainers; [ davidtwco ];
+    };
+};
+in
+{ 
+  services.udev.packages = [ wooting-udev ];
+
   environment.systemPackages = with pkgs; [
     wootility
   ];
diff --git a/modules/wooting.rules b/modules/wooting.rules
new file mode 100644
index 0000000..690484f
--- /dev/null
+++ b/modules/wooting.rules
@@ -0,0 +1,12 @@
+# Wooting Two HE (ARM)
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0666", GROUP="input"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0666", GROUP="input"
+# Wooting Two HE Alt-gamepad mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0666", GROUP="input"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0666", GROUP="input"
+# Wooting Two HE 2nd Alt-gamepad mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0666", GROUP="input"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0666", GROUP="input"
+
+# Wooting Two HE (ARM) update mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="123f", MODE:="0666", GROUP="input"

From 787fee318fdc120c07e57ee0ca7abf0779937808 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Wed, 22 Nov 2023 14:25:15 +0100
Subject: [PATCH 07/10] add tetrio

---
 modules/graphical/shared.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index aff693f..9beb70f 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -71,6 +71,7 @@ in
     ncdu
     localsend
     element-desktop
+    tetrio-desktop
   ];
 
   environment.sessionVariables = {

From 111eba465175714deb8dcebdf4e7e586bafeae9b Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Wed, 22 Nov 2023 17:26:15 +0100
Subject: [PATCH 08/10] add virtmanager to pc

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 8049576..b3f475e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,6 +98,7 @@
           ./modules/nix/index.nix
           ./modules/nix/ld.nix
           ./modules/gpg.nix
+          ./modules/virt-manager.nix
           ./modules/flatpak.nix
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./modules/wooting.nix

From 3654bb8d2bc6928e62fe9e87071aed260690d24b Mon Sep 17 00:00:00 2001
From: bayram-budak <byabdk@icloud.com>
Date: Wed, 22 Nov 2023 21:24:06 +0100
Subject: [PATCH 09/10] removed server folder

---
 server/modules/nginx.nix | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 server/modules/nginx.nix

diff --git a/server/modules/nginx.nix b/server/modules/nginx.nix
deleted file mode 100644
index e69de29..0000000

From 122fa5ee6495d402f048c5331ff5cb202a9d3913 Mon Sep 17 00:00:00 2001
From: bayram-budak <byabdk@icloud.com>
Date: Wed, 22 Nov 2023 23:04:05 +0100
Subject: [PATCH 10/10] updated nginx.nix for ente public

---
 modules/nginx.nix | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/modules/nginx.nix b/modules/nginx.nix
index a49ca1f..686c9d5 100644
--- a/modules/nginx.nix
+++ b/modules/nginx.nix
@@ -53,36 +53,26 @@
                     proxyPass = "http://127.0.0.1:8080";
                 };
  
- 	       #locations."~/books(.*)$" = {
+ 	           #locations."~/books(.*)$" = {
                #    proxyPass = "http://127.0.0.1:5000";
                #};
-            },
+            };
             #discord bot for tracking useractivity public version 
             "activitytracker.site" = {
+                #serverAliases = [
+                #     "localhost"
+                #]; 
                 root = "/data/website";
                 forceSSL = true;
                 enableACME = true;
-                locations."~* \\.(jpg)$".extraConfig= ''
-                    add_header Access-Control-Allow-Origin *;
-                '';
-                locations."~ ^/(stash|resources|css)".extraConfig=''
-                	client_max_body_size    5000M;
-                	proxy_redirect          off;
-                	proxy_set_header        Host $host;
-                	proxy_set_header        X-Real-IP $remote_addr;
-                	proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-                	proxy_set_header        X-Forwarded-Proto $scheme;
-                	proxy_set_header        X-NginX-Proxy true;
-                	proxy_pass http://localhost:5092;
-                '';
-		        locations."/" = {
-			        tryFiles = "$uri $uri/ /tracker-site/index.html =404";
+                locations."/tracker-site-public" = {
+	                tryFiles = "$uri $uri/ /tracker-site-public/index.html =404";
 		        };
                 locations."/api" = {
                     extraConfig =''
                         rewrite /api/(.*) /$1 break;
                     '';
-                    proxyPass = "http://127.0.0.1:8080";
+                    proxyPass = "http://127.0.0.1:8081";
                 };
            };
             "adguard.local" = {