From 2120c171626a63e76500c7b98d3f376c0b2c8ec3 Mon Sep 17 00:00:00 2001 From: vali Date: Thu, 11 Apr 2024 09:00:29 +0200 Subject: [PATCH 1/4] added a nice shutdown command ;) --- modules/cli/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index f45deaf..401b44e 100644 --- a/modules/cli/zsh.nix +++ b/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 From 05318feecf8f8f959f1960bb3bca8896f021f134 Mon Sep 17 00:00:00 2001 From: vali Date: Fri, 12 Apr 2024 00:59:29 +0200 Subject: [PATCH 2/4] fixed hardware --- homes/vali/vdesktop.nix | 13 ------------- homes/vali/vlaptop.nix | 0 hosts/vali/hardware-configuration.nix | 3 ++- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 homes/vali/vdesktop.nix delete mode 100644 homes/vali/vlaptop.nix diff --git a/homes/vali/vdesktop.nix b/homes/vali/vdesktop.nix deleted file mode 100644 index 6b4123f..0000000 --- a/homes/vali/vdesktop.nix +++ /dev/null @@ -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}"; - }; - } diff --git a/homes/vali/vlaptop.nix b/homes/vali/vlaptop.nix deleted file mode 100644 index e69de29..0000000 diff --git a/hosts/vali/hardware-configuration.nix b/hosts/vali/hardware-configuration.nix index a8a4918..63915c2 100644 --- a/hosts/vali/hardware-configuration.nix +++ b/hosts/vali/hardware-configuration.nix @@ -8,7 +8,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 +16,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"; From fa58b149a6831f830ea42a8145a2199ee5d14bd8 Mon Sep 17 00:00:00 2001 From: vali Date: Fri, 12 Apr 2024 02:06:05 +0200 Subject: [PATCH 3/4] 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 ]; } From 468756e2cb2023ef8c9f8865e9e5bddaa25f2aba Mon Sep 17 00:00:00 2001 From: vali Date: Fri, 12 Apr 2024 02:15:08 +0200 Subject: [PATCH 4/4] Fixed dyonisos shell aliases the extraAliases options works now, tba: dynamic update command depending on user. --- hosts/dyonisos/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/dyonisos/configuration.nix b/hosts/dyonisos/configuration.nix index 5b766ea..4739c8d 100644 --- a/hosts/dyonisos/configuration.nix +++ b/hosts/dyonisos/configuration.nix @@ -26,10 +26,10 @@ zsh = { enable = true; profiling = false; - extraAliases = { - cls = "clear"; - cd = "z"; - }; + extraAliases = { + cls = "clear"; + + }; }; git = {