Switch to using plasma accross devices, add nextcloud-client

This commit is contained in:
Evie Litherland-Smith 2023-06-13 09:22:47 +01:00
parent 506ef32b1f
commit b38bbdfe5a
10 changed files with 26 additions and 82 deletions

View file

@ -3,12 +3,15 @@
./common.nix
./hardware/audio.nix
./locales/en_GB.nix
./desktop/hyprland.nix
./desktop/plasma.nix
./services/syncthing/H0615.nix
];
networking.hostName = "H0615"; # Define your hostname.
services.xserver.displayManager.defaultSession = "hyprland";
services.xserver.displayManager = {
defaultSession = "plasma";
autoLogin.user = "elitherl";
};
users.users.elitherl = {
isNormalUser = true;

View file

@ -9,7 +9,10 @@
];
networking.hostName = "J0162"; # Define your hostname.
services.xserver.displayManager.defaultSession = "plasma";
services.xserver.displayManager = {
defaultSession = "plasma";
autoLogin.user = "elitherl";
};
users.users.elitherl = {
isNormalUser = true;

View file

@ -4,7 +4,7 @@
./hardware/audio.nix
./hardware/bluetooth.nix
./locales/en_GB.nix
./desktop/hyprland.nix
./desktop/plasma.nix
./desktop/gamescope.nix
./services/syncthing/Vanguard.nix
];
@ -21,7 +21,10 @@
nameservers = ["192.168.1.166" "9.9.9.9"];
firewall = {enable = true;};
};
services.xserver.displayManager.defaultSession = "hyprland";
services.xserver.displayManager = {
defaultSession = "plasma";
autoLogin.user = "xenia";
};
users.users.xenia = {
isNormalUser = true;

View file

@ -3,7 +3,6 @@
services.xserver.desktopManager.plasma5.enable = true;
programs.kdeconnect.enable = true;
environment.systemPackages = with pkgs; [
sweet
libsForQt5.lightly
libsForQt5.kwindowsystem
libsForQt5.ktorrent

View file

@ -1,9 +1,9 @@
{pkgs, ...}: {
imports = [../work.nix ../desktop/hyprland.nix];
imports = [../work.nix ../desktop/picom.nix];
home.username = "elitherl";
home.homeDirectory = "/home/elitherl";
home.stateVersion = "22.11";
home.packages = with pkgs; [microsoft-edge zotero];
home.packages = with pkgs; [zotero];
programs.fish.functions.nvsync = ''
rsync -avz --filter=':- .gitignore' --exclude='.git*'\
@ -13,42 +13,4 @@
--delete-during --delete-excluded\
$HOME/.config/nvim/ freia:.config/nvim
'';
xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf;
wayland.windowManager.hyprland.extraConfig = builtins.readFile ./hypr/hyprland.conf;
programs.waybar = {
settings = {
main = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"output" = "HDMI-A-1";
"modules-left" = ["wlr/workspaces"];
"modules-center" = ["clock"];
"modules-right" = [
"cpu"
"memory"
"temperature"
"pulseaudio"
"network"
"backlight"
"battery"
"tray"
];
"wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
};
alt = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"output" = "DP-1";
"modules-left" = [];
"modules-center" = ["wlr/workspaces"];
"modules-right" = [];
"wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
};
};
};
}

View file

@ -1,8 +1,4 @@
{
pkgs,
config,
...
}: {
{pkgs, ...}: {
imports = [../work.nix ../desktop/picom.nix];
home.username = "elitherl";
home.homeDirectory = "/home/elitherl";

View file

@ -1,35 +1,7 @@
{pkgs, ...}: {
imports = [../personal.nix ../desktop/hyprland.nix];
imports = [../personal.nix ../desktop/picom.nix];
home.username = "xenia";
home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11";
home.packages = with pkgs; [prismlauncher nomachine-client];
xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf;
wayland.windowManager.hyprland.extraConfig = builtins.readFile ./hypr/hyprland.conf;
programs.waybar = {
settings = {
main = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"modules-left" = ["wlr/workspaces"];
"modules-center" = ["clock"];
"modules-right" = [
"cpu"
"memory"
"temperature"
"pulseaudio"
"bluetooth"
"network"
"backlight"
"battery"
"battery#bat2"
"tray"
];
"wlr/workspaces" = {"format-icons" = {"5" = "󰓓";};};
};
};
};
}

View file

@ -0,0 +1,6 @@
{...}: {
services.nextcloud-client = {
enable = true;
startInBackground = true;
};
}

View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
imports = [./default.nix ./git/personal.nix ./ssh/personal.nix];
home.packages = with pkgs; [signal-desktop discord element-desktop qbittorrent];
home.packages = with pkgs; [signal-desktop discord element-desktop];
}

2
nvim

@ -1 +1 @@
Subproject commit 932dfdd4b8f2bada1751c34bfcb598b885414bef
Subproject commit 80e5b6b78c3bdcc503b8f6b74ffb4db51f9a2d06