diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 95573f1..5d68bfc 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -16,7 +16,6 @@ "adbusers" "kvm" "input" - "video" ]; shell = pkgs.zsh; autoSubUidGidRange = true; @@ -29,7 +28,6 @@ ./gnome.nix ./niri.nix ./ssh.nix - ./swaylock.nix ./vscode.nix ./waybar.nix ./zsh.nix diff --git a/home/vinzenz/niri.nix b/home/vinzenz/niri.nix index 57c30eb..b801c6b 100644 --- a/home/vinzenz/niri.nix +++ b/home/vinzenz/niri.nix @@ -1,16 +1,13 @@ -{ - pkgs, - lib, - devices, - config, - ... -}: +{ pkgs, ... }: { config = { home.sessionVariables.NIXOS_OZONE_WL = "1"; + home.packages = with pkgs; [ xwayland-satellite alacritty + fuzzel + swaylock ]; qt.style = { @@ -28,34 +25,7 @@ }; }; - programs.fuzzel = { - enable = true; - settings = { - main = { - terminal = "${pkgs.alacritty}/bin/alacritty"; - icon-theme = "Adwaita"; - counter = true; - font = "sans:size=10"; - }; - colors = { - border = "0003B3FF"; - background = "0F0F0FFF"; - text = "657b83ff"; - prompt = "586e75ff"; - placeholder = "93a1a1ff"; - input = "657b83ff"; - match = "cb4b16ff"; - selection = "eee8d5ff"; - selection-text = "586e75ff"; - selection-match = "cb4b16ff"; - counter = "93a1a1ff"; - }; - border = { - radius = 30; - width = 3; - }; - }; - }; + # services.swayidle.enable = true; programs.niri.settings = { input.keyboard.xkb.layout = "de"; @@ -82,12 +52,12 @@ # Mod-Shift-/, which is usually the same as Mod-?, # shows a list of important hotkeys. - "Mod+Shift+Numbersign".action.show-hotkey-overlay = { }; + "Mod+Shift+Slash".action.show-hotkey-overlay = { }; # Suggested binds for running programs: terminal, app launcher, screen locker. "Mod+T".action.spawn = "alacritty"; "Mod+D".action.spawn = "fuzzel"; - "Super+Alt+L".action.spawn = "${config.programs.swaylock.package}/bin/swaylock"; + "Super+Alt+L".action.spawn = "swaylock"; # You can also use a shell. Do this if you need pipes, multiple commands, etc. # Note: the entire command goes as a single argument in the end. diff --git a/home/vinzenz/swaylock.nix b/home/vinzenz/swaylock.nix deleted file mode 100644 index 291a90c..0000000 --- a/home/vinzenz/swaylock.nix +++ /dev/null @@ -1,40 +0,0 @@ -# based on https://codeberg.org/kiara/cfg/src/commit/b9c472acd78c9c08dfe8b6a643c5c82cc5828433/home-manager/kiara/swaylock.nix# -{ pkgs, config, ... }: -{ - config = { - programs.swaylock = { - enable = true; - package = pkgs.swaylock-effects; - # https://github.com/jirutka/swaylock-effects/blob/master/swaylock.1.scd - settings = { - screenshot = true; - effect-blur = "9x9"; - effect-vignette = "0.2:0.2"; - fade-in = 0.5; - font-size = 75; - indicator-caps-lock = true; - clock = true; - indicator-radius = 400; - show-failed-attempts = true; - ignore-empty-password = true; - grace = 2; - color = "000000"; - indicator-thickness = 20; - }; - }; - - services.swayidle = { - enable = true; - timeouts = [ - { - timeout = 60; - command = "${config.programs.swaylock.package}/bin/swaylock"; - } - #{ - # timeout = 90; - # command = "${pkgs.systemd}/bin/systemctl suspend"; - #} - ]; - }; - }; -} diff --git a/home/vinzenz/waybar.nix b/home/vinzenz/waybar.nix index a3797cf..145e15a 100644 --- a/home/vinzenz/waybar.nix +++ b/home/vinzenz/waybar.nix @@ -1,19 +1,14 @@ -{ - pkgs, - device, - config, - ... -}: +{ pkgs, device, ... }: { home.packages = with pkgs; [ waybar playerctl - cava ]; + programs.cava.enable = true; + programs.waybar = { enable = true; - systemd.enable = true; settings = { mainBar = { layer = "top"; @@ -111,8 +106,6 @@ backlight = { device = "intel_backlight"; format = "{percent}% "; - on-scroll-down = "light -U 1"; - on-scroll-up = "light -A 1"; }; cpu = { interval = 1; diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix index 5ec706e..5267e89 100644 --- a/hosts/vinzenz-lpt2/configuration.nix +++ b/hosts/vinzenz-lpt2/configuration.nix @@ -27,15 +27,6 @@ # ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' #]; - programs = { - adb.enable = true; - light = { - enable = true; - brightnessKeys = { - enable = true; - step = 5; - }; - }; - }; + programs.adb.enable = true; }; } diff --git a/modules/globalinstalls.nix b/modules/globalinstalls.nix index c4c21d2..9afad7d 100644 --- a/modules/globalinstalls.nix +++ b/modules/globalinstalls.nix @@ -15,8 +15,6 @@ tldr neofetch - - nix-output-monitor ]; };