From 917f97a99c05884d301559a2a1d62e6351f8585c Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 31 Mar 2023 15:43:30 +1100 Subject: [PATCH] reup --- home/bolt.nix | 4 +++- home/dots/hyprland/hyprland.conf | 3 ++- home/dots/wlogout/layout | 24 ++++++++++++++++++------ home/home.nix | 17 +++++------------ system/configuration.nix | 27 +-------------------------- system/quiver.nix | 1 - 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/home/bolt.nix b/home/bolt.nix index a3bd4f1..33d1274 100755 --- a/home/bolt.nix +++ b/home/bolt.nix @@ -7,6 +7,7 @@ let src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz"; }).defaultNix; + wlogout_style_base = dots/wlogout/style.css; wlogout_style = pkgs.runCommandLocal "wlogout_style_base" {wlogpath = lib.strings.escape ["/"] "${pkgs.wlogout}";} '' cp ${wlogout_style_base} $out @@ -19,7 +20,6 @@ in { imports = [ hyprland.homeManagerModules.default ../foreign/dotfiles/home/programs/eww/default.nix - ../foreign/dotfiles/modules/regreet.nix ]; nixpkgs.overlays = [ @@ -35,6 +35,7 @@ in { colors = builtins.readFile dots/eww/colors.scss; }; + home.username = "bolt"; home.homeDirectory = "/home/bolt"; @@ -56,6 +57,7 @@ in { swayidle swaynotificationcenter swayosd + waylock playerctl ]; diff --git a/home/dots/hyprland/hyprland.conf b/home/dots/hyprland/hyprland.conf index a3d7b7f..a442607 100644 --- a/home/dots/hyprland/hyprland.conf +++ b/home/dots/hyprland/hyprland.conf @@ -1,5 +1,6 @@ exec-once = eww open bar -exec-once = swayidle -w timeout 600 'systemctl suspend' after-resume 'hyprctl dispatch dpms on && eww open bar' +exec-once = swayidle -w timeout 300 'waylock' +exec-once = swayidle -w timeout 600 'systemctl suspend' after-resume 'eww open bar' exec-once = ckb-next -c -b exec-once = swaybg -i $HOME/Downloads/fantastyland-dark.png -m fill exec-once = xrdb -l ~/.Xresources diff --git a/home/dots/wlogout/layout b/home/dots/wlogout/layout index d916b06..9d7a31e 100644 --- a/home/dots/wlogout/layout +++ b/home/dots/wlogout/layout @@ -1,24 +1,36 @@ { +"label" : "lock", +"action" : "waylock", +"text" : "Lock", +"keybind" : "l" +} +{ "label" : "logout", "action" : "loginctl terminate-user $USER", "text" : "Logout", "keybind" : "e" } -{ - "label" : "shutdown", - "action" : "systemctl poweroff", - "text" : "Shutdown", - "keybind" : "d" -} { "label" : "suspend", "action" : "systemctl suspend", "text" : "Suspend", "keybind" : "s" } +{ + "label" : "shutdown", + "action" : "systemctl poweroff", + "text" : "Shutdown", + "keybind" : "d" +} { "label" : "reboot", "action" : "systemctl reboot", "text" : "Reboot", "keybind" : "r" } +{ + "label" : "hibernate", + "action" : "systemctl hibernate", + "text" : "Hibernate", + "keybind" : "h" +} diff --git a/home/home.nix b/home/home.nix index 86020a7..1b64720 100755 --- a/home/home.nix +++ b/home/home.nix @@ -42,7 +42,7 @@ in lazygit fzf - # kdeconnect # maybe once i get an android + kdeconnect keepassxc direnv @@ -54,19 +54,12 @@ in meslo-lgs-nf # libreoffice-qt - - libsForQt5.ark libsForQt5.qtstyleplugin-kvantum - libsForQt5.bismuth - gtk-engine-murrine - plasma-browser-integration - (callPackage ./homepkgs/git-credential-keepassxc.nix { }) (callPackage ./homepkgs/culr.nix { }) - # (callPackage ./homepkgs/glpaper.nix { }) ]; @@ -165,10 +158,10 @@ in enable = true; }; - services.kdeconnect = { - enable = true; - indicator = true; - }; + # services.kdeconnect = { + # enable = true; + # indicator = true; + # }; programs.kitty = { enable = true; diff --git a/system/configuration.nix b/system/configuration.nix index 77d2f7d..71bd4b0 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -41,6 +41,7 @@ LIBVA_DRIVER_NAME = "nvidia"; __GL_GSYNC_ALLOWED = "1"; __GL_VRR_ALLOWED = "1"; + EDITOR = "hx"; }; environment.pathsToLink = [ "/share/zsh" ]; @@ -75,41 +76,20 @@ services.xserver.xkbOptions = "caps:escape"; services.xserver.layout = "us"; services.xserver.libinput.enable = true; - # kde time - services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.lightdm.enable = false; # gets installed by default.. - # services.xserver.displayManager.sddm = { - # enable = true; - # theme = "${(pkgs.fetchFromGitHub { - # owner = "EricKotato"; - # repo = "sddm-slice"; - # rev = "763b8f4e01c00c1f8590fc7a103e14f6e8449443"; - # sha256 = "sha256-UW53ZdKb3RSrrcZ9GxZsJyjzS/uKR8lkaLLyi+2o27U="; - # })}"; - # autoNumlock = true; - # settings = { - # General = { - # InputMethod = ""; - # }; - # }; - # }; services.greetd = { enable = true; settings = { default_session = { command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions"; - # export SESSION_DIRS=${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions; - # command = "${pkgs.greetd.regreet}/bin/regreet -l off"; user = "greeter"; }; }; }; - security.polkit.enable = true; - services.xserver.desktopManager.plasma5.runUsingSystemd = true; programs.dconf.enable = true; xdg.autostart.enable = true; @@ -131,7 +111,6 @@ # jack.enable = true; }; - # gtk compatibility qt.enable = true; qt.style = "kvantum"; qt.platformTheme = "qt5ct"; @@ -162,10 +141,6 @@ nix-index comma - river - - - ]; networking.wg-quick.interfaces = { diff --git a/system/quiver.nix b/system/quiver.nix index f821834..6543b23 100755 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -126,7 +126,6 @@ in { # }; }; extraPortals = with pkgs; [ - xdg-desktop-portal-kde xdg-desktop-portal-gtk ]; };