diff --git a/README.md b/README.md index 64ffe91..24b00d8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ what is currently not working: - gdm thinks i tried to login when pressing on the user what i want to do: -- split up configs well - learn flakes -- give more stuff over to home-manager + +# Docs + +Since I use my laptop with one user, I symlinked the configs to my home directory following the tutorial [here](https://nixos.wiki/wiki/NixOS_configuration_editors) diff --git a/configs/hypr/main.conf b/configs/hypr/main.conf index c6061a8..6798849 100644 --- a/configs/hypr/main.conf +++ b/configs/hypr/main.conf @@ -32,7 +32,6 @@ exec-once = squeekboard exec-once = $menu exec-once = hyprpaper -exec-once = $HYPR_PATH/lose-focus.sh # after boot, there are 2 bars for some reason, so I kill them and rerun the command exec-once = bash -c "killall -r -0 waybar && killall -r waybar; waybar" @@ -60,7 +59,7 @@ input { follow_mouse = 1 touchpad { - natural_scroll = no + natural_scroll = yes } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. @@ -155,10 +154,6 @@ windowrule = float,title:^(Open File)$ windowrule = pin,^(nm-tray)$ #windowrule = move cursor 0 -35,^(nm-tray)$ -windowrule = float,^(.blueman-manager-wrapped)$ -windowrule = move cursor 0 0,^(.blueman-manager-wrapped)$ -windowrule = size 400 581,^(.blueman-manager-wrapped)$ - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix index ea1fa0f..283b31e 100644 --- a/nixos/home/dotfiles.nix +++ b/nixos/home/dotfiles.nix @@ -5,48 +5,68 @@ let in { - programs.eww = { - enable = true; - configDir = "${configDir}/eww"; # see hyprland.nix for scripts path - package = - (builtins.getFlake "github:matt1432/eww-exclusiver").packages.x86_64-linux.default; - }; - - programs.alacritty = { - enable = true; - settings = { - env = { - POKE = "true"; - }; - - window = { - padding = { - x = 0; - y = 10; - }; - - opacity = 0.8; - }; - + programs = { + fzf = { + enable = true; + enableBashIntegration = true; colors = { - primary = { - background = "0x0c0c0c"; - foreground = "0xfcfcfc"; + fg = "ffffff"; + bg = "4b5263"; + hl = "d858fe"; + "fg+" = "#ffffff"; + "bg+" = "#4b5263"; + "hl+" = "#d858fe"; + info = "#98c379"; + prompt = "#61afef"; + pointer = "#be5046"; + marker = "#e5c07b"; + spinner = "#61afef"; + header = "#61afef"; + }; + }; - dim_foreground = "0xeff0f1"; - bright_foreground = "0xffffff"; - dim_background = "0x31363b"; - bright_background = "0x000000"; + eww = { + enable = true; + configDir = "${configDir}/eww"; # see hyprland.nix for scripts path + package = (builtins.getFlake "github:matt1432/eww-exclusiver").packages.x86_64-linux.default; + }; + + alacritty = { + enable = true; + settings = { + env = { + POKE = "true"; }; - normal = { - black = "0x232627"; - red = "0xed1515"; - green = "0x11d116"; - yellow = "0xf67400"; - blue = "0x1d99f3"; - magenta = "0x9b59b6"; - cyan = "0x1abc9c"; - white = "0xfcfcfc"; + + window = { + padding = { + x = 0; + y = 10; + }; + + opacity = 0.8; + }; + + colors = { + primary = { + background = "0x0c0c0c"; + foreground = "0xfcfcfc"; + + dim_foreground = "0xeff0f1"; + bright_foreground = "0xffffff"; + dim_background = "0x31363b"; + bright_background = "0x000000"; + }; + normal = { + black = "0x232627"; + red = "0xed1515"; + green = "0x11d116"; + yellow = "0xf67400"; + blue = "0x1d99f3"; + magenta = "0x9b59b6"; + cyan = "0x1abc9c"; + white = "0xfcfcfc"; + }; }; }; }; diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix index 8a8a9f3..bc6ca29 100644 --- a/nixos/home/packages.nix +++ b/nixos/home/packages.nix @@ -1,13 +1,19 @@ { pkgs, ... }: { - programs.waybar = { - enable = true; - package = pkgs.waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }); + programs = { + btop = { + enable = true; + }; + + waybar = { + enable = true; + package = pkgs.waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + }); + }; }; - + home.packages = with pkgs; (with xorg; [ xcursorthemes