Fixed some issues

Back to lightdm as sddm didn't work for some reason, cba to debug

Fix some broken config with rofi, zellij

Actually set hyprland colours since I forgot...
This commit is contained in:
Evie Litherland-Smith 2023-12-18 08:34:16 +00:00
parent f173496f81
commit 57966ebdb0
7 changed files with 25 additions and 24 deletions

View file

@ -108,6 +108,7 @@
chromium.enable = true; chromium.enable = true;
console.enable = true; console.enable = true;
fish.enable = true; fish.enable = true;
lightdm.enable = true;
}; };
image = ./wallpapers/tokyo-space.png; image = ./wallpapers/tokyo-space.png;
base16Scheme = base16Scheme =

View file

@ -1,10 +1,11 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
stylix.targets = { stylix.targets = {
avizo.enable = true; avizo.enable = true;
firefox.enable = true;
fzf.enable = true; fzf.enable = true;
mako.enable = true; mako.enable = true;
rofi.enable = true;
xresources.enable = true; xresources.enable = true;
zellij.enable = true;
}; };
xdg.configFile = { xdg.configFile = {
"style.css".text = with config.lib.stylix.colors.withHashtag; '' "style.css".text = with config.lib.stylix.colors.withHashtag; ''
@ -30,6 +31,7 @@
programs = rec { programs = rec {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
zellij.enable = true;
zsh.initExtra = '' zsh.initExtra = ''
xdg-query-program () { xdg-query-program () {
FILETYPE=$(xdg-mime query filetype $@) FILETYPE=$(xdg-mime query filetype $@)
@ -259,9 +261,5 @@
}; };
}; };
}; };
zellij = {
enable = true;
theme = "catppuccin-mocha";
};
}; };
} }

View file

@ -25,7 +25,7 @@ in ''
exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
exec-once = systemctl --user restart xdg-desktop-portal.service xdg-desktop-portal-hyprland.service avizo.service exec-once = systemctl --user restart xdg-desktop-portal.service xdg-desktop-portal-hyprland.service avizo.service
misc:background_color=rgb(1a1b26) misc:background_color=rgb(1e1e2e)
gestures:workspace_swipe = true gestures:workspace_swipe = true
input { input {
@ -37,8 +37,8 @@ in ''
dwindle:force_split = 2 dwindle:force_split = 2
general { general {
col.active_border=rgb(bb9af7) col.active_border=rgb(b4befe)
col.inactive_border=rgb(414868) col.inactive_border=rgb(313244)
gaps_in = 5 gaps_in = 5
gaps_out = 10 gaps_out = 10
border_size = 1 border_size = 1
@ -48,7 +48,7 @@ in ''
decoration { decoration {
rounding = 10 rounding = 10
col.shadow=rgba(1a1b2699) col.shadow=rgba(1e1e2e99)
drop_shadow = yes drop_shadow = yes
shadow_ignore_window = true shadow_ignore_window = true
shadow_range = 4 shadow_range = 4

View file

@ -1,6 +1,6 @@
* { * {
bg-col: alpha(#1e1e2e, 0.5); bg-col: #1e1e2e;
bg-col-light: alpha(#1e1e2e, 0.5); bg-col-light: #1e1e2e;
border-col: #b4befe; border-col: #b4befe;
selected-col: #1e1e2e; selected-col: #1e1e2e;
blue: #89b4fa; blue: #89b4fa;

View file

@ -16,7 +16,6 @@ in {
''; '';
}; };
plugins = with pkgs; [ rofi-calc ]; plugins = with pkgs; [ rofi-calc ];
theme = ./catppuccin-mocha.rasi;
extraConfig = { extraConfig = {
modi = "window,run,drun,ssh,calc,${power-menu},combi"; modi = "window,run,drun,ssh,calc,${power-menu},combi";
combi-modi = "window,drun,ssh,calc"; combi-modi = "window,drun,ssh,calc";

View file

@ -112,9 +112,12 @@ tooltip {
color: @red; color: @red;
} }
#pulseaudio { #battery {
color: @red; color: @red;
} }
#pulseaudio {
color: @peach;
}
#disk { #disk {
color: @yellow; color: @yellow;
} }
@ -122,11 +125,8 @@ tooltip {
color: @green; color: @green;
} }
#memory { #memory {
color: @teal; color: @sapphire;
}
#battery {
color: @blue;
} }
#clock { #clock {
color: @lavender; color: @mauve;
} }

View file

@ -1,7 +1,8 @@
{ pkgs, ... }: { { config, pkgs, user, ... }:
{
imports = [ ./default.nix ./chromium.nix ]; imports = [ ./default.nix ./chromium.nix ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
catppuccin-sddm-corners
dex dex
mesa mesa
libnotify libnotify
@ -40,11 +41,13 @@
layout = "gb"; layout = "gb";
xkbVariant = ""; xkbVariant = "";
xkbOptions = "ctrl:nocaps"; xkbOptions = "ctrl:nocaps";
displayManager.sddm = { displayManager.lightdm = {
enable = true; enable = true;
theme = "catppuccin-sddm-corners"; greeters.gtk = {
autoNumlock = true; inherit (config.home-manager.users.${user}.gtk)
settings = { General = { InputMethod = ""; }; }; cursorTheme iconTheme theme;
enable = true;
};
}; };
}; };
}; };