diff options
| -rw-r--r-- | hosts/limbo/default.nix | 5 | ||||
| -rw-r--r-- | hosts/lust/default.nix | 5 | ||||
| -rw-r--r-- | modules/user/desktop/default.nix | 25 | ||||
| -rw-r--r-- | modules/user/desktop/window-managers/sway.nix | 11 | ||||
| -rw-r--r-- | user/home/default.nix | 2 | ||||
| -rw-r--r-- | user/home/zsh/default.nix (renamed from user/home/zsh.nix) | 1 | ||||
| -rw-r--r-- | user/home/zsh/zlogin.zsh | 4 |
7 files changed, 36 insertions, 17 deletions
diff --git a/hosts/limbo/default.nix b/hosts/limbo/default.nix index eff4d01..051a65e 100644 --- a/hosts/limbo/default.nix +++ b/hosts/limbo/default.nix @@ -6,11 +6,6 @@ ./disks.nix ]; - greeters.tuigreet = { - enable = true; - time = true; - }; - home-manager.users.rosa = { imports = [ ../../modules/user diff --git a/hosts/lust/default.nix b/hosts/lust/default.nix index ba5c3dc..bf0f1ad 100644 --- a/hosts/lust/default.nix +++ b/hosts/lust/default.nix @@ -11,11 +11,6 @@ ../../common/steam.nix ]; - greeters.tuigreet = { - enable = true; - time = true; - }; - home-manager.users.rosa = { imports = [ ../../modules/user ]; desktop = { diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix index 560a242..8571621 100644 --- a/modules/user/desktop/default.nix +++ b/modules/user/desktop/default.nix @@ -32,6 +32,31 @@ config = { fonts.fontconfig.enable = true; + gtk = { + enable = true; + colorScheme = "dark"; + cursorTheme = { + package = pkgs.catppuccin-cursors.mochaDark; + name = "catppuccin-mocha-dark-cursors"; + size = 24; + }; + + theme = { + package = ( + pkgs.catppuccin-gtk.override { + accents = [ + "blue" + "pink" + ]; + + variant = "mocha"; + } + ); + + name = "catppuccin-mocha-${config.desktop.accent}-standard"; + }; + }; + home = { file."Pictures/wallpaper.jpg" = { enable = (config.desktop.windowManager != null); diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix index 5b82ff2..14e81cb 100644 --- a/modules/user/desktop/window-managers/sway.nix +++ b/modules/user/desktop/window-managers/sway.nix @@ -11,7 +11,6 @@ desktop.components.waybar.enable = lib.mkDefault (config.desktop.windowManager == "sway"); home.packages = with pkgs; [ grim - rose-pine-cursor slurp ]; @@ -52,7 +51,6 @@ blue = "#89b4fa"; flamingo = "#f2cdcd"; indicator = if (config.desktop.accent == "pink") then flamingo else teal; - nothing = "#00000000"; pink = "#f5c2e7"; red = "#f38ba8"; surface1 = "#45475a"; @@ -71,16 +69,16 @@ focusedInactive = { background = "${surface1}"; border = "${surface1}"; - childBorder = "${nothing}"; - indicator = "${nothing}"; + childBorder = "${surface1}"; + indicator = "${surface1}"; text = "${text}"; }; unfocused = { background = "${base}"; border = "${base}"; - childBorder = "${nothing}"; - indicator = "${nothing}"; + childBorder = "${base}"; + indicator = "${base}"; text = "${text}"; }; @@ -195,6 +193,7 @@ }; }; + seat.seat0.xcursor_theme = "catppuccin-mocha-dark-cursors"; window.titlebar = false; workspaceOutputAssign = [ { diff --git a/user/home/default.nix b/user/home/default.nix index 6caaa6c..35e38dc 100644 --- a/user/home/default.nix +++ b/user/home/default.nix @@ -10,7 +10,7 @@ ./kakoune ./ssh.nix ./vencord - ./zsh.nix + ./zsh ]; home = { diff --git a/user/home/zsh.nix b/user/home/zsh/default.nix index c19b147..ffc8977 100644 --- a/user/home/zsh.nix +++ b/user/home/zsh/default.nix @@ -11,6 +11,7 @@ PS1="%F{1}%n %B%5~%b %F{8}%# %f" ''; + loginExtra = if (config.desktop.windowManager == "sway") then builtins.readFile ./zlogin.zsh else ""; syntaxHighlighting.enable = true; }; } diff --git a/user/home/zsh/zlogin.zsh b/user/home/zsh/zlogin.zsh new file mode 100644 index 0000000..94ce47c --- /dev/null +++ b/user/home/zsh/zlogin.zsh @@ -0,0 +1,4 @@ +if [[ "$(tty)" == "/dev/tty1" ]]; then + export XCURSOR_THEME="catppuccin-mocha-dark-cursors" + exec sway +fi |