feat: modified configuration to introduce ags, with extras

Revert displayScale to 1

Create AGS bar component configuration

Removed declarations for waybar
This commit is contained in:
Zhongheng Liu 2024-08-19 17:33:37 +08:00
commit 101aee8193
No known key found for this signature in database
8 changed files with 58 additions and 36 deletions

View file

@ -19,7 +19,7 @@
config = rec { config = rec {
myUserName = "stvnliu"; myUserName = "stvnliu";
myHostName = "nixos-msi"; myHostName = "nixos-msi";
displayScale = 2; displayScale = 1;
myWallPaperPathString = "/home/${myUserName}/wallpaper.png"; myWallPaperPathString = "/home/${myUserName}/wallpaper.png";
myDisplayName = "Zhongheng Liu"; myDisplayName = "Zhongheng Liu";
myEmail = "z.liu@outlook.com.gr"; myEmail = "z.liu@outlook.com.gr";

View file

@ -0,0 +1,37 @@
{
pkgs,
config,
...
}: {
gtk = {
enable = true;
cursorTheme = {
package = pkgs.vanilla-dmz;
name = "Vanilla-DMZ";
size = 24;
};
font = {
name = "Aileron";
size = 10;
};
theme = {
package = pkgs.gruvbox-gtk-theme;
name = "Gruvbox-Dark-BL";
};
iconTheme = {
package = pkgs.gruvbox-plus-icons;
name = "Gruvbox-Plus-Dark";
};
};
qt = {
enable = true;
platformTheme = "gtk";
style = {
package = pkgs.libsForQt5.breeze-qt5;
name = "breeze";
};
};
home.packages = with pkgs; [
libsForQt5.breeze-qt5
];
}

View file

@ -17,9 +17,11 @@
./hypr ./hypr
./shells ./shells
../../common/variables.nix ../../common/variables.nix
./mako.nix #./mako.nix
./wechat ./wechat
./editors.nix ./editors.nix
./gtk.nix
#./ags.nix
]; ];
nixpkgs = { nixpkgs = {
@ -77,6 +79,7 @@
qq qq
libreoffice libreoffice
discord discord
zathura
]; ];
programs.git = { programs.git = {
enable = true; enable = true;

View file

@ -4,35 +4,6 @@
... ...
}: { }: {
home.packages = with pkgs; [foot]; home.packages = with pkgs; [foot];
programs.waybar = {
enable = true;
settings = [
{
layer = "top";
position = "top";
height = 30;
output = ["eDP-1" "HDMI-A-1"];
modules-left = ["hyprland/window" "wlr/taskbar" "cpu" "memory" "idle-inhibitor"];
modules-center = ["hyprland/workspaces" "custom/hello-from-waybar"];
modules-right = ["mpd" "custom/mymodule#with-css-id" "tray" "temperature" "battery"];
"hyprland/workspaces" = {
disable-scroll = true;
all-outputs = true;
};
"custom/hello-from-waybar" = {
format = "hello {}";
max-length = 40;
interval = "once";
exec = pkgs.writeShellScript "hello-from-waybar" ''
echo "from within waybar"
'';
};
}
];
systemd.enable = true;
systemd.target = "hyprland-session.target";
};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
# Whether to enable Hyprland wayland compositor # Whether to enable Hyprland wayland compositor
enable = true; enable = true;

View file

@ -25,6 +25,7 @@
./virt-column.nix ./virt-column.nix
]; ];
enable = true; enable = true;
enableMan = true;
defaultEditor = true; defaultEditor = true;
globals.mapleader = " "; globals.mapleader = " ";
colorschemes.gruvbox = {enable = true;}; colorschemes.gruvbox = {enable = true;};

View file

@ -3,7 +3,7 @@
updatetime = 100; # Faster completion updatetime = 100; # Faster completion
number = true; number = true;
relativenumber = true; relativenumber = false;
autoindent = true; autoindent = true;
clipboard = "unnamedplus"; clipboard = "unnamedplus";

5
nixos/ags.nix Normal file
View file

@ -0,0 +1,5 @@
{pkgs, ...}: {
environment.systemPackages = [
pkgs.ags
];
}

View file

@ -14,10 +14,9 @@
./fonts.nix ./fonts.nix
./services/laptop.preset.nix ./services/laptop.preset.nix
./hardware-configuration.nix ./hardware-configuration.nix
./ags.nix
]; ];
environment.variables = { environment.variables = {GDK_SCALE = config.displayScale;};
GDK_SCALE = config.displayScale;
};
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = {};
i18n.inputMethod = { i18n.inputMethod = {
enabled = "fcitx5"; enabled = "fcitx5";
@ -100,7 +99,13 @@
#}; #};
programs.hyprland.enable = true; # enables Hyprland DM. programs.hyprland.enable = true; # enables Hyprland DM.
nixpkgs = { nixpkgs = {
overlays = []; overlays = [
(final: prev: {
ags = prev.ags.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
});
})
];
config = {allowUnfree = true;}; config = {allowUnfree = true;};
}; };