merge

18 files changed, 292 insertions, 79 deletions

diff --git a/flake.lock b/flake.lock
index 425746a..500715e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "catppuccin-alacritty": {
       "flake": false,
       "locked": {
-        "lastModified": 1704045909,
-        "narHash": "sha256-bpHznCqkNMbauDQjh98qj2+r1V8mXQIVmvKTldLcln0=",
+        "lastModified": 1705368763,
+        "narHash": "sha256-ypYaxlsDjI++6YNcE+TxBSnlUXKKuAMmLQ4H74T/eLw=",
         "owner": "catppuccin",
         "repo": "alacritty",
-        "rev": "ce476fb41f307d90f841c1a4fd7f0727c21248b2",
+        "rev": "f2da554ee63690712274971dd9ce0217895f5ee0",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704099619,
-        "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
+        "lastModified": 1705659542,
+        "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
+        "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1704475363,
-        "narHash": "sha256-isiBkAsjXIvb/6McVK42/iBbC4h+UL3JRkkLqTSPE48=",
+        "lastModified": 1705973554,
+        "narHash": "sha256-ZvzkhQA0iaUEkyCxBItps5qcSX509vpxpku1NVaiLRQ=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7e033e48ace5406a9bc442f7d403f9ce3af193f3",
+        "rev": "791e1b96b3cd12d56648b3ce7ffb0832eba2b37d",
         "type": "github"
       },
       "original": {
@@ -184,7 +184,11 @@
     },
     "hyprlang": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "hyprland",
+          "xdph",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1704287638,
@@ -242,11 +246,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701689616,
-        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
+        "lastModified": 1705931262,
+        "narHash": "sha256-JU8Dn3FeLlpC2aCXDbVH+E9koZYw/r1LW+fofWq87mE=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
+        "rev": "ed8ab00e8d92076a7cac1b428881b4d5304bb771",
         "type": "github"
       },
       "original": {
@@ -257,16 +261,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702645756,
-        "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+        "lastModified": 1705916986,
+        "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
+        "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -288,11 +292,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1704194953,
-        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
+        "lastModified": 1705856552,
+        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
+        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
         "type": "github"
       },
       "original": {
@@ -302,30 +306,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1704420045,
-        "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nushell-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1704456307,
-        "narHash": "sha256-O7wBMsq1Ds5Re5PakxQoDNnJg0VOdz1yKKanv4Q42SA=",
+        "lastModified": 1706023042,
+        "narHash": "sha256-FmLoF+QieZxjhFglqmSHyPOjj3T8XSn3nCvaZ5RP8Z4=",
         "owner": "nushell",
         "repo": "nu_scripts",
-        "rev": "06327787549c41c93f8079cb034305d666479587",
+        "rev": "f75db6dc5f150ed62198a54f6d13f3e3e1031be6",
         "type": "github"
       },
       "original": {
@@ -346,7 +334,7 @@
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nushell-scripts": "nushell-scripts",
         "wallpapers": "wallpapers"
@@ -419,11 +407,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704400467,
-        "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=",
+        "lastModified": 1704659450,
+        "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd",
+        "rev": "6a5de92769d5b7038134044053f90e7458f6a197",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 71b9468..666a981 100644
--- a/flake.nix
+++ b/flake.nix
@@ -197,14 +197,14 @@
   #   };
     
     nixosConfigurations = {
-      live = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
-          ./modules/users/defin.nix
-          ./modules/nixos/system-packages.nix
-        ];
-      };
+      # live = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   modules = [
+      #     (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+      #     ./modules/users/defin.nix
+      #     ./modules/nixos/system-packages.nix
+      #   ];
+      # };
 
       zenbook = nixpkgs.lib.nixosSystem {
         # inherit system;
@@ -221,7 +221,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
 
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
 
           # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
@@ -260,7 +260,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/default.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
         ];
       };
@@ -279,7 +279,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/default.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
 
           ./modules/nixos/headscale.nix
@@ -296,7 +296,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
-            home-manager.extraSpecialArgs = { inherit nushell-scripts nix-colors catppuccin-bat catppuccin-btop catppuccin-helix catppuccin-starship; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
           ./modules/nixos/hyprland.nix
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 36b18f6..15fb520 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -10,6 +10,9 @@
     ../modules/home-manager/helix.nix
     ../modules/home-manager/shell.nix
     ../modules/home-manager/bat.nix
+    ../modules/home-manager/waybar.nix
+    ../modules/home-manager/swaylock.nix
+    ../modules/home-manager/swayidle.nix
   ];
 
   nixpkgs = {
@@ -66,6 +69,8 @@
         lutris
         heroic
         # texlive-combined-full
+        obs-studio # for recording or streaming
+        waybar
         starship
         kitty
         eza
diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 3f46f5f..1f9c187 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -10,9 +10,14 @@
       ./hardware-configuration.nix
     ];
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    kernelPackages = pkgs.linuxPackages_latest; # use latest kernel
+  };
 
   networking.hostName = "khad"; # Define your hostname.
   # Pick only one of the below networking options.
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix
index 47aecfa..41dd5f0 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running `nixos-help`).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
@@ -32,9 +32,10 @@
 
   services.xserver.displayManager.sddm  = {
     enableHidpi = true;
-    # settings = {
-    #   serverArguments = "-nolisten tcp -dpi 170";
-    # };
+    wayland.enable = true;
+    settings = {
+      Wayland.serverArguments = "-nolisten tcp -dpi 170";
+    };
   };
 
   networking = {
@@ -56,7 +57,8 @@
   };
 
   # Set your time zone.
-  time.timeZone = "US/Mountain";
+  time.timeZone = lib.mkDefault "US/Mountain";
+  services.automatic-timezoned.enable = true;
   # time.timeZone = "Europe/Stockholm";
   # time.timeZone = "UTC";
 
diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix
index 5a9802e..3a06076 100644
--- a/modules/home-manager/bat.nix
+++ b/modules/home-manager/bat.nix
@@ -1,4 +1,4 @@
-{ catppuccin-bat, ...}: {
+{ inputs, ...}: {
   # a cat(1) clone with syntax highlighting and Git integration.
   programs.bat = {
     enable = true;
@@ -7,7 +7,7 @@
       theme = "catppuccin-mocha";
     };
     themes = {
-      catppuccin-mocha = builtins.readFile "${catppuccin-bat}/Catppuccin-mocha.tmTheme";
+      catppuccin-mocha = builtins.readFile "${inputs.catppuccin-bat}/Catppuccin-mocha.tmTheme";
     };
   };
 }
diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix
index 7243a6e..894ff2e 100644
--- a/modules/home-manager/btop.nix
+++ b/modules/home-manager/btop.nix
@@ -1,5 +1,5 @@
-{ catppuccin-btop, ... }: {
-  home.file.".config/btop/themes".source = "${catppuccin-btop}/themes";
+{ inputs, ... }: {
+  home.file.".config/btop/themes".source = "${inputs.catppuccin-btop}/themes";
 
   #replace htop/nmon
   programs.btop = {
diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
index d93a2ea..1eaebfb 100644
--- a/modules/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
@@ -1,11 +1,17 @@
-{ pkgs, catppuccin-helix, ... }: {
+{ pkgs, inputs, ... }: {
   # https://github.com/catppuccin/helix
-  xdg.configFile."helix/themes".source = "${catppuccin-helix}/themes/default";
+  xdg.configFile."helix/themes".source = "${inputs.catppuccin-helix}/themes/default";
 
   programs.helix = {
     enable = true;
     package = pkgs.helix;
     # defaultEditor = true;
+    # themes = {
+    #   custom = {
+    #     "inherits" = "catpuccin_mocha";
+    #     "ui.background" = {};
+    #   };
+    # };
     settings = {
       theme = "catppuccin_mocha";
       editor = {
diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix
index cd35607..685cda1 100644
--- a/modules/home-manager/shell.nix
+++ b/modules/home-manager/shell.nix
@@ -1,4 +1,6 @@
-{nushell-scripts, ... }: {
+{inputs, ... }: let
+  nushell-scripts = inputs.nushell-scripts;
+in {
   programs.nushell = {
     enable = true;
     shellAliases = {
@@ -13,6 +15,7 @@
       # egpu = "(DRI_PRIME=pci-0000_05_00_0 glxinfo | grep 'OpenGL renderer')";
       # checkgpu = "(lspci | grep VGA)";
       cat = "bat -f # --paging never";
+      search = "nix search nixpkgs#";
     };
     configFile.source = ../../resources/nushell/config.nu;
     extraConfig = ''
@@ -24,6 +27,8 @@
       source ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu
       source ${nushell-scripts}/custom-completions/make/make-completions.nu
       source ${nushell-scripts}/custom-completions/git/git-completions.nu
+      use ${nushell-scripts}/themes/nu-themes/catppuccin-mocha.nu
+      $env.config = ($env.config | merge {color_config: (catppuccin-mocha)})
       '';
   };  
 }
diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix
index 12d6f6b..eafc03c 100644
--- a/modules/home-manager/starship.nix
+++ b/modules/home-manager/starship.nix
@@ -1,4 +1,4 @@
-{ catppuccin-starship, ... }: {
+{ inputs, ... }: {
   programs.starship = {
     enable = true;
    
@@ -6,6 +6,6 @@
       command_timeout = 1000;
 
       palette = "catppuccin_mocha";
-    } // builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml");
+    } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml");
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix
new file mode 100644
index 0000000..19cd171
--- /dev/null
+++ b/modules/home-manager/swayidle.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }: {
+  services.swayidle = {
+    enable = true;
+    systemdTarget = "hyprland-session.target";
+    timeouts = 
+      let
+        dpmsCommand = "${pkgs.hyprland}/bin/hyprctl dispatch dpms";
+        brightnessCommand = "${pkgs.brightnessctl}/bin/brightnessctl -s %% brightnessctl s";
+      in 
+      [
+        { #timeout 180
+          timeout = 3;
+          command = "${brightnessCommand} 15%";
+          resumeCommand = "brightnessctl -r";
+        }
+        {
+          #timeout 300
+          timeout = 5;
+          command = "${dpmsCommand} off && swaylock";
+          resumeCommand = "${dpmsCommand} on";
+        }
+        { #timeout 420
+          timeout = 7;
+          command = "${brightnessCommand} 0%";
+          resumeCommand = "brightnessctl -r";
+        }
+      ];
+    # events.before-sleep.event = "swaylock";
+  };
+}
diff --git a/modules/home-manager/swaylock.nix b/modules/home-manager/swaylock.nix
new file mode 100644
index 0000000..745d3ef
--- /dev/null
+++ b/modules/home-manager/swaylock.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+  programs.swaylock.enable = true;
+  programs.swaylock.package = pkgs.swaylock-effects;
+  programs.swaylock.settings = {
+    ignore-empty-password = true;
+    clock = true;
+    screenshots = true;
+    grace = 10;
+    indicator-radius = 100;
+    indicator-thickness = 7;
+    ring-color = "455a64";
+    key-hl-color = "be5046";
+    text-color = "ffc107";
+    line-color = 00000000;
+    inside-color = 00000088;
+    separator-color = 00000000;
+    fade-in = 4;
+    effect-blur = "7x3"; 
+    effect-scale = 2;
+    effect-vignette = "0.5:0.5";
+    # effect-compose = [ "0,1.5%;-1x10%;$HOME/.config/sway/lock.svg" "$@"  ];
+  };
+}
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
new file mode 100644
index 0000000..c35bc75
--- /dev/null
+++ b/modules/home-manager/waybar.nix
@@ -0,0 +1,136 @@
+{ config, ... }: {
+  programs.waybar = {
+    enable = true;
+    systemd.enable = true;
+    systemd.target = "hyprland-session.target";
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 40;
+        modules-left = [ "hyprland/workspaces" ];
+        modules-center = [ "clock" ];
+        modules-right = [ "idle_inhibitor" "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ];
+
+        "tray" = {
+          icon-size = 21;
+          spacing = 10;
+        };
+        "idle_inhibitor" = {
+          format = "{icon}";
+          format-icons = {
+            activated = "";
+            deactivated = "";
+          };
+        };     
+        "pulseaudio" = {
+          # // "scroll-step": 1, // %, can be a float
+          format = "{volume}% {icon} {format_source}";
+          format-bluetooth = "{volume}% {icon} {format_source}";
+          format-bluetooth-muted = " {icon} {format_source}";
+          format-muted = " {format_source}";
+          format-source = "{volume}% ";
+          format-source-muted = "";
+          "format-icons" = {
+            headphone = "";
+            hands-free = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [ "" "" "" ];
+          };
+          on-click = "pavucontrol";
+        };
+        "wireplumber" = {
+          on-click = "helvum";
+          max-volume = 150;
+          scroll-step = 0.2;
+
+          # format-bluetooth = "{volume}% {icon} {format_source}";
+          # format-bluetooth-muted = " {icon} {format_source}";
+          format-muted = " ";
+          format = "{volume}% {icon} ";
+          # format-source-muted = "";
+          format-icons = {
+            # headphone = "";
+            # hands-free = "";
+            # headset = "";
+            # phone = "";
+            # portable = "";
+            # car = "";
+            default = [ "" "" "" ];
+          };
+          # on-click = "pavucontrol"
+        };
+        "network" = {
+          format-wifi = "{essid} ({signalStrength}%) ";
+          format-ethernet = "{ipaddr}/{cidr} ";
+          tooltip-format = "{ifname} via {gwaddr} ";
+          format-linked = "{ifname} (No IP) ";
+          format-disconnected = "Disconnected ⚠";
+          format-alt = "{ifname}: {ipaddr}/{cidr}";
+        };
+        "backlight/slider" =  {
+          min = 1;
+          max = 100;
+          orientation = "horizontal";
+          # device = "intel_backlight";
+        };
+        "clock" = {
+            format = "{:%H:%M}  ";
+            format-alt = "{:%A, %B %d, %Y (%R)}  ";
+            # timezone = config.time.timeZone;
+            timezone = "US/Mountain";
+            tooltip-format = "<tt><small>{calendar}</small></tt>";
+          "calendar" = {
+            mode = "year";
+            mode-mon-col = 3;
+            weeks-pos = "right";
+            on-scroll = 1;
+            on-right-click = "mode";
+            "format" = {
+              months =     "<span color='#ffead3'><b>{}</b></span>";
+              days =       "<span color='#ecc6d9'><b>{}</b></span>";
+              weeks =      "<span color='#99ffdd'><b>W{}</b></span>";
+              weekdays =   "<span color='#ffcc66'><b>{}</b></span>";
+              today =      "<span color='#ff6699'><b><u>{}</u></b></span>";
+            };
+          };
+        };
+        "battery" = {
+          interval = 60;
+          states = {
+              "warning" = 30;
+              "critical" = 15;
+          };
+          format = "{capacity}% {icon}";
+          format-icons = [ "" "" "" "" "" ];
+          max-length = 25;
+        };
+        "cpu" = {
+          format = "{usage}% ";
+          tooltip = false;
+        };
+        "memory" = {
+          format = "{used:0.1f}G/{total:0.1f}G ";
+        };
+        "temperature" = {
+          format = "{temperatureC}°C ";
+        };
+        "keyboard-state" = {
+          numlock = true;
+          capslock = true;
+          "format" = {
+              numlock = "N {icon}";
+              # capslock =  "C {icon}";                                                                                                                                                       
+          };
+          "format-icons" = {
+              locked =  "";
+              unlocked =  "";
+          };
+        };
+      };
+    };
+  };  
+}
diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix
index f3314fc..261dd52 100644
--- a/modules/nixos/headscale.nix
+++ b/modules/nixos/headscale.nix
@@ -29,5 +29,6 @@ in {
   };
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
+  environment.systemPackages = [ config.services.headscale.package ];
 }
 
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 = [
diff --git a/modules/users/defin.nix b/modules/users/defin.nix
index 86fe112..cb3a919 100644
--- a/modules/users/defin.nix
+++ b/modules/users/defin.nix
@@ -14,12 +14,13 @@
 			openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmzvB5AfjjioiGywizWdBVsarvOSw4YGhgxhk8w34rZA4DghCXme8ILbkk4x4k+VTC6dPVKkvjPY1nn+qx1BtySSSj30Oez7iIqmMH2DvsQMa4zBPe6W4CUo76HrkqR4+rghto8fYZFCo6JhScUr48TvpGIEqsWRQxIGXvFpAazmu1OlsycWatruYwJby5wg2ZIEL9Ci0OHdwGfU1OTexY1Bl03s5Qr6dodvdwSc0ft6Qtv/ijy7iC3ySB2NhirUfDOtS8ysV3yhyxlcXgdI1vksZ6GIoB7TsfdcnpCMcOPSGvQLnAY4+5IDQElkC2igSBSiuUbqDbzNSRw+ctHsoqKAyjAob51XphVJh7CcgBkFufSTJLsOBhyyZSrEBlNB7AHJrFQSnoYYlFjILx4gfcqBxDMOSFL1CiarOq3oZ+udaX06uhIjVXzZhkggqxrCRRwOtPd6eKbuK+2oa0h93QtKQQhrwXCpbVRBe5V3u3i4I7xFFMpYJ3Kcteiua1qxKhF9RNP4zJPDzYyxfiDOWEbMxnyEwFENvVgkdPIaFSEtjvzmdEfWRJ9RBlS5H/7hr48Q1berhT8dMoB55xNiQhD2GTqWX81kzjSHzeeakXTzwmgJUhfbMP7E3ndSaeY0MW6U8MYF0f1ZfaL0jFMWo1G8bv2ptayMpykHdTWSXfpQ== defin@gpg"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKm9srflwzQ4CECjDj8Il1aRcnt2rFc4w6mSSMOYds3F defin@allseries"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKm9srflwzQ4CECjDj8Il1aRcnt2rFc4w6mSSMOYds3F defin@khad"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQqjxtw6iZbw5boN5rz+wH9A+0OyEP3YJoEgwdkF/Bp defin@khad"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxVpBnkWiukuHNt81K2gRNVjOdz9lFiaw0fhZ4CcB3R gitlab"
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD44/CafgJ4GbSwx1ZUQUTnHEi7SKltggN4k9I6ghiSUv8znYdzxa5nDZIF38DkNPG4YqBY2LX+i5XVfvc68P8hgiwCFISEa5orQhTusRAPxyrI8QC75Ez7so/WnRMCckIj/7JprLzo/v3NBieC1OoXiFUxoUhHwVll2siBhHYItzF6IkytKb0G5ZK3V0B6fetw3TY9pMEE1Tcr4VapFDj9neVJxYh1rKR8zjU24uSOWtW/+d4cZIfzVj2ZUS92IO/lwjtzeZwzr3TEkejSaQYZR/WF1oFUs2ZO4bwBn7cvgqHhXbkIKkLjDU8EdwdaOOyWJyZje5Hw96BSQSHuu214l4/lna1iQJpMzr5qESQ7hJqlUupkEiKbCmL0rjJobE84loENq41TBi8292Ve1jV8DWgQVo90rJ/SCcAJvIWQTYDkdEz2y+5NwhwS2T8Ew9h6vs2iN+pcL9PJxFaYcbiHnBj49Gh4J6ARyZtPMvCeI4n7CuJ8K2qjQV36Tt81krs= defin@doretta"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBrDUymBW+rosSI68sxDKLMfH7cOPPLG5K+CuA6aYcsp defin@bosco"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXrt3+N4+ahtXZCUn11evQsVGsGgAohGwafC29/a4fk defin@Radahn"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkGcmYIYCe6GHsZZvnXqsedF0wn+AhGSr+RPJtUO/kl defin@khad"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaMYXO9ghATyUPzyE7aD/XVVmK9UAexueoGEYAqPT4L defin@kebab"
       ];
     };
   };
diff --git a/modules/users/root.nix b/modules/users/root.nix
index 7fb9418..9464651 100644
--- a/modules/users/root.nix
+++ b/modules/users/root.nix
@@ -6,4 +6,5 @@
       hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0";
     };
   };
+  services.openssh.settings.PasswordAuthentication = false;
 }