diff --git a/configuration.nix b/configuration.nix index 5344ca8..b4d51d3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,12 +11,18 @@ # Bootloader. boot.loader = { efi.canTouchEfiVariables = true; - grub = { + systemd-boot = { enable = true; - devices = [ "nodev" ]; - efiSupport = true; - useOSProber = true; - fontSize = 30; + consoleMode = "auto"; + extraEntries = { + "Arch.conf" = '' + title Arch Linux (gaming) + sort-key arch + linux /vmlinuz-linux + initrd /initramfs-linux.img + options cryptdevice=PARTUUID=6fa1b92d-1667-420a-a0e6-8f3116759115:root root=/dev/mapper/root zswap.enabled=0 rw rootfstype=btrfs amdgpu module_blacklist=nvidia + ''; + }; }; }; @@ -173,7 +179,7 @@ wget cifs-utils saleae-logic-2 - ] ++ (if !inputs.x11mode then [ greetd.regreet ] else [ ]); + ] ++ (if !inputs.x11mode then [ regreet ] else [ ]); programs.dconf.enable = true; diff --git a/hardware_configuration.nix b/hardware_configuration.nix index aa7616b..76a8ffb 100644 --- a/hardware_configuration.nix +++ b/hardware_configuration.nix @@ -29,7 +29,7 @@ { device = "/dev/disk/by-uuid/C8F1-789F"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = [ diff --git a/programm_configs/vscode.nix b/programm_configs/vscode.nix index 09c3c21..4f1b5bf 100644 --- a/programm_configs/vscode.nix +++ b/programm_configs/vscode.nix @@ -3,7 +3,7 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ + profiles.default.extensions = with pkgs.vscode-extensions; [ bbenoist.nix james-yu.latex-workshop jnoortheen.nix-ide diff --git a/programm_configs/zsh.nix b/programm_configs/zsh.nix index b417ce5..3d7bab4 100644 --- a/programm_configs/zsh.nix +++ b/programm_configs/zsh.nix @@ -9,7 +9,7 @@ ssh = "TERM=xterm-256color $(which -p ssh)"; }; - initExtra = "eval \"$(direnv hook zsh)\""; + initContent = "eval \"$(direnv hook zsh)\""; oh-my-zsh = { enable = true;