summaryrefslogtreecommitdiff
path: root/modules/nixos
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2024-01-26 17:42:10 +0000
committerDevin Finlinson <devin.finlinson@pm.me>2024-01-26 17:42:10 +0000
commit053d4ebb58ea9a9d0e3ee98c14f1f5c375f57556 (patch)
treee1ee576269532ca638d9d7d90c0b216d63cf9edc /modules/nixos
parente4801c21871f82a8a427b6657d87ecb9a9202c13 (diff)
parentfb96c957c3b0d1226d965195ab637f1be6250618 (diff)
merging zenbook branch to bosco
Diffstat (limited to 'modules/nixos')
-rw-r--r--modules/nixos/hyprland.nix16
-rw-r--r--modules/nixos/tailscale.nix2
2 files changed, 14 insertions, 4 deletions
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 3ccc77c..3167314 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -3,7 +3,8 @@
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
- xdg-desktop-portal-wlr
+ # xdg-desktop-portal-wlr
+ xdg-desktop-portal-hyprland
];
};
@@ -50,13 +51,16 @@
environment.systemPackages = with pkgs; [
waybar # the status bar
swaybg # the wallpaper
+ hyprpaper # hyprland wallpeper
swayidle # the idle timeout
- swaylock # locking the screen
+ swaylock-effects # locking the screen
+ brightnessctl # control device brightness
wlogout # logout menu
wl-clipboard # copying and pasting
hyprpicker # color picker
wf-recorder # screen recording
+ xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing
grim # taking screenshots
slurp # selecting a region to screenshot
# TODO replace by 'flameshot gui --raw | wl-copy'
@@ -73,8 +77,14 @@
networkmanagerapplet # provide GUI app: nm-connection-editor
xfce.thunar # sfce4's file manager
+ # gnome.gnome-keyring # for remembering wifi passwords
+ # gnome.libgnome-keyring
+ polkit-kde-agent
+ ];
+ fonts.packages = with pkgs; [
+ font-awesome # fixes waybar fonts
];
# fix https://github.com/ryan4yin/nix-config/issues/10
security.pam.services.swaylock = {};
-} \ No newline at end of file
+}
diff --git a/modules/nixos/tailscale.nix b/modules/nixos/tailscale.nix
index e73aec9..774a959 100644
--- a/modules/nixos/tailscale.nix
+++ b/modules/nixos/tailscale.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
services.tailscale = {
enable = true;
extraUpFlags = [