diff --git a/configuration.nix b/configuration.nix index 34e3b63..78aecad 100755 --- a/configuration.nix +++ b/configuration.nix @@ -45,12 +45,6 @@ variant = ""; }; - # DE/WM configuration - services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.sddm.wayland.enable = true; - services.xserver.desktopManager.plasma6.enable = false; - # Configure console keymap console.keyMap = "de"; @@ -96,25 +90,9 @@ enable = true; }; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - # Enable the OpenSSH daemon. services.openssh.enable = true; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # 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 diff --git a/desktop-environment.nix b/desktop-environment.nix index 82afcac..5d23fec 100644 --- a/desktop-environment.nix +++ b/desktop-environment.nix @@ -6,19 +6,28 @@ }; environment.systemPackages = with pkgs; [ - hyprland kitty waybar wofi hyprpaper + git ]; services.dbus.enable = true; programs.dconf.enable = true; + hardware.graphics.enable = true; hardware.opengl.enable = true; - services.greetd.enable = true; - services.greetd.settings.default_session.command = "Hyprland"; + services.greetd = { + enable = true; + settings = { + default_session = { + command = "Hyprland"; + user = "nichkara"; + }; + }; + }; + xdg.portal = { enable = true; @@ -27,18 +36,26 @@ systemd.user.services.hyprland-config = { description = "Hyprland config synchronization."; - serviceConfig = { - Type = "oneshot"; - ExecStart = '' - HYPR="$HOME/.config/hypr" - if [ ! -d "$HYPR/.git" ]; then - git clone ssh://git@git.nichkara.eu/dotfiles/hypr.git "$HYPR" - else - git -C "$HYPR" pull --ff-only - fi - ''; + serviceConfig = { + Type = "oneshot"; + ExecStart = '' + HYPR="$HOME/.config/hypr" + if [ ! -d "$HYPR/.git" ]; then + git clone ssh://git@git.nichkara.eu/dotfiles/hypr.git "$HYPR" + else + git -C "$HYPR" pull --ff-only + fi + CONF="$HOME/.config" + $HYPR/pure_setup.sh + ''; + }; + wantedBy = [ "default.target" ]; }; - wantedBy = [ "default.target" ]; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + open = false; }; + }