From b2cbe307a19dead3338cdb5fa6fda2c0ccdabdc2 Mon Sep 17 00:00:00 2001
From: vali <valentin@kaas.cc>
Date: Fri, 12 Apr 2024 02:06:05 +0200
Subject: [PATCH] fixed displaying, the xdg variables were the problem

---
 hosts/vali/configuration.nix          |  3 ++-
 hosts/vali/hardware-configuration.nix |  6 ++----
 hosts/vali/i3.nix                     | 22 +++++++---------------
 hosts/vali/profile.nix                |  4 ++--
 modules/other/default.nix             |  2 +-
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/hosts/vali/configuration.nix b/hosts/vali/configuration.nix
index 5dbc701..a0c74e3 100644
--- a/hosts/vali/configuration.nix
+++ b/hosts/vali/configuration.nix
@@ -2,6 +2,7 @@
 {
   nixpkgs.config.allowUnfree = true;
   time.timeZone = "Europe/Zurich";
+  console.keyMap = "de";
   security.sudo.package = pkgs.sudo.override { withInsults = true; };
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
@@ -28,7 +29,7 @@
           #    enable = true;
           #    userName = "vali";
           #    userEmail = "valentin@kaas.cc";
-          #    defaultBranch = "master";
+          #    defaultBranch = "main";
           #};
           starship.enable = true;
           zsh = {
diff --git a/hosts/vali/hardware-configuration.nix b/hosts/vali/hardware-configuration.nix
index 63915c2..2f6e615 100644
--- a/hosts/vali/hardware-configuration.nix
+++ b/hosts/vali/hardware-configuration.nix
@@ -1,6 +1,3 @@
-# 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, ... }:
 
 {
@@ -27,7 +24,8 @@
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/bc68b3b5-1b58-4d8c-be8d-b06bbc4b6da7"; }
+    [
+    # { device = "/dev/disk/by-uuid/bc68b3b5-1b58-4d8c-be8d-b06bbc4b6da7"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/hosts/vali/i3.nix b/hosts/vali/i3.nix
index 56a1acd..58b2bfc 100644
--- a/hosts/vali/i3.nix
+++ b/hosts/vali/i3.nix
@@ -7,22 +7,14 @@ in {
   config = mkIf cfg.enable {
     services.xserver = {
       enable = true;
-      desktopManager = {
-        xterm.enable = false;
-        xfce = {
-          enable = true;
-          noDesktop = true;
-          enableXfwm = false;
-        };
+      layout =  "de";
+      windowManager = {
+          bspwm.enable = true;
+          i3.enable = true;
       };
-      displayManager.defaultSession="xfce+i3";
-        windowManager.i3 = {
-          enable = true;
-        extraPackages = with pkgs; [
-          dmenu
-          i3status
-          i3lock
-        ];
+      displayManager = {
+          gdm.enable = true;
+          defaultSession = "none+i3";
       };
     };
   };
diff --git a/hosts/vali/profile.nix b/hosts/vali/profile.nix
index 150d786..99a9ac3 100644
--- a/hosts/vali/profile.nix
+++ b/hosts/vali/profile.nix
@@ -4,8 +4,8 @@ _: {
         ../../options/desktop/fonts.nix
         ../../options/common/networking.nix
         ../../options/common/gpu/nvidia.nix
-        ../../options/common/pin-registry.nix
-        ../../options/common/preserve-system.nix
+#        ../../options/common/pin-registry.nix
+#        ../../options/common/preserve-system.nix
         #../../options/
     ];
 }
diff --git a/modules/other/default.nix b/modules/other/default.nix
index 7ce8d0e..477ac1c 100644
--- a/modules/other/default.nix
+++ b/modules/other/default.nix
@@ -2,6 +2,6 @@ _: {
     imports = [
         ./home-manager.nix
         ./system.nix
-        ./xdg.nix
+#        ./xdg.nix
     ];
 }