From c9c0a376dba5d734602d920aeb09b50141b5c617 Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 16 Aug 2023 12:57:53 +0900 Subject: [PATCH] Add more hyprland configs and weechat / matrix support --- README.md | 10 +-- desktops/common.nix | 1 + desktops/hyprland.nix | 81 ++++++++++--------- .../home-manager/hyprland-conf.nix | 28 ++++--- software/weechat.nix | 6 ++ 5 files changed, 71 insertions(+), 55 deletions(-) create mode 100644 software/weechat.nix diff --git a/README.md b/README.md index d1c2f128..3e72c24e 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # NixOS Configuration Repository +## NOTE: These configs expect this repo to be cloned to /etc/nixos/git/ Repo for nix configuration files -## Gruv all the things + --- # To Do List -* [x] tmux config / theming - * Not using tmux * [ ] regreet config / theming - Icons still broken for some reason * Possibly switch to tuigreet and gruv it * [ ] mako config / theming * [ ] waybar config / theming * [ ] hyprland config / theming + * Try `libinput-gestores` for gesture control of Hyprland - [Link](https://github.com/bulletmark/libinput-gestures) * [x] powerline config / theming * [x] neofetch config / theming * [x] kitty config / theming @@ -18,15 +18,15 @@ Repo for nix configuration files * [x] nvidia drivers * [ ] WINE configurations * [x] btop config / theming -* [ ] other things I'm probably forgetting -* [ ] See if it's possible to configure the fingerprint reader * [ ] swaylock config / theming +* [ ] vscodium and user-config.js file? * [ ] Get function keys working (sound, brightness, etc) * [ ] rofi - bitwarden-cli / bitwarden-menu ([Link](https://search.nixos.org/packages?channel=23.05&show=bitwarden-menu&from=0&size=50&sort=relevance&type=packages&query=bitwarden)) * [ ] Try and submit this as a nixpkg - [Link](https://github.com/SylEleuth/gruvbox-plus-icon-pack) * [x] Possibly move away from powerline-go - I want something simpler * Staying with powerline-go, just editing the config in `home-manager/bash.nix` * [ ] Set up the fingerprint reader - [Link](https://www.makeuseof.com/set-up-fingerprint-scanner-with-pam-on-linux/) +* [ ] sublime music config / theming / integration - [Link](https://docs.sublimemusic.app/) --- diff --git a/desktops/common.nix b/desktops/common.nix index ab4ce115..b1628411 100644 --- a/desktops/common.nix +++ b/desktops/common.nix @@ -13,5 +13,6 @@ imports = [ # Software configurations ../software/firefox.nix + ../software/weechat.nix ]; } \ No newline at end of file diff --git a/desktops/hyprland.nix b/desktops/hyprland.nix index 326ec05e..3e221bd4 100644 --- a/desktops/hyprland.nix +++ b/desktops/hyprland.nix @@ -2,52 +2,53 @@ services.xserver.videoDrivers = ["nvidia"]; # Greeter, for when you start the computer - # programs.regreet = { - # enable = true; - # # https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml - # settings = { - # background = { - # path = "/etc/nixos/git/desktops/wallpapers/gruvbox/wallpaper3.jpg"; - # fit = "Cover"; - # }; - # GTK = { - # application_prefer_dark_theme = true; - # cursor_theme_name = "Adwaita"; - # font_name = "Cantarell 16"; - # icon_theme_name = "Papirus-Dark"; - # theme_name = "Gruvbox-Dark-BL"; - # }; - # commands = { - # reboot = [ "systemctl" "reboot" ]; - # poweroff = [ "systemctl" "poweroff" ]; - # }; - # }; - # extraCss = '' - # #background { - # filter: blur(20px); - # blur: 20px; - # } - # #user_toggle { - # visibility: none; - # } - # #sess_toggle { - # visibility: none; - # } - # ''; - # }; - - # tuigreet - services.greetd = { + programs.regreet = { enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; - user = "greeter"; + # https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml + settings = { + background = { + path = "/etc/nixos/git/desktops/wallpapers/gruvbox/wallpaper3.jpg"; + fit = "Cover"; + }; + GTK = { + application_prefer_dark_theme = true; + cursor_theme_name = "Adwaita"; + font_name = "Cantarell 16"; + icon_theme_name = "Papirus-Dark"; + theme_name = "Gruvbox-Dark-BL"; + }; + commands = { + reboot = [ "systemctl" "reboot" ]; + poweroff = [ "systemctl" "poweroff" ]; }; }; + extraCss = '' + #background { + filter: blur(20px); + blur: 20px; + } + #user_toggle { + visibility: none; + } + #sess_toggle { + visibility: none; + } + ''; }; + # tuigreet + # services.greetd = { + # enable = true; + # settings = { + # default_session = { + # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; + # user = "greeter"; + # }; + # }; + # }; + # Brightness and volume control + # https://haikarainen.github.io/light/ programs.light.enable = true; # Enabling hyprlnd on NixOS diff --git a/hosts/nixos-laptop/home-manager/hyprland-conf.nix b/hosts/nixos-laptop/home-manager/hyprland-conf.nix index 74e007c8..520f8a7c 100644 --- a/hosts/nixos-laptop/home-manager/hyprland-conf.nix +++ b/hosts/nixos-laptop/home-manager/hyprland-conf.nix @@ -130,16 +130,11 @@ bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle - # Custom keybinds - bind = $mainMod, S, exec, rofi -show drun -show-icons - bind = $mainMod, SPACE, exec, rofi -show drun -show-icons - bind =,Print,exec,grim - # Move focus with mainMod + arrow keys - bind = $mainMod, left, movefocus, l - bind = $mainMod, right, movefocus, r - bind = $mainMod, up, movefocus, u - bind = $mainMod, down, movefocus, d + # bind = $mainMod, left, movefocus, l + # bind = $mainMod, right, movefocus, r + # bind = $mainMod, up, movefocus, u + # bind = $mainMod, down, movefocus, d # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 @@ -172,6 +167,19 @@ # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + # Testing... Move without holding the mainMod button? + + ############################################################################# + # Custom keybinds + # Show Rofi on SUPER-S + bind = $mainMod, S, exec, rofi -show drun -show-icons + # Show Rofi on SUPER-SPACE + bind = $mainMod SPACE, , exec, rofi -show drun -show-icons + # Take a screenshot with the Print key + bind =,Print,exec,grim + # Move to the previous / next workspace with SUPER-LEFT and SUPER-RIGHT + bind = $mainMod, right workspace, e+1 + bind = $mainMod, left, workspace, e-1 # Start the config: exec-once=bash ~/.config/hypr/start.sh @@ -183,7 +191,7 @@ executable = true; text = '' #!/usr/bin/env bash - swwww init & + swww init & swww img /etc/nixos/git/desktops/wallpapers/gruvbox/wallpaper3.jpg & nm-applet --indicator & waybar & diff --git a/software/weechat.nix b/software/weechat.nix new file mode 100644 index 00000000..d0555278 --- /dev/null +++ b/software/weechat.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: { + environment.systemPackages = with pkgs; [ + weechat + weechatScripts.weechat-matrix + ]; +} \ No newline at end of file