From 5f89becff7cf8f4fd83e069459f6b8b5d773b956 Mon Sep 17 00:00:00 2001 From: spl3g Date: Fri, 8 Mar 2024 16:26:58 +0300 Subject: thats a lot of deletions --- home-manager/general/default.nix | 39 +++---- .../general/programs/alacritty/default.nix | 4 +- home-manager/general/programs/emacs/default.nix | 121 +++------------------ home-manager/general/programs/emacs/early-init.el | 1 + home-manager/general/programs/firefox/default.nix | 2 +- home-manager/general/themes/default.nix | 5 +- home-manager/laptop/default.nix | 6 +- home-manager/laptop/hyprland/default.nix | 42 ++++++- home-manager/laptop/hyprland/hyprland.conf | 46 ++++---- 9 files changed, 101 insertions(+), 165 deletions(-) (limited to 'home-manager') diff --git a/home-manager/general/default.nix b/home-manager/general/default.nix index da62eec..d10dc77 100644 --- a/home-manager/general/default.nix +++ b/home-manager/general/default.nix @@ -1,41 +1,31 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: let username = "jerpo"; homeDirectory = "/home/${username}"; configHome = "${homeDirectory}/.config"; cliPkgs = with pkgs; [ - fd - tldr - wget - btop - # jq - bat - fzf - nix-prefetch-scripts - steam-run - unzip - ghostscript - xdragon + fd fh tldr + wget btop jq + bat fzf nix-prefetch-scripts + steam-run unzip ghostscript + xdragon python311 ripgrep + gcc pkg-config ]; gamingPkgs = with pkgs; [ - vkd3d - mangohud - gamemode - bottles - steam + vkd3d mangohud gamemode + bottles steam ]; - guiPkgs = with pkgs; [ - libreoffice-fresh + guiPkgs = with pkgs; [ + vesktop libreoffice-fresh pokemon-colorscripts telegram-desktop transmission-gtk osu-lazer-bin + brave bruno ]; - imports = builtins.concatMap import [ - ./programs - ] ++ [ ./themes ]; + imports = builtins.concatMap import [ ./programs ] ++ [ ./themes ]; in { inherit imports; @@ -43,7 +33,7 @@ in home = { inherit username homeDirectory; stateVersion = "23.05"; - packages = guiPkgs ++ gamingPkgs ++ cliPkgs ++ fonts; + packages = guiPkgs ++ gamingPkgs ++ cliPkgs; }; xdg = { @@ -52,5 +42,4 @@ in }; programs.home-manager.enable = true; - } diff --git a/home-manager/general/programs/alacritty/default.nix b/home-manager/general/programs/alacritty/default.nix index 930952d..7328fa7 100644 --- a/home-manager/general/programs/alacritty/default.nix +++ b/home-manager/general/programs/alacritty/default.nix @@ -5,10 +5,10 @@ programs.alacritty = { enable = true; settings = { - import = [ "${pkgs.alacritty-theme}/catppuccin_macchiato.yaml" ]; + import = [ "${pkgs.alacritty-theme}/catppuccin_macchiato.toml" ]; font = { normal = { - family = "Source Code Pro"; + family = "Sauce Code Pro Nerd Font"; style = "Medium"; }; size = 11.5; diff --git a/home-manager/general/programs/emacs/default.nix b/home-manager/general/programs/emacs/default.nix index 7b61850..db90f2c 100644 --- a/home-manager/general/programs/emacs/default.nix +++ b/home-manager/general/programs/emacs/default.nix @@ -1,116 +1,23 @@ { pkgs, ... }: -let - pkgsForEmacs = with pkgs; [ + +{ + services.emacs = { + enable = true; + package = pkgs.emacs29-pgtk; + }; + + programs.emacs = { + enable = true; + package = pkgs.emacs29-pgtk; + }; + home.packages = with pkgs; with python311Packages; [ tree-sitter emacs-all-the-icons-fonts libappindicator poppler_utils - nil - nodejs + emacs-lsp-booster + nixd ]; - - pkgsUsePackage = with pkgs; [ - (pkgs.emacsWithPackagesFromUsePackage { - package = pkgs.emacs29-pgtk; - config = ./init.el; - alwaysEnsure = true; - # TODO - # with next flake update delete this, if mood-line hash changes: - # "commit": "10b5195f1b400d64d646f73a21bf5469612a375b", - # "sha256": "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0", - override = final: prev: { - mood-line = prev.melpaPackages.mood-line.overrideAttrs(old: { - src = pkgs.fetchgit { - url = "https://gitlab.com/jessieh/mood-line"; - sha256 = "00vbv40x04g5f9n8i1ylhawslf42fsz0046r3srs4ss6pq8s893r"; - rev = "10b5195f1b400d64d646f73a21bf5469612a375b"; - }; - }); - }; - extraEmacsPackages = epkgs: [ - epkgs.use-package - # (epkgs.melpaBuild rec { - # pname = "codeium"; - # version = "1.2.102"; - - # src = fetchFromGitHub { - # owner = "Exafunction"; - # repo = "codeium.el"; - # rev = "1.4.4"; - # sha256 = "1jjix7fn73ihjnhfivf72wris72f4kwf7xb6k5hxs41fm4kr9hdd"; - # }; - - # commit = "ddc9927ea231ecc5a32f7c9905f92fdfb7912e75"; - - # recipe = writeText "recipe" '' - # (codeium - # :repo "${src.owner}/${src.repo}" - # :fetcher github) - # ''; - # }) - # (epkgs.melpaBuild rec { - # pname = "telega"; - # version = "0.8.216"; - # src = fetchFromGitHub { - # owner = "zevlg"; - # repo = "telega.el"; - # rev = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a"; - # sha256 = "05xrm86gp185mgwb62w720hcbn87salk8z0whq6zf2r2f24l6xbw"; - # }; - # commit = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a"; - # recipe = writeText "recipe" '' - # (telega :fetcher github - # :repo "zevlg/telega.el" - # :files (:defaults "etc" "server" "contrib" "Makefile")) - # ''; - # }) - # (epkgs.melpaBuild rec { - # pname = "orgnote"; - # version = "0.7.17"; - - # src = fetchFromGitHub { - # owner = "Artawower"; - # repo = "orgnote.el"; - # rev = "v${version}"; - # sha256 = "1lrj47h244z4dqq2wyhpww7p3b4sy6bayk8lwlka517lhbcdgh33"; - # }; - - # commit = "ccc40cc346ebf5a6e6a55e3d4a147f0230337350"; - - # recipe = writeText "recipe" '' - # (orgnote - # :repo "${src.owner}/${src.repo}" - # :fetcher github) - # ''; - # }) - (epkgs.melpaBuild rec { - pname = "copilot"; - version = "20231219"; - - src = fetchFromGitHub { - owner = "zerolfx"; - repo = "copilot.el"; - rev = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; - sha256 = "1bn2im5ybzmwbwbi7v39s0qzmca5isp7zb0ls61y6sramh6k8fsg"; - }; - - packageRequires = with epkgs; [ editorconfig dash s ]; - - commit = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; - - recipe = writeText "recipe" '' - (copilot - :repo "${src.owner}/${src.repo}" - :fetcher github - :files ("*.el" "dist")) - ''; - }) - ]; - }) - ]; -in -{ - home.packages = pkgsForEmacs ++ pkgsUsePackage; xdg.configFile = { # "emacs/init.el".text = builtins.readFile ./init.el; "emacs/early-init.el".text = builtins.readFile ./early-init.el; diff --git a/home-manager/general/programs/emacs/early-init.el b/home-manager/general/programs/emacs/early-init.el index 46ead1f..c767bdc 100644 --- a/home-manager/general/programs/emacs/early-init.el +++ b/home-manager/general/programs/emacs/early-init.el @@ -1,4 +1,5 @@ (setq package-enable-at-startup nil) +(setenv "LSP_USE_PLISTS" "true") (menu-bar-mode -1) (tool-bar-mode -1) (scroll-bar-mode -1) diff --git a/home-manager/general/programs/firefox/default.nix b/home-manager/general/programs/firefox/default.nix index b08ae0c..be72299 100644 --- a/home-manager/general/programs/firefox/default.nix +++ b/home-manager/general/programs/firefox/default.nix @@ -88,7 +88,7 @@ let in { programs.firefox = { - enable = true; + enable = false; profiles.nothing = { isDefault = false; id = 1; diff --git a/home-manager/general/themes/default.nix b/home-manager/general/themes/default.nix index 5a1b7f4..9d88a41 100644 --- a/home-manager/general/themes/default.nix +++ b/home-manager/general/themes/default.nix @@ -21,7 +21,7 @@ in }; iconTheme = { package = pkgs.rose-pine-icon-theme; - name = "oomox-rose-pine-moon"; + name = "Rose-pine-moon"; }; gtk4.extraCss = builtins.readFile ./Catppuccin/gtk.css; }; @@ -39,4 +39,7 @@ in enable = true; platformTheme = "gtk"; }; + home.packages = with pkgs; [ + gnome.adwaita-icon-theme + ]; } diff --git a/home-manager/laptop/default.nix b/home-manager/laptop/default.nix index 66aa183..788da67 100644 --- a/home-manager/laptop/default.nix +++ b/home-manager/laptop/default.nix @@ -3,12 +3,10 @@ let imports = builtins.concatMap import [ ./programs ./services - ] ++ nonListImports; - nonListImports = [ - inputs.hyprland.homeManagerModules.default - inputs.ags.homeManagerModules.default + ] ++ [ ./hyprland ../general + inputs.hyprland.homeManagerModules.default ]; in { diff --git a/home-manager/laptop/hyprland/default.nix b/home-manager/laptop/hyprland/default.nix index 9f911e1..5b10c11 100644 --- a/home-manager/laptop/hyprland/default.nix +++ b/home-manager/laptop/hyprland/default.nix @@ -14,14 +14,50 @@ in home.packages = with pkgs; [ swww brightnessctl - slurp - grim + grimblast cliphist - xdg-desktop-portal-hyprland + polkit_gnome + xwaylandvideobridge ]; + + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + ]; + configPackages = with pkgs; [ + xdg-desktop-portal-hyprland + ]; + }; + + programs.fish.loginShellInit = "Hyprland"; + wayland.windowManager.hyprland = { enable = true; package = pkgs.hyprland; inherit extraConfig; }; + + programs.swaylock = { + enable = true; + package = pkgs.swaylock-effects; + settings = { + indicator-radius = 100; + ring-color = "000000ff"; + layout-bg-color = "000000ff"; + key-hl-color = "e0c69fff"; + inside-color = "000000ff"; + layout-border-color = "e0c69fff"; + line-color = "ffffffff"; + separator-color = "000000ff"; + ring-ver-color = "000000ff"; + line-ver-color = "000000ff"; + inside-ver-color = "ffffff00"; + text-ver-color = "e0c69fff"; + inside-wrong-color = "ffffff00"; + text-wrong-color = "e0c69fff"; + ring-wrong-color = "762f20ff"; + fade-in = 1; + }; + }; } diff --git a/home-manager/laptop/hyprland/hyprland.conf b/home-manager/laptop/hyprland/hyprland.conf index 81ef9eb..e60503a 100644 --- a/home-manager/laptop/hyprland/hyprland.conf +++ b/home-manager/laptop/hyprland/hyprland.conf @@ -1,7 +1,7 @@ -monitor=,preferred,auto,1 +monitor=,preferred,auto,1,mirror,eDP-1 # Execute your favorite apps at launch -exec-once = waybar & swww init +exec-once = swww init # Set programs that you use $terminal = alacritty @@ -11,12 +11,6 @@ $scripts=~/.config/hypr/scripts # Some default env vars. env = XCURSOR_SIZE,18 -env = QT_QPA_PLATFORMTHEME, gtk3 -env = QT_STYLE_OVERRIDE, gtk2 -env = QT_QPA_PLATFORM, wayland -env = TERMINAL, "alacritty" -env = BROWSER, "firefox" - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { @@ -30,7 +24,7 @@ input { touchpad { natural_scroll = yes - # disable_while_typing = no + disable_while_typing = no } sensitivity = 0.1 # -1.0 - 1.0, 0 means no modification. @@ -109,9 +103,17 @@ windowrulev2 = noborder, title:^(Firefox — Sharing Indicator)$ windowrulev2 = rounding 0, title:^(Firefox — Sharing Indicator)$ windowrulev2 = float, title:^(firefox)$, title:^(Picture-in-Picture)$ windowrulev2 = pin, title:^(firefox)$, title:^(Picture-in-Picture)$ +windowrulev2 = float, title:^(Save File)$ +windowrulev2 = pin, title:^(Save File)$ +windowrulev2 = float, title:^(Torrent Options)$ +windowrulev2 = pin, title:^(Torrent Options)$ +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ layerrule = blur, waybar - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -128,28 +130,28 @@ bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, E, exit, # Apps -bind = $mainMod, B, exec, firefox +bind = $mainMod, B, exec, brave --enable-features=TouchpadOverscrollHistoryNavigation bind = $mainMod, T, exec, telegram-desktop bind = $mainMod, E, exec, emacsclient -c -a "emacs" bind = $mainMod CONTROL, E, exec, emacs # Screenshooting -bind = , Print, exec, $scripts/hshot -m -bind = ALT, Print, exec, $scripts/hshot -w -bind = SHIFT, Print, exec, $scripts/hshot -s -bind = CONTROL, Print, exec, $scripts/hshot -m -c -bind = ALT_CONTROL, Print, exec, $scripts/hshot -w -c -bind = CONTROL_SHIFT, Print, exec, $scripts/hshot -s -c +bind = , Print, exec, grimblast save screen +bind = ALT, Print, exec, grimblast save active +bind = SHIFT, Print, exec, grimblast save area +bind = CONTROL, Print, exec, grimblast copy screen +bind = ALT_CONTROL, Print, exec, grimblast copy active +bind = CONTROL_SHIFT, Print, exec, grimblast copy area # Volume -$volDev = wpctl status | grep '*' -m 1 | awk '{print $3 - 0}' | xargs -I _ -bind = ,0x1008FF11,exec,$volDev wpctl set-volume _ 5%- -bind = ,0x1008FF13,exec,$volDev wpctl set-volume _ 5%+ -bind = ,0x1008FF12,exec,$volDev wpctl set-mute _ toggle +bind = ,0x1008FF11,exec,wpctl set-volume @DEFAULT_SINK@ 5%- +bind = ,0x1008FF13,exec,wpctl set-volume @DEFAULT_SINK@ 5%+ +bind = ,0x1008FF12,exec,wpctl set-mute @DEFAULT_SINK@ toggle +bind = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle # Brightness bind = ,XF86MonBrightnessUp,exec,brightnessctl s +5% -bind = ,0x1008FF03,exec,brightnessctl s 5%- +bind = ,XF86MonBrightnessDown,exec,brightnessctl s 5%- # Move focus with mainMod + arrow keys bind = $mainMod, J, movefocus, d -- cgit v1.2.3