Add config for new work laptop N0245, add compact pulseaudio waybar module

This commit is contained in:
Evie Litherland-Smith 2023-06-19 14:33:05 +01:00
parent 956abb3245
commit 234e9e131b
5 changed files with 172 additions and 15 deletions

View file

@ -31,8 +31,7 @@ $(HOMEMANAGER_CONFIG_DIR)/home.nix: $(HOMEMANAGER_CONFIG) $(HOMEMANAGER_CONFIG_D
-ln -s $(HOMEMANAGER_CONFIG) $@
$(CONFIG_DIR)/nvim: $(CONFIG_DIR)
-git clone https://git.xenia.me.uk/xenia/nvim.git $@
touch $@
-nix-shell -p git --run "git clone https://git.xenia.me.uk/xenia/nvim.git $@"
$(CONFIG_DIR) $(HOMEMANAGER_CONFIG_DIR):
mkdir -p $@

View file

@ -139,6 +139,29 @@
},
"on-click": "pavucontrol"
},
"pulseaudio#compact": {
"scroll-step": 5,
"format": "{icon} {format_source}",
"format-bluetooth": "{icon} {format_source}",
"format-bluetooth-muted": "󰝟 {icon} {format_source}",
"format-muted": "󰝟 {format_source}",
"format-source": "󰍬",
"format-source-muted": "󰍭",
"format-icons": {
"headphone": "󰋋",
"hands-free": "󰥰",
"headset": "󰋎",
"phone": "󰏲",
"portable": "󰏳",
"car": "󰄍",
"default": [
"󰕿",
"󰖀",
"󰕾"
]
},
"on-click": "pavucontrol"
},
"custom/power": {
"format": "󰐥",
"on-click": "powermenu"
@ -157,12 +180,6 @@
"urgent": "",
"focused": "",
"default": ""
},
"persistent_workspaces": {
"1": [],
"2": [],
"3": [],
"4": []
}
},
"sway/workspaces": {
@ -179,12 +196,6 @@
"urgent": "",
"focused": "",
"default": ""
},
"persistent_workspaces": {
"1": [],
"2": [],
"3": [],
"4": []
}
}
}

View file

@ -0,0 +1,37 @@
{pkgs, ...}: {
imports = [
../../common.nix
../../hardware/audio.nix
../../hardware/bluetooth.nix
../../locales/en_GB.nix
../../desktop/hyprland.nix
../../services/syncthing/N0245.nix
];
networking.hostName = "N0245"; # Define your hostname.
system.autoUpgrade = {
enable = false;
allowReboot = false;
};
environment.etc."ppp/options".text = ''
ipcp-accept-remote
'';
users.users.elitherl = {
isNormalUser = true;
description = "Evie Litherland-Smith";
extraGroups = ["networkmanager" "wheel"];
shell = pkgs.fish;
};
home-manager.users.elitherl = import ./elitherl.nix;
services.greetd = {
enable = true;
settings = rec {
initial_session = {
command = "Hyprland";
user = "elitherl";
};
default_session = initial_session;
};
};
}

View file

@ -0,0 +1,83 @@
{pkgs, ...}: {
imports = [
../../home/work.nix
../../home/gui
../../home/desktop/hyprland.nix
];
home.username = "elitherl";
home.homeDirectory = "/home/elitherl";
home.stateVersion = "22.11";
home.packages = with pkgs; [
zotero
openfortivpn
nomachine-client
teams-for-linux
zoom-us
];
programs.firefox.package = pkgs.firefox-wayland;
wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf
monitor=eDP-1,preferred,auto,auto
monitor=DP-3,preferred,auto,auto
monitor=DP-4,preferred,auto,auto,transform,1
windowrule = float, title:^([Zz]oom).*$
windowrule = center, title:^([Zz]oom).*$
windowrule = float, ^(Nxplayer.bin)$
windowrule = center, ^(Nxplayer.bin)$
windowrule = workspace 3, title:^([Zz]oom).*$
windowrule = workspace 4, ^(Nxplayer.bin)$
'';
programs.waybar.settings = {
main = {
"output" = "DP-3";
"modules-left" = [
"wlr/workspaces"
"cpu"
"memory"
"temperature"
];
"modules-center" = ["clock"];
"modules-right" = [
"pulseaudio"
"bluetooth"
"network#compact"
"backlight"
"battery"
"tray"
];
};
alt-integrated = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"output" = "eDP-1";
"modules-left" = [
"wlr/workspaces"
"cpu"
"memory"
"temperature"
];
"modules-center" = ["clock#compact"];
"modules-right" = [
"pulseaudio#compact"
"bluetooth"
"network#compact"
"backlight"
"battery"
"tray"
];
};
alt-vertical = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"output" = "DP-4";
"modules-left" = ["wlr/workspaces"];
"modules-center" = ["clock#compact"];
"modules-right" = ["tray"];
};
};
}

View file

@ -0,0 +1,27 @@
{...}: {
imports = [
./default.nix
./devices/H0615.nix
./devices/Ion.nix
./devices/Legion.nix
./devices/Monarch.nix
./devices/Northstar.nix
./devices/Vanguard.nix
./folders/notes.nix
./folders/zotero.nix
];
services.syncthing = {
user = "elitherl";
group = "users";
dataDir = "/home/elitherl";
extraOptions.options.globalAnnounceEnabled = true;
folders."Notes" = {
path = "~/notes";
devices = ["H0615" "ion" "legion" "monarch" "northstar" "vanguard"];
};
folders."Zotero" = {
path = "~/Documents/Zotero";
devices = ["ion" "H0615" "legion"];
};
};
}