Multiple cfg updates
* Add hyprpaper config * Remove old monitor configs * Update waybar to use hyprland workspaces * Format waybar * Enable networkmanager * Remove KDE Plasma
This commit is contained in:
parent
d666f30475
commit
1c68fd4369
6 changed files with 43 additions and 18 deletions
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"workbench.colorCustomizations": {}
|
||||||
|
}
|
|
@ -14,6 +14,11 @@
|
||||||
username = "floppydisk";
|
username = "floppydisk";
|
||||||
homeDirectory = "/home/floppydisk";
|
homeDirectory = "/home/floppydisk";
|
||||||
file.".config/lockonsleep/config.sh".source = ./lock.sh;
|
file.".config/lockonsleep/config.sh".source = ./lock.sh;
|
||||||
|
file.".config/hypr/hyprpaper.conf".text = ''
|
||||||
|
preload = ${/. + ../../misc/wallpapers/oneshot-1.jpg}
|
||||||
|
wallpaper = ,${/. + ../../misc/wallpapers/oneshot-1.jpg}
|
||||||
|
splash = false
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
|
@ -46,15 +51,15 @@
|
||||||
plugins = [
|
plugins = [
|
||||||
"git"
|
"git"
|
||||||
"thefuck"
|
"thefuck"
|
||||||
];
|
];
|
||||||
custom = "$HOME/.oh-my-custom";
|
custom = "$HOME/.oh-my-custom";
|
||||||
theme = "powerlevel10k/powerlevel10k";
|
theme = "powerlevel10k/powerlevel10k";
|
||||||
};
|
};
|
||||||
plugins = [
|
plugins = [
|
||||||
{
|
{
|
||||||
name = "powerlevel10k";
|
name = "powerlevel10k";
|
||||||
src = pkgs.zsh-powerlevel10k;
|
src = pkgs.zsh-powerlevel10k;
|
||||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
|
@ -67,9 +72,9 @@
|
||||||
userName = "Frankie B.";
|
userName = "Frankie B.";
|
||||||
userEmail = "git@diskfloppy.me";
|
userEmail = "git@diskfloppy.me";
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
commit.gpgsign = true;
|
# commit.gpgsign = true;
|
||||||
gpg.format = "ssh";
|
# gpg.format = "ssh";
|
||||||
user.signingkey = "~/.ssh/id_ed25519.pub";
|
# user.signingkey = "~/.ssh/id_ed25519.pub";
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,10 +12,7 @@
|
||||||
"1password --silent"
|
"1password --silent"
|
||||||
];
|
];
|
||||||
|
|
||||||
monitor = [
|
monitor = [];
|
||||||
"DVI-D-1,1920x1080,1920x0,1"
|
|
||||||
"HDMI-A-1,1920x1080,0x0,1"
|
|
||||||
];
|
|
||||||
|
|
||||||
windowrulev2 = [
|
windowrulev2 = [
|
||||||
"float, title:^(Picture-in-Picture)$"
|
"float, title:^(Picture-in-Picture)$"
|
||||||
|
|
17
homes/floppydisk/ssh.nix
Normal file
17
homes/floppydisk/ssh.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{
|
||||||
|
nixosConfig,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
_1passwordAgent = {
|
||||||
|
enable = nixosConfig != {} && nixosConfig.programs._1password-gui.enable && nixosConfig.programs._1password-gui.sshAgent;
|
||||||
|
path = "${config.home.homeDirectory}/.1password/agent.sock";
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
programs.ssh = {
|
||||||
|
enable = true;
|
||||||
|
forwardAgent = _1passwordAgent.enable;
|
||||||
|
extraConfig = lib.optionalString _1passwordAgent.enable "IdentityAgent ${_1passwordAgent.path}";
|
||||||
|
};
|
||||||
|
}
|
|
@ -5,7 +5,7 @@
|
||||||
height = 27;
|
height = 27;
|
||||||
fixed-center = true;
|
fixed-center = true;
|
||||||
modules-left = [
|
modules-left = [
|
||||||
"wlr/workspaces"
|
"hyprland/workspaces"
|
||||||
"custom/notification"
|
"custom/notification"
|
||||||
"tray"
|
"tray"
|
||||||
];
|
];
|
||||||
|
@ -50,10 +50,13 @@
|
||||||
escape = true;
|
escape = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
"wlr/workspaces" = {
|
"hyprland/workspaces" = {
|
||||||
disable-scroll = false;
|
disable-scroll = false;
|
||||||
all-outputs = false;
|
all-outputs = false;
|
||||||
format = "{icon}";
|
format = "{icon}";
|
||||||
|
"on-scroll-up" = "hyprctl dispatch workspace e+1";
|
||||||
|
"on-scroll-down" = "hyprctl dispatch workspace e-1";
|
||||||
|
"on-click" = "activate";
|
||||||
active-only = false;
|
active-only = false;
|
||||||
format-icons = {
|
format-icons = {
|
||||||
"1" = "I";
|
"1" = "I";
|
||||||
|
@ -135,8 +138,8 @@
|
||||||
"critical" = 5;
|
"critical" = 5;
|
||||||
};
|
};
|
||||||
format = "{icon}{capacity}% ";
|
format = "{icon}{capacity}% ";
|
||||||
format-charging = " {capacity}% ";
|
format-charging = " {capacity}%";
|
||||||
format-plugged = " {capacity}% ";
|
format-plugged = " {capacity}%";
|
||||||
format-alt = "{icon}{time}";
|
format-alt = "{icon}{time}";
|
||||||
format-icoms = [" " " " " " " " " "];
|
format-icoms = [" " " " " " " " " "];
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager.sddm.enable = true;
|
displayManager.sddm.enable = true;
|
||||||
desktopManager.plasma5.enable = true;
|
|
||||||
xkb.layout = "us";
|
xkb.layout = "us";
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
@ -102,6 +101,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "nixpad";
|
networking.hostName = "nixpad";
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
Loading…
Reference in a new issue