diff options
| -rw-r--r-- | common/variables.nix | 2 | ||||
| -rw-r--r-- | home-manager/stvnliu/gtk.nix | 37 | ||||
| -rw-r--r-- | home-manager/stvnliu/home.nix | 5 | ||||
| -rw-r--r-- | home-manager/stvnliu/hypr/hyprland.nix | 29 | ||||
| -rw-r--r-- | home-manager/stvnliu/nixvim/default.nix | 1 | ||||
| -rw-r--r-- | home-manager/stvnliu/nixvim/options.nix | 2 | ||||
| -rw-r--r-- | nixos/ags.nix | 5 | ||||
| -rw-r--r-- | nixos/configuration.nix | 13 |
8 files changed, 58 insertions, 36 deletions
diff --git a/common/variables.nix b/common/variables.nix index a6a0db4..13517f2 100644 --- a/common/variables.nix +++ b/common/variables.nix @@ -19,7 +19,7 @@ config = rec { myUserName = "stvnliu"; myHostName = "nixos-msi"; - displayScale = 2; + displayScale = 1; myWallPaperPathString = "/home/${myUserName}/wallpaper.png"; myDisplayName = "Zhongheng Liu"; myEmail = "z.liu@outlook.com.gr"; diff --git a/home-manager/stvnliu/gtk.nix b/home-manager/stvnliu/gtk.nix new file mode 100644 index 0000000..1ad19cf --- /dev/null +++ b/home-manager/stvnliu/gtk.nix @@ -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 + ]; +} diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix index dc36137..94999ca 100644 --- a/home-manager/stvnliu/home.nix +++ b/home-manager/stvnliu/home.nix @@ -17,9 +17,11 @@ ./hypr ./shells ../../common/variables.nix - ./mako.nix + #./mako.nix ./wechat ./editors.nix + ./gtk.nix + #./ags.nix ]; nixpkgs = { @@ -77,6 +79,7 @@ qq libreoffice discord + zathura ]; programs.git = { enable = true; diff --git a/home-manager/stvnliu/hypr/hyprland.nix b/home-manager/stvnliu/hypr/hyprland.nix index fa915b3..d7e0b56 100644 --- a/home-manager/stvnliu/hypr/hyprland.nix +++ b/home-manager/stvnliu/hypr/hyprland.nix @@ -4,35 +4,6 @@ ... }: { 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 = { # Whether to enable Hyprland wayland compositor enable = true; diff --git a/home-manager/stvnliu/nixvim/default.nix b/home-manager/stvnliu/nixvim/default.nix index 3f74c26..be0731b 100644 --- a/home-manager/stvnliu/nixvim/default.nix +++ b/home-manager/stvnliu/nixvim/default.nix @@ -25,6 +25,7 @@ ./virt-column.nix ]; enable = true; + enableMan = true; defaultEditor = true; globals.mapleader = " "; colorschemes.gruvbox = {enable = true;}; diff --git a/home-manager/stvnliu/nixvim/options.nix b/home-manager/stvnliu/nixvim/options.nix index 231c131..5243cf9 100644 --- a/home-manager/stvnliu/nixvim/options.nix +++ b/home-manager/stvnliu/nixvim/options.nix @@ -3,7 +3,7 @@ updatetime = 100; # Faster completion number = true; - relativenumber = true; + relativenumber = false; autoindent = true; clipboard = "unnamedplus"; diff --git a/nixos/ags.nix b/nixos/ags.nix new file mode 100644 index 0000000..036fee1 --- /dev/null +++ b/nixos/ags.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + environment.systemPackages = [ + pkgs.ags + ]; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7f738f2..784aeb7 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -14,10 +14,9 @@ ./fonts.nix ./services/laptop.preset.nix ./hardware-configuration.nix + ./ags.nix ]; - environment.variables = { - GDK_SCALE = config.displayScale; - }; + environment.variables = {GDK_SCALE = config.displayScale;}; security.pam.services.hyprlock = {}; i18n.inputMethod = { enabled = "fcitx5"; @@ -100,7 +99,13 @@ #}; programs.hyprland.enable = true; # enables Hyprland DM. nixpkgs = { - overlays = []; + overlays = [ + (final: prev: { + ags = prev.ags.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3]; + }); + }) + ]; config = {allowUnfree = true;}; }; |