diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index 85488d2..83d4b9f 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, inputs, ... }: { @@ -70,6 +71,14 @@ }; }; + displayManager.sddm = { + enable = true; + package = pkgs.kdePackages.sddm; + wayland.enable = true; + # extraPackages = with pkgs; [(catppuccin-sddm.override {flavor = "macchiato";})]; + theme = "maldives"; + }; + pipewire = { enable = true; pulse.enable = true; @@ -97,12 +106,6 @@ xserver = { enable = true; xkb.layout = "gb"; - - displayManager = { - gdm = { - enable = true; - }; - }; }; }; } diff --git a/users/configs/desktop/sway/default.nix b/users/configs/desktop/sway/default.nix index 0dabe6f..6685f13 100644 --- a/users/configs/desktop/sway/default.nix +++ b/users/configs/desktop/sway/default.nix @@ -16,6 +16,11 @@ in { }; }; }; + + services.swaync = { + enable = true; + }; + wayland.windowManager.sway = { enable = true; config = { diff --git a/users/configs/system/default.nix b/users/configs/system/default.nix index a24445e..7ec60b1 100644 --- a/users/configs/system/default.nix +++ b/users/configs/system/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./ghostty ./helix ./kitty ./nb diff --git a/users/configs/system/ghostty/config b/users/configs/system/ghostty/config new file mode 100644 index 0000000..83e8300 --- /dev/null +++ b/users/configs/system/ghostty/config @@ -0,0 +1,30 @@ +font-family = Iosevka Nerd Font +font-size = 12 + +theme = catppuccin-macchiato + +cursor-style = block + +shell-integration-features = no-cursor + +window-theme = ghostty +window-decoration = false + +unfocused-split-opacity = 1 + +keybind = ctrl+shift+enter>ctrl+shift+h=new_split:left +keybind = ctrl+shift+enter>ctrl+shift+l=new_split:right +keybind = ctrl+shift+enter>ctrl+shift+k=new_split:up +keybind = ctrl+shift+enter>ctrl+shift+j=new_split:down +keybind = ctrl+shift+enter>h=new_split:left +keybind = ctrl+shift+enter>l=new_split:right +keybind = ctrl+shift+enter>k=new_split:up +keybind = ctrl+shift+enter>j=new_split:down + +keybind = ctrl+shift+f=toggle_split_zoom +keybind = ctrl+shift+h=goto_split:left +keybind = ctrl+shift+l=goto_split:right +keybind = ctrl+shift+k=goto_split:top +keybind = ctrl+shift+j=goto_split:bottom + +keybind = ctrl+shift+m=toggle_tab_overview diff --git a/users/configs/system/ghostty/default.nix b/users/configs/system/ghostty/default.nix new file mode 100644 index 0000000..8ac33b5 --- /dev/null +++ b/users/configs/system/ghostty/default.nix @@ -0,0 +1,14 @@ +{ + pkgs, + lib, + hostname, + ... +}: { + home.file.".config/ghostty/config" = { + source = ./config; + }; + + programs.ghostty = { + enable = true; + }; +} diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 1619bea..d7c0d76 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -37,7 +37,7 @@ rust-analyzer unzip zip - zigpkgs."0.13.0" + zigpkgs."0.14.0" zls ];