diff --git a/configurations/desktop/configuration.nix b/configurations/desktop/configuration.nix index 9ab13490..54422de5 100644 --- a/configurations/desktop/configuration.nix +++ b/configurations/desktop/configuration.nix @@ -9,6 +9,9 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ./../../modules/nixos/cspark-single-gpu-passthru/module.nix + ./../../modules/nixos/cspark-desktop-plasma/module.nix + ./../../modules/nixos/cspark-desktop-sway/module.nix + ./../../modules/nixos/cspark-desktop-niri/module.nix inputs.home-manager.nixosModules.default ]; @@ -22,52 +25,12 @@ networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - services.xserver = { - # Enable the X11 windowing system. - enable = true; - - # Remove/disable xterm, we are using Konsole. - desktopManager.xterm.enable = false; - excludePackages = with pkgs; [ xterm ]; - - # Enable the SDDM display manager - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # libinput.enable = true; - }; - # Enable the KDE Plasma Desktop Environment. - services.desktopManager.plasma6.enable = true; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ elisa ]; - - # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different - programs.dconf.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; + # Custom desktop environments + # cspark-desktop-plasma.enable = true; + # cspark-desktop-sway.enable = true; + cspark-desktop-niri.enable = true; # My audio interface has issues after coming out from suspend/hibernate, this will reset it to fix it when necessary. - systemd.services.audiointerface-reset-unbind = { description = "Resets audio interface to clear up any issues - de-initialises audio interface before sleeping/hibernating/shutting down"; wantedBy = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "shutdown.target" ]; @@ -136,22 +99,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - # Purely for the tooling - postgresql - nvtopPackages.amd - wl-clipboard - - cool-retro-term - libsForQt5.polonium ]; - # Set konsole to be default terminal - environment.sessionVariables = { - TERM = "konsole"; - }; - environment.variables = { - TERM = "konsole"; - }; - } diff --git a/configurations/desktop/home.nix b/configurations/desktop/home.nix index cf56c1ef..43e7dbc2 100644 --- a/configurations/desktop/home.nix +++ b/configurations/desktop/home.nix @@ -5,12 +5,20 @@ [ # Global Config, always to be included ./../../global-home.nix + ./../../modules/nixos/cspark-desktop-plasma/home.nix + ./../../modules/nixos/cspark-desktop-sway/home.nix + ./../../modules/nixos/cspark-desktop-niri/home.nix ]; # KDE Connect services.kdeconnect.enable = true; services.kdeconnect.indicator = true; + # Custom Desktop Configurations + # cspark-desktop-plasma-config-1.enable = true; + # cspark-desktop-sway-config-1.enable = true; + cspark-desktop-niri-config-1.enable = true; + # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = { @@ -34,7 +42,7 @@ # Exec=konsole -e ncmpcpp # Terminal=false # ''; - "Pictures/Wallpapers/gruvbox_light_linux.png".source = ./resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png; + "Pictures/Wallpapers".source = ./resources/home-manager/Pictures/Wallpapers; }; # Roblox Curl Service @@ -79,10 +87,6 @@ }; }; - home.sessionVariables = { - TERM = "konsole"; - }; - programs.bash.shellAliases = { sudo = "sudo "; doas = "doas "; diff --git a/configurations/laptop/configuration.nix b/configurations/laptop/configuration.nix index a807787e..64f93d22 100644 --- a/configurations/laptop/configuration.nix +++ b/configurations/laptop/configuration.nix @@ -8,6 +8,8 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./../../modules/nixos/cspark-desktop-plasma/module.nix + ./../../modules/nixos/cspark-desktop-sway/module.nix inputs.home-manager.nixosModules.default ]; @@ -21,69 +23,9 @@ networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # Enable the Sway Tiling Compositor and add extra system packages. - programs.sway = { - enable = true; - extraPackages = with pkgs; [ - swaylock # Locking - swayidle # Idle Detection (For locking) - foot # Terminal Emulator - dmenu # Application Launcher - wmenu # Application Launcher - Wayland - networkmanager_dmenu # Network Manager dmenu script - wdisplays # Manage wayland displays - wlsunset # Day/night gamma adjustment/filter for wayland - light # GNU/Linux application to control backlights - sway-contrib.grimshot # Screenshot tool for wayland - mako # Notification Daemon - wlprop # Clone of X11 xprop for wayland (To get window class names etc) - - themix-gui # Application to design GTK themes - - lxqt.pcmanfm-qt # File Manager - lxqt.lxqt-archiver # Archiver - qt6Packages.qt6ct # Manage QT6 Themes - libsForQt5.qt5ct # Manage QT5 Themes - lxappearance # Manage GTK Themes - kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc - lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents - ]; - }; - # XDG Portal Integration (For file chooser/screensharing etc) - xdg.portal.enable = true; - xdg.portal.wlr.enable = true; - xdg.portal.extraPortals = with pkgs; [ kdePackages.xdg-desktop-portal-kde ]; - # Whether to enable Qt configuration, including theming. - qt.enable = true; - # Enable xwayland support - programs.xwayland.enable = true; - # Enable polkit - security.polkit.enable = true; - # For udiskie - services.udisks2.enable = true; - - # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different - programs.dconf.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; + # Custom desktop environments + # cspark-desktop-plasma.enable = true; + # cspark-desktop-sway.enable = true; # Home Manager Configuration home-manager = { @@ -104,44 +46,13 @@ # Waydroid Android Emulation virtualisation.waydroid.enable = true; + # Docker for development + virtualisation.docker.enable = true; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ nvtopPackages.intel - wl-clipboard ]; - security.sudo = { - extraRules = [ - { - commands = [ - { - command = "/run/current-system/sw/bin/light"; - options = [ "NOPASSWD" ]; - } - ]; - groups = [ "wheel" ]; - } - ]; - }; - - environment.sessionVariables = { - TERM = "foot"; - QT_QPA_PLATFORM = "wayland-egl"; - QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - SDL_VIDEODRIVER = "wayland"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - SSH_ASKPASS = "lxqt-openssh-askpass"; - }; - environment.variables = { - TERM = "foot"; - QT_QPA_PLATFORM = "wayland-egl"; - QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - SDL_VIDEODRIVER = "wayland"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - SSH_ASKPASS = lib.mkForce "lxqt-openssh-askpass"; - }; - } diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix index 50dc6f22..f4a113c6 100644 --- a/configurations/laptop/home.nix +++ b/configurations/laptop/home.nix @@ -5,12 +5,18 @@ [ # Global Config, always to be included ./../../global-home.nix + ./../../modules/nixos/cspark-desktop-plasma/home.nix + ./../../modules/nixos/cspark-desktop-sway/home.nix ]; # KDE Connect services.kdeconnect.enable = true; services.kdeconnect.indicator = true; + # Custom Desktop Configurations + # cspark-desktop-plasma-config-1.enable = true; + # cspark-desktop-sway-config-1.enable = true; + # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = { @@ -34,43 +40,14 @@ # Exec=konsole -e ncmpcpp # Terminal=false # ''; - "Pictures/Wallpapers/gruvbox_light_linux.png".source = ./resources/home-manager/Pictures/Wallpapers/gruvbox_light_linux.png; + "Pictures/Wallpapers".source = ./resources/home-manager/Pictures/Wallpapers; }; - # Config Files (typically $HOME/.config) - xdg.configFile = { - "sway/config".source = ./resources/home-manager/.config/sway/config; - "mako/config".source = ./resources/home-manager/.config/mako/config; - "foot/foot.ini".source = ./resources/home-manager/.config/foot/foot.ini; - "networkmanager-dmenu/config.ini".source = ./resources/home-manager/.config/networkmanager-dmenu/config.ini; - }; - - services.udiskie.enable = true; - services.udiskie.tray = "never"; - - home.sessionVariables = { - TERM = "foot"; - QT_QPA_PLATFORM = "wayland-egl"; - QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - SDL_VIDEODRIVER = "wayland"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - SSH_ASKPASS = "lxqt-openssh-askpass"; - }; - - programs.bash = { - shellAliases = { - sudo = "sudo "; - doas = "doas "; - edit = "$EDITOR"; - nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#laptop"; - }; - # Start sway after login if on TTY1 (Default Linux TTY upon boot/login) - profileExtra = '' - if [[ $(tty) == "/dev/tty1" ]]; then - sway - fi - ''; + programs.bash.shellAliases = { + sudo = "sudo "; + doas = "doas "; + edit = "$EDITOR"; + nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#laptop"; }; } diff --git a/global-home.nix b/global-home.nix index b581f5f7..8be33116 100644 --- a/global-home.nix +++ b/global-home.nix @@ -76,6 +76,9 @@ in boxbuddy qdirstat kid3 + ffmpeg + ventoy-full + qbittorrent mpdcron @@ -239,7 +242,7 @@ in programs.bash = { enable = true; enableCompletion = true; - bashrcExtra = "neofetch"; + bashrcExtra = "fastfetch"; initExtra = '' . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ''; diff --git a/global.nix b/global.nix index 3796304d..c5eece35 100644 --- a/global.nix +++ b/global.nix @@ -21,9 +21,11 @@ nodePackages.typescript-language-server typescript deno + # Purely for the tooling + postgresql neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - neofetch + fastfetch appimage-run imagemagick yt-dlp diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix new file mode 100644 index 00000000..bebe892f --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -0,0 +1,41 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-niri-config-1; +in +{ + options.cspark-desktop-niri-config-1 = { + enable + = lib.mkEnableOption "Enable Custom Niri Desktop Setup 1"; + }; + + config = lib.mkIf cfg.enable { + # Config Files (typically $HOME/.config) + xdg.configFile = { + "niri/config".source = ./resources/home-manager/.config/niri/config.kdl; + "mako/config".source = ./resources/home-manager/.config/mako/config; + "foot/foot.ini".source = ./resources/home-manager/.config/foot/foot.ini; + "networkmanager-dmenu/config.ini".source = ./resources/home-manager/.config/networkmanager-dmenu/config.ini; + }; + + services.udiskie.enable = true; + services.udiskie.tray = "never"; + + home.sessionVariables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = "lxqt-openssh-askpass"; + }; + + # Start sway after login if on TTY1 (Default Linux TTY upon boot/login) + programs.bash.profileExtra = '' + if [[ $(tty) == "/dev/tty1" ]]; then + niri-session + fi + ''; + }; +} diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix new file mode 100644 index 00000000..5cbc2c07 --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -0,0 +1,110 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-niri; +in +{ + options.cspark-desktop-niri = { + enable + = lib.mkEnableOption "Enable Custom Niri Desktop Setup"; + }; + + config = lib.mkIf cfg.enable { + # Enable the Niri Compositor and add extra system packages. + environment.systemPackages = with pkgs; [ + niri + + wl-clipboard + swaylock # Locking + swayidle # Idle Detection (For locking) + foot # Terminal Emulator + fuzzel # Application Launcher - Wayland + wdisplays # Manage wayland displays + wlsunset # Day/night gamma adjustment/filter for wayland + light # GNU/Linux application to control backlights + mako # Notification Daemon + wlprop # Clone of X11 xprop for wayland (To get window class names etc) + wev # Clone of X11 xev for wayland + + lxqt.pcmanfm-qt # File Manager + lxqt.lxqt-archiver # Archiver + qt6Packages.qt6ct # Manage QT6 Themes + libsForQt5.qt5ct # Manage QT5 Themes + lxappearance # Manage GTK Themes + kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc + lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents + ]; + # XDG Portal Integration (For file chooser/screensharing etc) + xdg.portal.enable = true; + xdg.portal.wlr.enable = true; + xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gnome xdg-desktop-portal-gtk ]; + # Whether to enable Qt configuration, including theming. + qt.enable = true; + # Enable xwayland support + programs.xwayland.enable = true; + # Enable polkit + security.polkit.enable = true; + # For udiskie + services.udisks2.enable = true; + + # Whether to enable GNOME Keyring daemon, a service designed to take care of the user’s security credentials, such as user names and passwords. + services.gnome.gnome-keyring.enable = true; + + # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different + programs.dconf.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + security.sudo = { + extraRules = [ + { + commands = [ + { + command = "/run/current-system/sw/bin/light"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; + }; + + environment.sessionVariables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = "lxqt-openssh-askpass"; + }; + environment.variables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = lib.mkForce "lxqt-openssh-askpass"; + }; + + }; +} diff --git a/modules/nixos/cspark-desktop-niri/resources/.config/foot/foot.ini b/modules/nixos/cspark-desktop-niri/resources/.config/foot/foot.ini new file mode 100644 index 00000000..6d453088 --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/resources/.config/foot/foot.ini @@ -0,0 +1,23 @@ +# -*- conf -*- +font=HackNerdFontMono-Regular:size=13 + +# Gruvbox - Light +[colors] +background=fbf1c7 +foreground=3c3836 +regular0=fbf1c7 +regular1=cc241d +regular2=98971a +regular3=d79921 +regular4=458588 +regular5=b16286 +regular6=689d6a +regular7=7c6f64 +bright0=928374 +bright1=9d0006 +bright2=79740e +bright3=b57614 +bright4=076678 +bright5=8f3f71 +bright6=427b58 +bright7=3c3836 \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-niri/resources/.config/mako/config b/modules/nixos/cspark-desktop-niri/resources/.config/mako/config new file mode 100644 index 00000000..64eb6fcf --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/resources/.config/mako/config @@ -0,0 +1,24 @@ +sort=-time +layer=overlay +background-color=#f9f5d7 +text-color=#3c3836 +width=300 +height=110 +border-size=3 +border-color=#b16286 +border-radius=0 +icons=0 +max-icon-size=64 +default-timeout=5000 +ignore-timeout=1 +font=Hack Nerd Font Mono 12 + +[urgency=low] +border-color=#b16286 + +[urgency=normal] +border-color=#b16286 + +[urgency=high] +border-color=#b16286 +default-timeout=0 \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-niri/resources/.config/networkmanager-dmenu/config.ini b/modules/nixos/cspark-desktop-niri/resources/.config/networkmanager-dmenu/config.ini new file mode 100644 index 00000000..70107298 --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/resources/.config/networkmanager-dmenu/config.ini @@ -0,0 +1,49 @@ +[dmenu] +compact = True +dmenu_command = wmenu -N f9f5d7 -n 3c3836 -S 8f3f71 -s fbf1c7 -f "Hack Nerd Font Mono 14" +# # Note that dmenu_command can contain arguments as well like: +# # `dmenu_command = rofi -dmenu -i -theme nmdm` +# # `dmenu_command = rofi -dmenu -width 30 -i` +# # `dmenu_command = dmenu -i -l 25 -b -nb #909090 -nf #303030` +# # `dmenu_command = fuzzel --dmenu` +# # `dmenu_command = wofi --dmenu` +# active_chars = == +# highlight = # (Default: False) use highlighting instead of active_chars (only applicable to Rofi / Wofi) +# highlight_fg = # (Default: None) foreground color of active connection (only applicable to Wofi) +# highlight_bg = # (Default: None) background color of active connection (only applicable to Wofi) +# highlight_bold = # (Default: True) make active connection bold (only applicable to Wofi) +# compact = # (Default: False). Remove extra spacing from display +# pinentry = # (Default: None) e.g. `pinentry-gtk` +# wifi_chars = +# wifi_chars = ▂▄▆█ +# wifi_icons = +# wifi_icons = 󰤯󰤟󰤢󰤥󰤨 +# format = +# format = {name} {sec} {bars} +# # Available variables are: +# # * {name} - Access point name +# # * {sec} - Security type +# # * {signal} - Signal strength on a scale of 0-100 +# # * {bars} - Bar-based display of signal strength (see wifi_chars) +# # * {icon} - Icon-based display of signal strength (see wifi_icons) +# # * {max_len_name} and {max_len_sec} are the maximum lengths of {name} / {sec} +# # respectively and may be useful for formatting. +# list_saved = # (Default: False) list saved connections + +[dmenu_passphrase] +# # Uses the -password flag for Rofi, -x for bemenu. For dmenu, sets -nb and +# # -nf to the same color or uses -P if the dmenu password patch is applied +# # https://tools.suckless.org/dmenu/patches/password/ +# obscure = True +# obscure_color = #222222 + +[pinentry] +# description = (Default: Get network password) +# prompt = (Default: Password:) + +[editor] +# terminal = +# gui_if_available = (Default: True) + +[nmdm] +# rescan_delay = # (seconds to wait after a wifi rescan before redisplaying the results) \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-niri/resources/.config/niri/config.kdl b/modules/nixos/cspark-desktop-niri/resources/.config/niri/config.kdl new file mode 100644 index 00000000..cf905ce2 --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/resources/.config/niri/config.kdl @@ -0,0 +1,461 @@ +// This config is in the KDL format: https://kdl.dev +// "/-" comments out the following node. +// Check the wiki for a full description of the configuration: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview + +// Input device configuration. +// Find the full list of options on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + layout "gb" + // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + } + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + touchpad { + tap + // dwt + // dwtp + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + } + + mouse { + // natural-scroll + // accel-speed 0.2 + accel-profile "flat" + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + focus-follows-mouse +} + +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +/-output "eDP-1" { + // Uncomment this line to disable this output. + // off + + // Resolution and, optionally, refresh rate of the output. + // The format is "x" or "x@". + // If the refresh rate is omitted, niri will pick the highest refresh rate + // for the resolution. + // If the mode is omitted altogether or is invalid, niri will pick one automatically. + // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. + mode "1920x1080@120.030" + + // Scale is a floating-point number, but at the moment only integer values work. + scale 2.0 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + transform "normal" + + // Position of the output in the global coordinate space. + // This affects directional monitor actions like "focus-monitor-left", and cursor movement. + // The cursor can only move between directly adjacent outputs. + // Output scale and rotation has to be taken into account for positioning: + // outputs are sized in logical, or scaled, pixels. + // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, + // so to put another output directly adjacent to it on the right, set its x to 1920. + // If the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=1280 y=0 +} + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 5 + + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + // off + + // How many logical pixels the ring extends out from the windows. + width 4 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#7fc8ff" + + // Color of the ring on inactive monitors. + inactive-color "#505050" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // + // active-gradient from="#80c8ff" to="#bbddff" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + off + + width 4 + active-color "#ffc87f" + inactive-color "#505050" + + // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + // left 64 + // right 64 + // top 64 + // bottom 64 + } +} + +// Add lines like this to spawn processes at startup. +// Note that running niri as a session supports xdg-desktop-autostart, +// which may be more convenient to use. +// spawn-at-startup "alacritty" "-e" "fish" +spawn-at-startup "mako" +spawn-at-startup "wlsunset" "-l" "51.5" -L "0.1" + +// Uncomment this line to ask the clients to omit their client-side decorations if possible. +// If the client will specifically ask for CSD, the request will be honored. +// Additionally, clients will be informed that they are tiled, removing some rounded corners. +prefer-no-csd + +// You can change the path where screenshots are saved. +// A ~ at the front will be expanded to the home directory. +// The path is formatted with strftime(3) to give you the screenshot date and time. +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + +// You can also set this to null to disable saving screenshots to disk. +// screenshot-path null + +// Animation settings. +// The wiki explains how to configure individual animations: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations +animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules + +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} +} + +// Example: block out two password managers from screen capture. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + + block-out-from "screen-capture" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" +} + +binds { + // Keys consist of modifiers separated by + signs, followed by an XKB key name + // in the end. To find an XKB name for a particular key, you may use a program + // like wev. + // + // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt + // when running as a winit window. + // + // Most actions that you can bind here can also be invoked programmatically with + // `niri msg action do-something`. + + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+Return { spawn "foot"; } + Mod+D { spawn "fuzzel"; } + Super+Alt+L { spawn "swaylock"; } + + // You can also use a shell: + // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } + XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } + + Mod+W { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Shift+Left { move-column-left; } + Mod+Shift+Down { move-window-down; } + Mod+Shift+Up { move-window-up; } + Mod+Shift+Right { move-column-right; } + Mod+Shift+H { move-column-left; } + Mod+Shift+J { move-window-down; } + Mod+Shift+K { move-window-up; } + Mod+Shift+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + // Mod+Shift+Left { focus-monitor-left; } + // Mod+Shift+Down { focus-monitor-down; } + // Mod+Shift+Up { focus-monitor-up; } + // Mod+Shift+Right { focus-monitor-right; } + Mod+O { focus-monitor-left; } + // Mod+Shift+J { focus-monitor-down; } + // Mod+Shift+K { focus-monitor-up; } + // Mod+Shift+L { focus-monitor-right; } + + // Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + // Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + // Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + // Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+O { move-column-to-monitor-left; } + // Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + // Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + // Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + // Mod+U { focus-workspace-down; } + // Mod+I { focus-workspace-up; } + Mod+Shift+Page_Down { move-column-to-workspace-down; } + Mod+Shift+Page_Up { move-column-to-workspace-up; } + // Mod+Ctrl+U { move-column-to-workspace-down; } + // Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + // Mod+Shift+Page_Down { move-workspace-down; } + // Mod+Shift+Page_Up { move-workspace-up; } + // Mod+Shift+U { move-workspace-down; } + // Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Shift+1 { move-column-to-workspace 1; } + Mod+Shift+2 { move-column-to-workspace 2; } + Mod+Shift+3 { move-column-to-workspace 3; } + Mod+Shift+4 { move-column-to-workspace 4; } + Mod+Shift+5 { move-column-to-workspace 5; } + Mod+Shift+6 { move-column-to-workspace 6; } + Mod+Shift+7 { move-column-to-workspace 7; } + Mod+Shift+8 { move-column-to-workspace 8; } + Mod+Shift+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + Mod+Comma { consume-window-into-column; } + Mod+Period { expel-window-from-column; } + + // There are also commands that consume or expel a single window to the side. + // Mod+BracketLeft { consume-or-expel-window-left; } + // Mod+BracketRight { consume-or-expel-window-right; } + + Mod+R { switch-preset-column-width; } + Mod+Shift+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+C { center-column; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Mod+Print { screenshot-screen; } + Mod+Shift+Print { screenshot-window; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } +} diff --git a/modules/nixos/cspark-desktop-plasma/home.nix b/modules/nixos/cspark-desktop-plasma/home.nix new file mode 100644 index 00000000..fb6e4a73 --- /dev/null +++ b/modules/nixos/cspark-desktop-plasma/home.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-plasma-config-1; +in +{ + options.cspark-desktop-plasma-config-1 = { + enable + = lib.mkEnableOption "Enable Custom Plasma Desktop Setup 1"; + }; + + config = lib.mkIf cfg.enable { + home.sessionVariables = { + TERM = "konsole"; + }; + }; +} diff --git a/modules/nixos/cspark-desktop-plasma/module.nix b/modules/nixos/cspark-desktop-plasma/module.nix new file mode 100644 index 00000000..62b053c2 --- /dev/null +++ b/modules/nixos/cspark-desktop-plasma/module.nix @@ -0,0 +1,73 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-plasma; +in +{ + options.cspark-desktop-plasma = { + enable + = lib.mkEnableOption "Enable Custom Plasma Desktop Setup"; + }; + + config = lib.mkIf cfg.enable { + services.xserver = { + # Enable the X11 windowing system. + enable = true; + + # Remove/disable xterm, we are using Konsole. + desktopManager.xterm.enable = false; + excludePackages = with pkgs; [ xterm ]; + + # Enable the SDDM display manager + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # libinput.enable = true; + }; + # Enable the KDE Plasma Desktop Environment. + services.desktopManager.plasma6.enable = true; + environment.plasma6.excludePackages = with pkgs.kdePackages; [ elisa ]; + + # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different + programs.dconf.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Set konsole to be default terminal + environment.sessionVariables = { + TERM = "konsole"; + }; + environment.variables = { + TERM = "konsole"; + }; + + environment.systemPackages = with pkgs; [ + wl-clipboard + wev # Clone of X11 xev for wayland + + # libsForQt5.polonium + ]; + + }; +} diff --git a/modules/nixos/cspark-desktop-sway/home.nix b/modules/nixos/cspark-desktop-sway/home.nix new file mode 100644 index 00000000..7c6c3f9c --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/home.nix @@ -0,0 +1,41 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-sway-config-1; +in +{ + options.cspark-desktop-sway-config-1 = { + enable + = lib.mkEnableOption "Enable Custom Sway Desktop Setup 1"; + }; + + config = lib.mkIf cfg.enable { + # Config Files (typically $HOME/.config) + xdg.configFile = { + "sway/config".source = ./resources/home-manager/.config/sway/config; + "mako/config".source = ./resources/home-manager/.config/mako/config; + "foot/foot.ini".source = ./resources/home-manager/.config/foot/foot.ini; + "networkmanager-dmenu/config.ini".source = ./resources/home-manager/.config/networkmanager-dmenu/config.ini; + }; + + services.udiskie.enable = true; + services.udiskie.tray = "never"; + + home.sessionVariables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = "lxqt-openssh-askpass"; + }; + + # Start sway after login if on TTY1 (Default Linux TTY upon boot/login) + programs.bash.profileExtra = '' + if [[ $(tty) == "/dev/tty1" ]]; then + sway + fi + ''; + }; +} diff --git a/modules/nixos/cspark-desktop-sway/module.nix b/modules/nixos/cspark-desktop-sway/module.nix new file mode 100644 index 00000000..39a15264 --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/module.nix @@ -0,0 +1,110 @@ +{ lib, config, pkgs, modulesPath, ... }: + +let + cfg = config.cspark-desktop-sway; +in +{ + options.cspark-desktop-sway = { + enable + = lib.mkEnableOption "Enable Custom Sway Desktop Setup"; + }; + + config = lib.mkIf cfg.enable { + # Enable the Sway Tiling Compositor and add extra system packages. + programs.sway = { + enable = true; + extraPackages = with pkgs; [ + swaylock # Locking + swayidle # Idle Detection (For locking) + foot # Terminal Emulator + dmenu # Application Launcher + wmenu # Application Launcher - Wayland + networkmanager_dmenu # Network Manager dmenu script + wdisplays # Manage wayland displays + wlsunset # Day/night gamma adjustment/filter for wayland + light # GNU/Linux application to control backlights + sway-contrib.grimshot # Screenshot tool for wayland + mako # Notification Daemon + wlprop # Clone of X11 xprop for wayland (To get window class names etc) + wev # Clone of X11 xev for wayland + + lxqt.pcmanfm-qt # File Manager + lxqt.lxqt-archiver # Archiver + qt6Packages.qt6ct # Manage QT6 Themes + libsForQt5.qt5ct # Manage QT5 Themes + lxappearance # Manage GTK Themes + kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc + lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents + ]; + }; + # XDG Portal Integration (For file chooser/screensharing etc) + xdg.portal.enable = true; + xdg.portal.wlr.enable = true; + xdg.portal.extraPortals = with pkgs; [ kdePackages.xdg-desktop-portal-kde ]; + # Whether to enable Qt configuration, including theming. + qt.enable = true; + # Enable xwayland support + programs.xwayland.enable = true; + # Enable polkit + security.polkit.enable = true; + # For udiskie + services.udisks2.enable = true; + + # GTK themes are not applied in Wayland applications / Window Decorations missing / Cursor looks different + programs.dconf.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + security.sudo = { + extraRules = [ + { + commands = [ + { + command = "/run/current-system/sw/bin/light"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; + }; + + environment.sessionVariables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = "lxqt-openssh-askpass"; + }; + environment.variables = { + TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + SSH_ASKPASS = lib.mkForce "lxqt-openssh-askpass"; + }; + + }; +} diff --git a/modules/nixos/cspark-desktop-sway/resources/.config/foot/foot.ini b/modules/nixos/cspark-desktop-sway/resources/.config/foot/foot.ini new file mode 100644 index 00000000..6d453088 --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/resources/.config/foot/foot.ini @@ -0,0 +1,23 @@ +# -*- conf -*- +font=HackNerdFontMono-Regular:size=13 + +# Gruvbox - Light +[colors] +background=fbf1c7 +foreground=3c3836 +regular0=fbf1c7 +regular1=cc241d +regular2=98971a +regular3=d79921 +regular4=458588 +regular5=b16286 +regular6=689d6a +regular7=7c6f64 +bright0=928374 +bright1=9d0006 +bright2=79740e +bright3=b57614 +bright4=076678 +bright5=8f3f71 +bright6=427b58 +bright7=3c3836 \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-sway/resources/.config/mako/config b/modules/nixos/cspark-desktop-sway/resources/.config/mako/config new file mode 100644 index 00000000..64eb6fcf --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/resources/.config/mako/config @@ -0,0 +1,24 @@ +sort=-time +layer=overlay +background-color=#f9f5d7 +text-color=#3c3836 +width=300 +height=110 +border-size=3 +border-color=#b16286 +border-radius=0 +icons=0 +max-icon-size=64 +default-timeout=5000 +ignore-timeout=1 +font=Hack Nerd Font Mono 12 + +[urgency=low] +border-color=#b16286 + +[urgency=normal] +border-color=#b16286 + +[urgency=high] +border-color=#b16286 +default-timeout=0 \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-sway/resources/.config/networkmanager-dmenu/config.ini b/modules/nixos/cspark-desktop-sway/resources/.config/networkmanager-dmenu/config.ini new file mode 100644 index 00000000..70107298 --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/resources/.config/networkmanager-dmenu/config.ini @@ -0,0 +1,49 @@ +[dmenu] +compact = True +dmenu_command = wmenu -N f9f5d7 -n 3c3836 -S 8f3f71 -s fbf1c7 -f "Hack Nerd Font Mono 14" +# # Note that dmenu_command can contain arguments as well like: +# # `dmenu_command = rofi -dmenu -i -theme nmdm` +# # `dmenu_command = rofi -dmenu -width 30 -i` +# # `dmenu_command = dmenu -i -l 25 -b -nb #909090 -nf #303030` +# # `dmenu_command = fuzzel --dmenu` +# # `dmenu_command = wofi --dmenu` +# active_chars = == +# highlight = # (Default: False) use highlighting instead of active_chars (only applicable to Rofi / Wofi) +# highlight_fg = # (Default: None) foreground color of active connection (only applicable to Wofi) +# highlight_bg = # (Default: None) background color of active connection (only applicable to Wofi) +# highlight_bold = # (Default: True) make active connection bold (only applicable to Wofi) +# compact = # (Default: False). Remove extra spacing from display +# pinentry = # (Default: None) e.g. `pinentry-gtk` +# wifi_chars = +# wifi_chars = ▂▄▆█ +# wifi_icons = +# wifi_icons = 󰤯󰤟󰤢󰤥󰤨 +# format = +# format = {name} {sec} {bars} +# # Available variables are: +# # * {name} - Access point name +# # * {sec} - Security type +# # * {signal} - Signal strength on a scale of 0-100 +# # * {bars} - Bar-based display of signal strength (see wifi_chars) +# # * {icon} - Icon-based display of signal strength (see wifi_icons) +# # * {max_len_name} and {max_len_sec} are the maximum lengths of {name} / {sec} +# # respectively and may be useful for formatting. +# list_saved = # (Default: False) list saved connections + +[dmenu_passphrase] +# # Uses the -password flag for Rofi, -x for bemenu. For dmenu, sets -nb and +# # -nf to the same color or uses -P if the dmenu password patch is applied +# # https://tools.suckless.org/dmenu/patches/password/ +# obscure = True +# obscure_color = #222222 + +[pinentry] +# description = (Default: Get network password) +# prompt = (Default: Password:) + +[editor] +# terminal = +# gui_if_available = (Default: True) + +[nmdm] +# rescan_delay = # (seconds to wait after a wifi rescan before redisplaying the results) \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-sway/resources/.config/sway/config b/modules/nixos/cspark-desktop-sway/resources/.config/sway/config new file mode 100755 index 00000000..bc602278 --- /dev/null +++ b/modules/nixos/cspark-desktop-sway/resources/.config/sway/config @@ -0,0 +1,270 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod1 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term foot +# Your preferred application launcher +# Note: pass the final command to swaymsg so that the resulting window can be opened +# on the original workspace that the command was run on. +set $menu dmenu_path | wmenu -N f9f5d7 -n 3c3836 -S 8f3f71 -s fbf1c7 -f "Hack Nerd Font Mono 14" | xargs swaymsg exec -- + +include /etc/sway/config-vars.d/* + +### Output configuration +# +# Wallpaper (Default wallpaper are available in /usr/share/backgrounds/sway/) +output * bg ~/Pictures/Wallpapers/gruvbox_light_linux.png fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +### Input configuration + +input "1:1:AT_Translated_Set_2_keyboard" { + xkb_layout "gb" +} +input "6058:20564:ThinkPad_Extra_Buttons" { + xkb_layout "gb" +} + +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +# Font Configuration +font pango:Hack Nerd Font Mono 12 + +# Border Configuration +default_border pixel 3 +default_floating_border normal 3 +client.focused #b16286 #b16286 #f9f5d7 +client.focused_inactive #f9f5d7 #f9f5d7 #3c3836 +client.unfocused #f9f5d7 #f9f5d7 #3c3836 + +# Gaps Configuration +gaps inner 5 +gaps outer 5 + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + + # Kill focused window + bindsym $mod+w kill + + # Start your launcher + bindsym $mod+d exec $menu + + # Start password manager + bindsym Control+Mod1+p exec passmenu + + # Lock screen + bindsym Mod4+l exec swaylock -c 000000 + + # Brightness Controls + bindsym XF86MonBrightnessUp exec sudo light -A 10 + bindsym XF86MonBrightnessDown exec sudo light -U 10 + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+r reload + + # Exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # Or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # Ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 Chat + bindsym $mod+9 workspace number 9 Games + bindsym $mod+0 workspace number 10 Audio + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 Chat + bindsym $mod+Shift+9 move container to workspace number 9 Games + bindsym $mod+Shift+0 move container to workspace number 10 Audio + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. + + # A bit of window rules in regards to Chat/Games/Audio workspaces + assign [class="discord"] number 8 Chat + assign [class="org.telegram.desktop"] number 8 Chat + assign [title="Telegram"] number 8 Chat + assign [class="steam"] number 9 Games + assign [title="steam"] number 9 Games + assign [class="ardour"] number 10 Audio + # qpwgraph + assign [title="A PipeWire Graph Qt GUI Interface"] number 10 Audio +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+t layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + status_command while echo "`date +'%Y-%m-%d %I:%M:%S %p'` \| Battery: %`cat /sys/class/power_supply/BAT0/capacity` \(`cat /sys/class/power_supply/BAT0/status`\)"; do sleep 1; done + + colors { + statusline #3c3836 + background #f9f5d7 + focused_workspace #b16286 #8f3f71 #fbf1c7 + active_workspace #b16286 #8f3f71 #fbf1c7 + inactive_workspace #ebdbb2 #d5c4a1 #3c3836 + } +} + +include /etc/sway/config.d/* + +# Autostart + +# London Longitude/Latitude +exec wlsunset -l 51.5 -L -0.1 + +exec qpwgraph \ No newline at end of file