Merge branch 'main' of github.com:bloxx12/nichts

homes/vali/vdesktop.nix

@@ -1,13 +0,0 @@
-{ inputs, outputs, pkgs, user, ... }:
-{
-    imports = [
-
-    ];
-    xdg.configHome = "/home/${user}/.config/";
-    programs.home-manager.enable = true;
-    home = {
-      stateVersion = "23.11";
-      username = "${user}";
-      homeDirectory = "/home/${user}";
-    };
-  }

hosts/lars/default.nix

@@ -22,10 +22,10 @@
           zsh = {
               enable = true;
               profiling = false;
-	      extraAliases = {
-	        cls = "clear"; 
-                cd = "z";
-	      };
+	            extraAliases = {
+	                cls = "clear"; 
+
+  	          };
           };
 
 	  git = {

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 = {

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, ... }:
 
 {
@@ -8,7 +5,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -16,6 +13,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/0423508a-6906-4872-baeb-2b1e6bd017a4";
       fsType = "ext4";
+      options = [ "noatime" "nodiratime" "discard" ];
     };
 
   boot.initrd.luks.devices."luks-c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f".device = "/dev/disk/by-uuid/c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f";
@@ -26,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

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";
       };
     };
   };

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/
     ];
 }

modules/cli/zsh.nix

@@ -37,6 +37,7 @@ in {
                     rm = "trash -v";
                     l = "eza -a --icons";
                     la = "eza -lha --icons --git";
+                    kys = "shutdown now";
                     cd = "z";
                     nv = "nvim";
                     #TODO fix hardcoding of git repo path and profile name

modules/other/default.nix

@@ -2,6 +2,6 @@ _: {
     imports = [
         ./home-manager.nix
         ./system.nix
-        ./xdg.nix
+#        ./xdg.nix
     ];
 }