Flatten home/desktop structure

This commit is contained in:
Evie Litherland-Smith 2023-05-16 09:11:39 +01:00
parent 4408bca62b
commit b4d45ba6bb
53 changed files with 39 additions and 94 deletions

View file

@ -1,2 +0,0 @@
{ ... }:
{ imports = [ ./gtk.nix ]; }

View file

@ -1,10 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
squeekboard
lisgd
];
programs.wlogout = {
enable = true;
};
}

View file

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

View file

@ -0,0 +1,7 @@
preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
preload = /etc/nixos/config/wallpaper/images_dark/1920x1200.png
preload = /etc/nixos/config/wallpaper/images_dark/1080x1920.png
wallpaper = HDMI-A-1,/etc/nixos/config/wallpaper/images_dark/1920x1200.png
wallpaper = DP-1,/etc/nixos/config/wallpaper/images_dark/1080x1920.png
wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png

View file

@ -0,0 +1,2 @@
preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png

View file

@ -9,32 +9,26 @@ in
{ {
imports = [ imports = [
hyprland.homeManagerModules.default hyprland.homeManagerModules.default
./common.nix
./swaylock.nix ./swaylock.nix
./eww.nix ./eww.nix
./waybar.nix ./waybar.nix
../common/gtk.nix ./gtk.nix
../common/dunst.nix ./dunst.nix
../common/rofi.nix ./rofi.nix
../xorg/xresources.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
pipewire
wireplumber
wl-clipboard
swayimg swayimg
hyprpaper hyprpaper
]; ];
programs.rofi.package = pkgs.rofi-wayland; programs.rofi.package = pkgs.rofi-wayland;
xdg.configFile."hypr" = { xdg.configFile."hypr/common.conf".source = ./config/hypr/common.conf;
source = ./config/hypr; xdg.configFile."hypr/keybinds.conf".source = ./config/hypr/keybinds.conf;
# recursive = true; xdg.configFile."hypr/window-rules.conf".source = ./config/hypr/window-rules.conf;
# text = "# test";
};
xsession.enable = true;
programs.keychain.enableXsessionIntegration = true;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland = { xwayland = { enable = true; hidpi = true; };
enable = true;
hidpi = true;
};
}; };
} }

View file

@ -1,8 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [ bluez ];
bluez
];
services.polybar = { services.polybar = {
enable = true; enable = true;
config = ./config/polybar/polybar.ini; config = ./config/polybar/polybar.ini;

6
home/desktop/sway.nix Normal file
View file

@ -0,0 +1,6 @@
{ pkgs, ... }:
{
#xdg.configFile."sway".source = ./config/sway;
home.packages = with pkgs; [ brightnessctl ];
wayland.windowManager.sway = { enable = true; };
}

13
home/desktop/waybar.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
bluez
];
# xdg.configFile."waybar/common.json".source = ./config/waybar/common.json;
xdg.configFile."waybar" = {
source = ./config/waybar;
recursive = true;
};
programs.waybar.enable = true;
}

View file

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
pipewire
wireplumber
wl-clipboard
];
}

View file

@ -1,7 +0,0 @@
preload = ~/.nixos/wallpaper/images_dark/1920x1080.png
preload = ~/.nixos/wallpaper/images_dark/1920x1200.png
preload = ~/.nixos/wallpaper/images_dark/1080x1920.png
wallpaper = HDMI-A-1,~/.nixos/wallpaper/images_dark/1920x1200.png
wallpaper = DP-1,~/.nixos/wallpaper/images_dark/1080x1920.png
wallpaper = ,~/.nixos/wallpaper/images_dark/1920x1080.png

View file

@ -1,2 +0,0 @@
preload = ~/.nixos/wallpaper/images_dark/5120x2880.png
wallpaper = HDMI-A-1,~/.nixos/wallpaper/images_dark/5120x2880.png

View file

@ -1,19 +0,0 @@
{
"include": ["~/.config/waybar/modules.json", "~/.config/waybar/layout.json"],
"output": "HDMI-A-1",
"modules-left": ["custom/launcher", "cpu", "memory", "temperature"],
"modules-center": ["wlr/workspaces"],
"modules-right": [
"pulseaudio",
"bluetooth",
"network",
"backlight",
"battery",
"battery#bat2",
"clock",
"tray",
"custom/power"
]
}
// vim: ft=json

View file

@ -1,11 +0,0 @@
{ pkgs, ... }:
{
imports = [ ./common-wayland.nix ];
#xdg.configFile."sway".source = ./config/sway;
home.packages = with pkgs; [
brightnessctl
];
wayland.windowManager.sway = {
enable = true;
};
}

View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
bluez
];
xdg.configFile."waybar".source = ./config/waybar;
programs.waybar.enable = true;
}

View file

@ -1,7 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./xresources.nix
./gtk.nix ./gtk.nix
./bspwm.nix ./bspwm.nix
./sxhkd.nix ./sxhkd.nix

View file

@ -1,5 +0,0 @@
{ ... }:
{
xsession.enable = true;
programs.keychain.enableXsessionIntegration = true;
}

View file

@ -1,6 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./common.nix ];
xresources.extraConfig = builtins.readFile xresources.extraConfig = builtins.readFile
( (
pkgs.fetchFromGitHub pkgs.fetchFromGitHub