From 9a4d92b23f59b538c8bcde38534f5fb767f8ef9b Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 2 Mar 2024 01:37:37 +0300 Subject: [PATCH] add gnome.nix --- home/gnome.nix | 40 +++++++++++++++++++++++++++++ home/home.nix | 47 +++++++++++++++++++++------------- home/programs/hypr/default.nix | 4 +-- home/scripts.nix | 19 +++++++++++--- 4 files changed, 86 insertions(+), 24 deletions(-) create mode 100644 home/gnome.nix diff --git a/home/gnome.nix b/home/gnome.nix new file mode 100644 index 0000000..6bcc2bd --- /dev/null +++ b/home/gnome.nix @@ -0,0 +1,40 @@ +{ inputs, home, config, lib, ... }: + +{ + + dconf = { + enable = true; + settings = { + "org/gnome/settings-daemon/plugins/media-keys" = { + custom-keybindings = [ + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/" + ]; + }; + "org/gnome/shell/keybindings" = { + show-screenshot-ui = [ "s" ]; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + binding = "Return"; + command = "/etc/profiles/per-user/delta/bin/kitty_wrapped"; + name = "kitty"; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { + binding = "x"; + command = "/etc/profiles/per-user/delta/bin/keepassxc"; + name = "keepassxc"; + }; + "org/gnome/desktop/sound" = { + allow-volume-above-100-percent = true; + }; + "org/gnome/mutter" = { + experimental-features = [ "scale-monitor-framebuffer" ]; + }; + #"org/gnome/mutter" = { + # experimental-features = lib.mkForce [ ]; + #}; + "org/gnome/settings-daemon/plugins/power".sleep-inactive-battery-timeout = + 300; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index 5ac8069..6a4ff7b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -16,6 +16,7 @@ ./programs ./theme.nix ./scripts.nix + ./gnome.nix ]; services.blueman-applet.enable = true; @@ -49,6 +50,7 @@ (callPackage ../derivations/audiorelay.nix { }) (callPackage ../derivations/spotify.nix { }) xorg.xwininfo + jq ]) ++ (with unstable; [ xfce.thunar rustdesk-flutter @@ -56,7 +58,6 @@ btop htop foot - kitty alacritty dig nwg-displays @@ -77,19 +78,6 @@ # inputs.firefox.packages.${pkgs.system}.firefox-bin ]); - dconf = { - enable = true; - settings = { - # "org/gnome/mutter" = { - # experimental-features = [ "scale-monitor-framebuffer" ]; - # }; - "org/gnome/mutter" = { - experimental-features = lib.mkForce [ ]; - }; - "org/gnome/settings-daemon/plugins/power".sleep-inactive-battery-timeout = - 300; - }; - }; programs.obs-studio = { enable = true; @@ -121,12 +109,35 @@ }; }; - gtk = { + programs.kitty = { enable = true; + shellIntegration.enableFishIntegration = false; + settings = { + background = "#171717"; + foreground = "#DCDCCC"; + background_opacity = "0.8"; + remember_window_size = "yes"; + hide_window_decorations = "yes"; + remote_control_password = "kitty-notification-password-fish ls"; + allow_remote_control = "password"; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; + color0 = "#3F3F3F"; + color1 = "#705050"; + color2 = "#60B48A"; + color3 = "#DFAF8F"; + color4 = "#9AB8D7"; + color5 = "#DC8CC3"; + color6 = "#8CD0D3"; + color7 = "#DCDCCC"; + + color8 = "#709080"; + color9 = "#DCA3A3"; + color10 = "#72D5A3"; + color11 = "#F0DFAF"; + color12 = "#94BFF3"; + color13 = "#EC93D3"; + color14 = "#93E0E3"; + color15 = "#FFFFFF"; }; }; diff --git a/home/programs/hypr/default.nix b/home/programs/hypr/default.nix index ab44eee..752cd75 100644 --- a/home/programs/hypr/default.nix +++ b/home/programs/hypr/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - home.packages = with pkgs; [ waybar swww swaynotificationcenter cliphist fzf hyprshot slurp grim swaylock hyprlock hypridle]; + home.packages = with pkgs; [ waybar swww swaynotificationcenter cliphist fzf hyprshot slurp grim swaylock hyprlock hypridle libnotify brightnessctl]; #test later systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; wayland.windowManager.hyprland = { @@ -53,7 +53,7 @@ exec-once = foot -s exec-once = thunar --daemon - #exec-once = swayidle -d + exec-once = hypridle exec-once = hyprctl setcursor Bibata-Modern-Classic 16 exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP diff --git a/home/scripts.nix b/home/scripts.nix index c1dfde3..fd02a53 100644 --- a/home/scripts.nix +++ b/home/scripts.nix @@ -55,7 +55,18 @@ let keepassxc = pkgs.writeScriptBin "keepassxc" '' #!/usr/bin/env bash - ${pkgs.coreutils}/bin/cat /run/agenix/precise | ${pkgs.keepassxc}/bin/keepassxc --pw-stdin ~/Dropbox/pswd.kdbx + ${pkgs.coreutils}/bin/cat /run/agenix/qqq | ${pkgs.keepassxc}/bin/keepassxc --pw-stdin ~/Dropbox/pswd.kdbx + ''; + + kitty_wrapped = pkgs.writeScriptBin "kitty_wrapped" '' + #!/usr/bin/env bash + pid=$(${pkgs.procps}/bin/pgrep "kitty") + + if [[ -z $pid ]]; then + kitty --start-as maximized & + else + ${pkgs.glib}/bin/gdbus call --session --dest org.gnome.Shell --object-path /de/lucaswerkmeister/ActivateWindowByTitle --method de.lucaswerkmeister.ActivateWindowByTitle.activateByWmClass 'kitty' + fi ''; in { home.packages = with pkgs; [ @@ -67,19 +78,19 @@ in { keepassxc = { name = "KeePassXC"; icon = "keepassxc"; - exec = "/etc/profiles/per-user/cute/bin/keepassxc"; + exec = "/etc/profiles/per-user/delta/bin/keepassxc"; type = "Application"; }; ephemeralbrowser = { name = "Ephemeral Browser"; icon = "google-chrome-unstable"; - exec = "/etc/profiles/per-user/cute/bin/ephemeralbrowser"; + exec = "/etc/profiles/per-user/delta/bin/ephemeralbrowser"; type = "Application"; }; autostart = { name = "Autostart"; icon = "app-launcher"; - exec = "/etc/profiles/per-user/cute/bin/autostart"; # this is needed due to nix stuff, the path is going to be changed every time i update autostart script + exec = "/etc/profiles/per-user/delta/bin/autostart"; # this is needed due to nix stuff, the path is going to be changed every time i update autostart script type = "Application"; }; };