From bbefb9861da26090b20c5ce656ea960c6bbce4b0 Mon Sep 17 00:00:00 2001 From: Forestcat Date: Sun, 21 Jan 2024 02:23:07 +0100 Subject: [PATCH] switched to hyprland, sway and gdm + cleanup --- nixos/configuration.nix | 188 ++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 86 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a53fe0a..278f962 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -16,11 +16,6 @@ boot.initrd.luks.devices."luks-1cd83c7a-abab-419f-8e7b-c907f234a00f".device = "/dev/disk/by-uuid/1cd83c7a-abab-419f-8e7b-c907f234a00f"; networking.hostName = "lena"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking networking.networkmanager.enable = true; @@ -50,9 +45,9 @@ xkbVariant = ""; }; - programs.xss-lock.enable = true; - # programs.xss-lock.lockerCommand= "${pkgs.i3lock}/bin/i3lock"; - programs.xss-lock.lockerCommand= "${pkgs.i3lock-color}/bin/i3lock-color --insidever-color='#00000000' --ringver-color='#00564dE6' --insidewrong-color='#ffffff22' --ringwrong-color='#880000bb' --inside-color='#00000000' --ring-color='#00897bE6' --line-color='#00000000' --separator-color='#00897bE6' --verif-color='#00897bE6' --wrong-color='#00897bE6' --layout-color='#00897bE6' --keyhl-color='#880000bb' --bshl-color='#880000bb' --screen 1 --blur 8 --indicator"; + # programs.xss-lock.enable = true; + # # programs.xss-lock.lockerCommand= "${pkgs.i3lock}/bin/i3lock"; + # programs.xss-lock.lockerCommand= "${pkgs.i3lock-color}/bin/i3lock-color --insidever-color='#00000000' --ringver-color='#00564dE6' --insidewrong-color='#ffffff22' --ringwrong-color='#880000bb' --inside-color='#00000000' --ring-color='#00897bE6' --line-color='#00000000' --separator-color='#00897bE6' --verif-color='#00897bE6' --wrong-color='#00897bE6' --layout-color='#00897bE6' --keyhl-color='#880000bb' --bshl-color='#880000bb' --screen 1 --blur 8 --indicator"; # Configure console keymap console.keyMap = "de"; @@ -80,7 +75,7 @@ users.users.forestcat = { isNormalUser = true; description = "forestcat"; - extraGroups = ["networkmanager" "wheel" "audio" "davfs2"]; + extraGroups = ["networkmanager" "wheel" "audio" "davfs2" "video"]; packages = with pkgs; []; }; users.defaultUserShell = pkgs.nushellFull; @@ -104,60 +99,74 @@ # $ nix search wget environment.systemPackages = with pkgs; [ # System Packages go here - pkgs.brave - pkgs.xss-lock - pkgs.davfs2 - pkgs.htop - pkgs.picom-jonaburg - pkgs.spotify - pkgs.xdotool - pkgs.vscode - pkgs.scrot - pkgs.imagemagick - pkgs.papirus-nord - pkgs.papirus-icon-theme - pkgs.signal-desktop - pkgs.tree - pkgs.rofi -# pkgs.i3blocks - pkgs.polybarFull - pkgs.i3 - pkgs.i3lock-color - pkgs.prismlauncher - pkgs.alejandra - pkgs.keepassxc - pkgs.kitty - pkgs.swww - pkgs.rofi-wayland - pkgs.waybar - # pkgs.dunst - pkgs.firefox - pkgs.keepassxc - pkgs.lf - pkgs.networkmanagerapplet - pkgs.discord - pkgs.element-desktop - pkgs.wget - pkgs.helix - pkgs.unzip - pkgs.tldr - pkgs.steam - pkgs.git - pkgs.awesome - pkgs.lightdm - pkgs.neofetch - pkgs.pulseaudioFull - pkgs.toybox - pkgs.pavucontrol - pkgs.lxappearance - pkgs.lxappearance-gtk2 - pkgs.xorg.xev - pkgs.xfce.xfce4-pulseaudio-plugin - pkgs.xbindkeys - pkgs.xbindkeys-config - pkgs.traceroute - pkgs.xorg.xinit - pkgs.nil + brave + xss-lock + davfs2 + htop + picom-jonaburg + spotify + xdotool + vscode + scrot + imagemagick + papirus-nord + papirus-icon-theme + signal-desktop + tree + # rofi + # polybarFull + # i3 + # i3lock-color + prismlauncher + alejandra + keepassxc + kitty + swww + rofi-wayland + waybar + dunst + firefox + keepassxc + lf + networkmanagerapplet + discord + element-desktop + wget + helix + unzip + tldr + steam + git + awesome + neofetch + pulseaudioFull + toybox + pavucontrol + lxappearance + lxappearance-gtk2 + xorg.xev + xfce.xfce4-pulseaudio-plugin + xbindkeys + xbindkeys-config + traceroute + xorg.xinit + nil +# alacritty # gpu accelerated terminal + dbus # make dbus-update-activation-environment available in the path + wayland + xdg-utils # for opening default programs when clicking links + glib # gsettings + dracula-theme # gtk theme + gnome3.adwaita-icon-theme # default gnome cursors + swaylock + swayidle + grim # screenshot functionality + slurp # screenshot functionality + wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout + bemenu # wayland clone of dmenu + mako # notification system developed by swaywm maintainer + wdisplays # tool to configure displays + waybar ]; # Some programs need SUID wrappers, can be configured further or are @@ -173,22 +182,22 @@ # Enable the OpenSSH daemon. # services.openssh.enable = true; - systemd.services."suspend@".unitConfig = { - Before = [ "sleep.target" ]; - Description = "suspend actions"; - }; + # systemd.services."suspend@".unitConfig = { + # Before = [ "sleep.target" ]; + # Description = "suspend actions"; + # }; - systemd.services."suspend@".serviceConfig = { - User = "%I"; - Type = "forking"; - environment = "DISPLAY=:0"; - ExecStartPre = "-/usr/bin/pkill -u %u unison ; /usr/local/bin/music.sh stop"; - ExecStart = "/home/forestcat/.config/i3/scripts/lock2.sh"; - ExecStartPost = "/usr/bin/sleep 1"; - }; - systemd.services."suspend@".wantedBy = [ "sleep.target" ]; + # systemd.services."suspend@".serviceConfig = { + # User = "%I"; + # Type = "forking"; + # environment = "DISPLAY=:0"; + # ExecStartPre = "-/usr/bin/pkill -u %u unison ; /usr/local/bin/music.sh stop"; + # ExecStart = "/home/forestcat/.config/i3/scripts/lock2.sh"; + # ExecStartPost = "/usr/bin/sleep 1"; + # }; + # systemd.services."suspend@".wantedBy = [ "sleep.target" ]; - systemd.services."suspend@forestcat".enable = true; + # systemd.services."suspend@forestcat".enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; @@ -204,27 +213,33 @@ system.stateVersion = "23.05"; # Did you read the comment? # Enabling wayland - # programs.sway.enable = true; + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + extraSessionCommands = '' + export LIBSEAT_BACKEND=logind + export _JAVA_AWT_WM_NONREPARENTING=1 + ''; + }; + xdg.portal.enable = true; xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk]; # services.xserver.wayland.enable = true; - # Enabling awesome WM - # services.xserver.windowManager.awesome.enable = true; services.xserver.desktopManager.xfce.enable = true; - services.xserver.windowManager.i3.enable = true; + # services.xserver.windowManager.i3.enable = true; # services.xserver.windowManager.i3.configFile = "./local-configs/config"; # Enable Flatpack support services.flatpak.enable = true; # Enabling LightDM - services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.gdm.enable = true; # Hyperland - # programs.hyprland = { - # enable = true; - # xwayland.enable = true; - # }; + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; environment.sessionVariables = { WLR_NO_HARDWARE_CURSORS = "1"; # if mouse cursor invisible @@ -262,4 +277,5 @@ # driSupport = true; # extraPackages = with pkgs; [ libva libva-utils libva-intel-driver ]; # }; + }