From cc46761cf2ea99d394b72838d9e3ac0d1df8b551 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Sun, 10 Mar 2024 12:17:31 +0100 Subject: [PATCH] add nixGL --- flake.nix | 17 ++++++++++++ modules/development/default.nix | 1 - modules/development/nixos/default.nix | 8 ------ modules/gui/default.nix | 17 +++++++----- modules/gui/firefox.nix | 40 --------------------------- modules/gui/keepassxc.nix | 10 ------- modules/gui/kitty.nix | 18 ------------ modules/gui/nextcloud-client.nix | 5 ---- modules/gui/picom.nix | 37 ------------------------- modules/shell/ssh.nix | 8 +++--- 10 files changed, 31 insertions(+), 130 deletions(-) delete mode 100644 modules/development/nixos/default.nix delete mode 100644 modules/gui/firefox.nix delete mode 100644 modules/gui/keepassxc.nix delete mode 100644 modules/gui/kitty.nix delete mode 100644 modules/gui/nextcloud-client.nix delete mode 100644 modules/gui/picom.nix diff --git a/flake.nix b/flake.nix index df4f2f9..c681389 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,23 @@ homeModules.shell homeModules.dev homeModules.gui + { + gui.enable = true; + } + ]; + }; + odie-gui-nixGL = home-manager.lib.homeManagerConfiguration { + inherit pkgs extraSpecialArgs; + modules = [ + inputs.neovim-flake.homeModules.neovim-ide + homeModules.base + homeModules.shell + homeModules.dev + homeModules.gui + { + gui.enable = true; + services.nixGL.enable = true; + } ]; }; odie = odie-gui; diff --git a/modules/development/default.nix b/modules/development/default.nix index 43fb80b..16196db 100644 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -2,7 +2,6 @@ _: { imports = [ ./gitea ./neovim-ide - ./nixos ]; programs.lazygit.enable = true; diff --git a/modules/development/nixos/default.nix b/modules/development/nixos/default.nix deleted file mode 100644 index 70b8d12..0000000 --- a/modules/development/nixos/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - nix = { - extraOptions = '' - keep-outputs = true - keep-derivations = true - ''; - }; -} diff --git a/modules/gui/default.nix b/modules/gui/default.nix index f74da75..44948bd 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -1,14 +1,16 @@ { lib, config, ... }: { - options = { + options = { gui.enable = lib.mkEnableOption "gui"; }; + imports = [ + ./firefox + ./keepassxc + ./kitty + ./nextcloud-client + ./picom + ./nixGL + ]; config = lib.mkIf config.gui.enable { - imports = [ - ./firefox.nix - ./keepassxc.nix - ./kitty.nix - ./nextcloud-client.nix - ]; programs = { keepassxc.enable = lib.mkDefault true; firefox.enable = lib.mkDefault true; @@ -17,6 +19,7 @@ services = { nextcloud-client.enable = lib.mkDefault false; udiskie.enable = lib.mkDefault false; + picom.enable = lib.mkDefault false; }; }; } diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix deleted file mode 100644 index 7e78a02..0000000 --- a/modules/gui/firefox.nix +++ /dev/null @@ -1,40 +0,0 @@ -{pkgs, config, lib, ...}: lib.mkIf config.programs.firefox.enable { - programs.firefox = { - package = pkgs.firefox.override { - nativeMessagingHosts = with pkgs; [ - tridactyl-native - keepassxc - ]; - }; - profiles.odie = { - isDefault = true; - id = 0; - name = "odie"; - search = { - default = "DuckDuckGo"; - force = true; - }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - adnauseam - istilldontcareaboutcookies - sponsorblock - stylus - keepassxc-browser - tridactyl - canvasblocker - deutsch-de-language-pack - greasemonkey - youtube-recommended-videos # unhook - return-youtube-dislikes - user-agent-string-switcher - ]; - settings = { - "browser.startup.homepage" = "https://duckduckgo.com"; - "browser.search.region" = "DE"; - "browser.search.isUS" = false; - "distribution.searchplugins.defaultLocale" = "de-DE"; - "general.useragent.locale" = "de-DE"; - }; - }; - }; -} diff --git a/modules/gui/keepassxc.nix b/modules/gui/keepassxc.nix deleted file mode 100644 index 83b81c8..0000000 --- a/modules/gui/keepassxc.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, lib, config, ... }: { - options = { - programs.keepassxc.enable = lib.mkEnableOption "keepassxc"; - }; - config = lib.mkIf config.programs.keepassxc.enable { - home.packages = [ - pkgs.keepassxc - ]; - }; -} diff --git a/modules/gui/kitty.nix b/modules/gui/kitty.nix deleted file mode 100644 index 618d529..0000000 --- a/modules/gui/kitty.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, config, lib, ... }: { - config = lib.mkIf config.programs.kitty.enable { - programs.kitty = { - font = { - name = "JetBrains Mono"; - size = 9.5; - }; - shellIntegration.enableZshIntegration = true; - settings = { - background_opacity = 1; - enable_audio_bell = "no"; - visual_bell_duration = "0.025"; - window_padding_width = 0; - }; - theme = "Catppuccin-Mocha"; - }; - }; -} diff --git a/modules/gui/nextcloud-client.nix b/modules/gui/nextcloud-client.nix deleted file mode 100644 index 4d9fc19..0000000 --- a/modules/gui/nextcloud-client.nix +++ /dev/null @@ -1,5 +0,0 @@ -{lib,config,...}: lib.mkIf config.services.nextcloud-client.enable { - services.nextcloud-client = { - startInBackground = true; - }; -} diff --git a/modules/gui/picom.nix b/modules/gui/picom.nix deleted file mode 100644 index 960bee0..0000000 --- a/modules/gui/picom.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, ... }: { - options = { - services = { - picom = { - glxBackend = lib.mkOption { - type = lib.types.str; - description = "the default terminal to use"; - default = "glx"; - }; - }; - }; - }; - services.picom = { - enable = true; - backend = config.services.picom.glxBackend; - fade = true; - opacityRules = [ - "95:class_g = 'kitty' && focused" - "85:class_g = 'kitty' && !focused" - "95:class_g = 'Alacritty' && focused" - "85:class_g = 'Alacritty' && !focused" - "85:window_type = 'dock'" - ]; - settings = { - blur = { - method = "gaussian"; - size = 10; - deviation = 5.0; - }; - corner-radius = 6; - rounded-corners-exclude = [ - "window_type = 'dock'" - "window_type = 'desktop'" - ]; - }; - }; -} diff --git a/modules/shell/ssh.nix b/modules/shell/ssh.nix index 42dd0fc..84852aa 100644 --- a/modules/shell/ssh.nix +++ b/modules/shell/ssh.nix @@ -2,11 +2,11 @@ home.packages = with pkgs; [ tea ]; programs = { ssh = { - addKeysToAgent = "yes"; + # addKeysToAgent = "yes"; forwardAgent = true; - # extraConfig = '' - # AddKeysToAgent yes - # ''; + extraConfig = '' + AddKeysToAgent yes + ''; }; };