diff --git a/flake.nix b/flake.nix index ba885f1..8559f43 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ mkSystem = pkgs: system: hostname: let hardwareConfig = { - "laptop" = "${inputs.nixos-hardware}.nixosModules.lenovo-thinkpad-x1-6th-gen"; + "laptop" = nixos-hardware.nixosModules.lenovo-thinkpad-x1-6th-gen; # Add other hostnames and their respective hardware configurations here }; in diff --git a/hosts/desktop/user.nix b/hosts/desktop/user.nix index 8db5f18..5b3df77 100644 --- a/hosts/desktop/user.nix +++ b/hosts/desktop/user.nix @@ -5,7 +5,6 @@ config.modules = { # gui firefox.enable = true; - foot.enable = true; eww.enable = true; dunst.enable = true; hyprland.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 4e52b9a..c6dde50 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,6 @@ imports = [ # gui ./firefox - ./foot ./eww ./dunst ./hyprland diff --git a/modules/eww/eww.yuck b/modules/eww/eww.yuck index 0b85bde..ec30798 100644 --- a/modules/eww/eww.yuck +++ b/modules/eww/eww.yuck @@ -223,7 +223,7 @@ (defwidget launch [] (button :class "reg-btn launchbutton" :hexpand true - :onclick "wofi --show run --xoffset=1670 --yoffset=12 --width=230px --height=984 --style=$HOME/.config/wofi.css --term=footclient --prompt=Run &" "") + :onclick "wofi --show run --xoffset=1670 --yoffset=12 --width=230px --height=984 --style=$HOME/.config/wofi.css --term=kittyclient --prompt=Run &" "") ) (defwidget powerbutton [] diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index f0edd2f..bda3854 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -2,7 +2,7 @@ monitor=eDP-1,1920x1080@60,0x0,1 monitor=eDP-1,addreserved,0,0,48,0 exec-once=swaybg -i $NIXOS_CONFIG_DIR/pics/wallpaper.png -exec-once=foot --server +exec-once=kitty --server exec-once=wlsunset -l -23 -L -46 exec-once=eww daemon exec-once=eww open bar @@ -48,7 +48,7 @@ dwindle { # example window rules # for windows named/classed as abc and xyz windowrule=float,move 0 0,pqiv -windowrule=float,foot-notes +windowrule=float,kitty-notes #windowrule=size 420 69,abc #windowrule=tile,xyz #windowrule=float,abc @@ -56,11 +56,10 @@ windowrule=float,foot-notes #windowrule=monitor 0,xyz # example binds -bind=ALT,Return,exec,footclient +bind=ALT,Return,exec,kittyclient bind=ALTSHIFT,Q,killactive, bind=ALT,V,togglefloating, -bind=ALT,R,exec,wofi --show run --xoffset=1670 --yoffset=12 --width=230px --height=984 --style=$HOME/.config/wofi.css --term=footclient --prompt=Run -bind=ALT,N,exec,cd ~/stuff/notes && footclient -a foot-notes sh -c "nvim ~/stuff/notes/$(date '+%Y-%m-%d').md" +bind=ALT,R,exec,wofi --show run --xoffset=1670 --yoffset=12 --width=230px --height=984 --style=$HOME/.config/wofi.css --term=kittyclient --prompt=Run bind=ALT,F,fullscreen,0 bind=ALT,h,movefocus,l diff --git a/modules/kitty/default.nix b/modules/kitty/default.nix index 4b9fde2..6d8ca8d 100644 --- a/modules/kitty/default.nix +++ b/modules/kitty/default.nix @@ -1,10 +1,10 @@ { pkgs, lib, config, ... }: with lib; -let cfg = config.modules.foot; +let cfg = config.modules.kitty; in { - options.modules.foot = { enable = mkEnableOption "foot"; }; + options.modules.kitty = { enable = mkEnableOption "kitty"; }; config = mkIf cfg.enable { programs.kitty = { enable = true;