diff options
| -rw-r--r-- | .vscode/settings.json | 3 | ||||
| -rw-r--r-- | homes/floppydisk/default.nix | 23 | ||||
| -rw-r--r-- | homes/floppydisk/hyprland.nix | 5 | ||||
| -rw-r--r-- | homes/floppydisk/ssh.nix | 17 | ||||
| -rw-r--r-- | homes/floppydisk/waybar.nix | 11 | ||||
| -rw-r--r-- | hosts/nixpad/configuration.nix | 2 |
6 files changed, 43 insertions, 18 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d055548 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "workbench.colorCustomizations": {} +} diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix index 658c64c..acd54c0 100644 --- a/homes/floppydisk/default.nix +++ b/homes/floppydisk/default.nix @@ -14,6 +14,11 @@ username = "floppydisk"; homeDirectory = "/home/floppydisk"; 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 = { @@ -46,15 +51,15 @@ plugins = [ "git" "thefuck" - ]; - custom = "$HOME/.oh-my-custom"; - theme = "powerlevel10k/powerlevel10k"; + ]; + custom = "$HOME/.oh-my-custom"; + theme = "powerlevel10k/powerlevel10k"; }; plugins = [ { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } ]; initExtra = '' @@ -67,9 +72,9 @@ userName = "Frankie B."; userEmail = "git@diskfloppy.me"; extraConfig = { - commit.gpgsign = true; - gpg.format = "ssh"; - user.signingkey = "~/.ssh/id_ed25519.pub"; + # commit.gpgsign = true; + # gpg.format = "ssh"; + # user.signingkey = "~/.ssh/id_ed25519.pub"; init.defaultBranch = "master"; }; }; diff --git a/homes/floppydisk/hyprland.nix b/homes/floppydisk/hyprland.nix index 697c81a..5691a56 100644 --- a/homes/floppydisk/hyprland.nix +++ b/homes/floppydisk/hyprland.nix @@ -12,10 +12,7 @@ "1password --silent" ]; - monitor = [ - "DVI-D-1,1920x1080,1920x0,1" - "HDMI-A-1,1920x1080,0x0,1" - ]; + monitor = []; windowrulev2 = [ "float, title:^(Picture-in-Picture)$" diff --git a/homes/floppydisk/ssh.nix b/homes/floppydisk/ssh.nix new file mode 100644 index 0000000..99e77c5 --- /dev/null +++ b/homes/floppydisk/ssh.nix @@ -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}"; + }; +}
\ No newline at end of file diff --git a/homes/floppydisk/waybar.nix b/homes/floppydisk/waybar.nix index 5592c05..194109a 100644 --- a/homes/floppydisk/waybar.nix +++ b/homes/floppydisk/waybar.nix @@ -5,7 +5,7 @@ height = 27; fixed-center = true; modules-left = [ - "wlr/workspaces" + "hyprland/workspaces" "custom/notification" "tray" ]; @@ -50,10 +50,13 @@ escape = true; }; - "wlr/workspaces" = { + "hyprland/workspaces" = { disable-scroll = false; all-outputs = false; format = "{icon}"; + "on-scroll-up" = "hyprctl dispatch workspace e+1"; + "on-scroll-down" = "hyprctl dispatch workspace e-1"; + "on-click" = "activate"; active-only = false; format-icons = { "1" = "I"; @@ -135,8 +138,8 @@ "critical" = 5; }; format = "{icon}{capacity}% "; - format-charging = " {capacity}% "; - format-plugged = " {capacity}% "; + format-charging = " {capacity}%"; + format-plugged = " {capacity}%"; format-alt = "{icon}{time}"; format-icoms = [" " " " " " " " " "]; }; diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix index 68c8c3f..b2781ab 100644 --- a/hosts/nixpad/configuration.nix +++ b/hosts/nixpad/configuration.nix @@ -15,7 +15,6 @@ services.xserver = { enable = true; displayManager.sddm.enable = true; - desktopManager.plasma5.enable = true; xkb.layout = "us"; libinput.enable = true; }; @@ -102,6 +101,7 @@ ]; networking.hostName = "nixpad"; + networking.networkmanager.enable = true; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; |