home: move ./nixos/wm to ./resources/wm

This commit is contained in:
Guanran Wang 2023-11-06 14:34:57 +08:00
parent 6d07fe55a7
commit 3cad379fa2
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
15 changed files with 96 additions and 75 deletions

View file

@ -9,21 +9,16 @@ in {
source = "${configPath}/fontconfig";
recursive = true;
};
"hypr" = {
source = "${configPath}/hyprland";
recursive = true;
};
"picom" = {
source = "${configPath}/picom";
recursive = true;
};
"makepkgs.conf" = {
source = "${configPath}/makepkgs.conf";
};
"alsoft.conf" = {
source = "${configPath}/alsoft.conf";
};
#"picom" = {
# source = "${configPath}/picom";
# recursive = true;
#};
#"makepkgs.conf" = {
# source = "${configPath}/makepkgs.conf";
#};
#"alsoft.conf" = {
# source = "${configPath}/alsoft.conf";
#};
};
xdg.dataFile = {
@ -31,10 +26,6 @@ in {
source = "${dataPath}/backgrounds";
recursive = true;
};
"icons" = {
source = "${dataPath}/icons";
recursive = true;
};
#"flatpak" = {
# source = "${dataPath}/flatpak";
# recursive = true;

View file

@ -81,49 +81,9 @@
#gnome-tweaks
#gnome-software
#gnome-shell-extensions
])
++ (with pkgs.gnomeExtensions; [
# GNOME extensions
#arcmenu
#appindicator
#blur-my-shell
#caffeine
#dash-to-panel
#dash-to-dock
#gamemode # outdated
#just-perfection
#kimpanel
]);
};
wayland.windowManager = {
hyprland = {
#enable = true;
enableNvidiaPatches = true;
xwayland.enable = true;
plugins = [
#inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
];
extraConfig = ''
#source = ~/.config/hypr/themes/mocha.conf
#source = ~/.config/hypr/themes/colors.conf
#source = ~/.config/hypr/plugins.conf
source = ~/.config/hypr/main.conf
source = ~/.config/hypr/keybinds.conf
source = ~/.config/hypr/autostart.conf
source = ~/.config/hypr/env.conf
'';
};
};
#xsession = {
# enable = true;
# windowManager.bspwm = {
# enable = true;
# };
#};
#programs.boxxy = {
# enable = true;
# #rules = {

View file

@ -10,14 +10,13 @@
../../resources/browser/chromium.nix
../../resources/browser/librewolf.nix
../home.nix
../../resources/wm/sway.nix
../xdg
../home.nix
../dotfiles.nix
../fonts.nix
../i18n.nix
../theme.nix
../wm
../xdg
];
}

View file

@ -1,11 +0,0 @@
{...}: {
imports = [
./dunst.nix
./rofi.nix
./sway.nix
./swayidle.nix
./swaylock.nix
./udiskie.nix
./waybar.nix
];
}

View file

@ -0,0 +1,9 @@
{...}: {
# TODO
xsession = {
enable = true;
windowManager.bspwm = {
enable = true;
};
};
}

View file

@ -23,4 +23,9 @@
urgency_critical.frame_color = "#fab387";
};
};
xdg.dataFile."icons/dunst" = {
source = ../../dotfiles/data/icons/dunst;
recursive = true;
};
}

View file

@ -10,7 +10,7 @@
# Yes, because I have no idea how to use programs.rofi.theme
xdg.configFile."rofi" = {
source = ../../resources/dotfiles/config/rofi;
source = ../../dotfiles/config/rofi;
recursive = true;
};
}

View file

@ -0,0 +1,3 @@
{pkgs, ...}: {
home.packages = with pkgs; [swww];
}

View file

@ -0,0 +1,15 @@
# why is this placed in ./wm
{pkgs, ...}: {
home.packages = with pkgs.gnomeExtensions; [
# GNOME extensions
arcmenu
appindicator
blur-my-shell
caffeine
dash-to-panel
dash-to-dock
gamemode # outdated
just-perfection
kimpanel
];
}

View file

@ -0,0 +1,41 @@
{
inputs,
pkgs,
...
}: {
imports = [
./components/dunst.nix
./components/rofi.nix
./components/swayidle.nix
./components/swaylock.nix
./components/swww.nix
./components/udiskie.nix
./components/waybar.nix
];
wayland.windowManager = {
hyprland = {
enable = true;
enableNvidiaPatches = true;
xwayland.enable = true;
plugins = [
#inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
];
extraConfig = ''
#source = ~/.config/hypr/themes/mocha.conf
#source = ~/.config/hypr/themes/colors.conf
#source = ~/.config/hypr/plugins.conf
source = ~/.config/hypr/main.conf
source = ~/.config/hypr/keybinds.conf
source = ~/.config/hypr/autostart.conf
source = ~/.config/hypr/env.conf
'';
};
};
xdg.configFile."hypr" = {
source = ../dotfiles/config/hyprland;
recursive = true;
};
}

View file

@ -4,6 +4,15 @@
lib,
...
}: {
imports = [
./components/dunst.nix
./components/rofi.nix
./components/swayidle.nix
./components/swaylock.nix
./components/udiskie.nix
./components/waybar.nix
];
programs.fish.loginShellInit = ''
if test -z "$Display" -a "$XDG_VTNR" = 1
exec sway