diff --git a/user/app/browser/qutebrowser-logo.png b/user/app/browser/qutebrowser-logo.png new file mode 100644 index 0000000..541e90e Binary files /dev/null and b/user/app/browser/qutebrowser-logo.png differ diff --git a/user/app/browser/qutebrowser.nix b/user/app/browser/qutebrowser.nix index 7722223..5b72912 100644 --- a/user/app/browser/qutebrowser.nix +++ b/user/app/browser/qutebrowser.nix @@ -45,15 +45,6 @@ let generateHomepage = name: font: config: font-weight: bold; } - /*xmp tag style for ascii art*/ - xmp { - font-family:''+font+''; - - font-size:22px; - color: #''+config.lib.stylix.colors.base01+'' - - text-align:center; - } /*div*/ div { margin:auto; @@ -69,24 +60,15 @@ let generateHomepage = name: font: config: +
+
+
- ..--------.. - .`` "'. - .` _.---.. /--| '. - /`` || | - /` /--| || | - / / | || `/----\, - | | | .-`.-/- __. \ - | \ `-.`` ..-` \ | - \ ```` ~.^` | | | - \.____.-``'|| | / / - | || |_.- / - | || / - . |_-` `------~``. - `.. ..` - ``--______-'` +

+
+

Welcome to Qutebrowser


@@ -336,10 +318,16 @@ Bard ''; home.file.".config/qutebrowser/qute-home.html".text = generateHomepage "Default" userSettings.font config; + home.file.".config/qutebrowser/logo.png".source = ./qutebrowser-logo.png; home.file.".browser/Teaching/config/qute-home.html".text = generateHomepage "Teaching" userSettings.font config; + home.file.".browser/Teaching/config/logo.png".source = ./qutebrowser-logo.png; home.file.".browser/Tech/config/qute-home.html".text = generateHomepage "Tech" userSettings.font config; + home.file.".browser/Tech/config/logo.png".source = ./qutebrowser-logo.png; home.file.".browser/Gaming/config/qute-home.html".text = generateHomepage "Gaming" userSettings.font config; + home.file.".browser/Gaming/config/logo.png".source = ./qutebrowser-logo.png; home.file.".browser/Gamedev/config/qute-home.html".text = generateHomepage "Gamedev" userSettings.font config; + home.file.".browser/Gamedev/config/logo.png".source = ./qutebrowser-logo.png; home.file.".browser/Bard/config/qute-home.html".text = generateHomepage "Bard" userSettings.font config; + home.file.".browser/Bard/config/logo.png".source = ./qutebrowser-logo.png; } diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 9d3cbcf..b602e66 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -84,10 +84,11 @@ (require 'dashboard) (setq initial-buffer-choice (lambda () (get-buffer-create "*dashboard*")) doom-fallback-buffer-name "*dashboard*") +(setq image-scaling-factor 1) ;; emacs-dashboard variables (setq dashboard-banner-logo-title "Welcome to Nix Doom Emacs") -(setq dashboard-startup-banner 2) +(setq dashboard-startup-banner "~/.emacs.d/dashboard-logo.webp") (setq dashboard-icon-type 'all-the-icons) ;; use `all-the-icons' package (setq dashboard-set-heading-icons t) (setq dashboard-set-file-icons t) @@ -104,6 +105,18 @@ "I’ll tell you a DNS joke but it could take 24 hours for everyone to get it." "I'd tell you a UDP joke, but you might not get it." "I'll tell you a TCP joke. Do you want to hear it?")) + +;; Remove basic evil input and cursors from dashboard +(defun disable-cursor() + (setq-local evil-normal-state-cursor '(bar . 0)) + (hl-line-mode -1) +) +(add-hook 'dashboard-mode-hook 'disable-cursor) +(evil-define-key 'normal dashboard-mode-map + "j" 'evil-normal-state + "k" 'evil-normal-state + "h" 'evil-normal-state + "l" 'evil-normal-state) (setq dashboard-navigator-buttons `(;; line1 ( (,"Roam" "" "" (lambda (&rest _)) 'org-formula) @@ -1512,7 +1525,9 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (setq +format-on-save-enabled-modes '(not emacs-lisp-mode sql-mode tex-mode latex-mode org-msg-edit-mode nix-mode)) (add-to-list 'tramp-remote-path 'tramp-own-remote-path) -(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers +(after! vterm + (add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers +) ;; I source my rss from my freshrss instance ;; I login with a private elisp file: ~/.emacs.d/freshrss-elfeed.el diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 77120a2..d18ceab 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -1,7 +1,7 @@ { config, lib, pkgs-emacs, pkgs-stable, inputs, userSettings, systemSettings, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); - dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; + dashboardLogo = ./. + "/nix-" + themePolarity + ".webp"; in { imports = [ @@ -109,7 +109,7 @@ in source = "${inputs.org-sliced-images}"; }; - home.file.".emacs.d/dashboard-logo.png".source = dashboardLogo; + home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo; home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = { source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh; executable = true; diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index e47909b..b43abfc 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -147,10 +147,11 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu (require 'dashboard) (setq initial-buffer-choice (lambda () (get-buffer-create "*dashboard*")) doom-fallback-buffer-name "*dashboard*") +(setq image-scaling-factor 1) ;; emacs-dashboard variables (setq dashboard-banner-logo-title "Welcome to Nix Doom Emacs") -(setq dashboard-startup-banner 2) +(setq dashboard-startup-banner "~/.emacs.d/dashboard-logo.webp") (setq dashboard-icon-type 'all-the-icons) ;; use `all-the-icons' package (setq dashboard-set-heading-icons t) (setq dashboard-set-file-icons t) @@ -167,6 +168,18 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu "I’ll tell you a DNS joke but it could take 24 hours for everyone to get it." "I'd tell you a UDP joke, but you might not get it." "I'll tell you a TCP joke. Do you want to hear it?")) + +;; Remove basic evil input and cursors from dashboard +(defun disable-cursor() + (setq-local evil-normal-state-cursor '(bar . 0)) + (hl-line-mode -1) +) +(add-hook 'dashboard-mode-hook 'disable-cursor) +(evil-define-key 'normal dashboard-mode-map + "j" 'evil-normal-state + "k" 'evil-normal-state + "h" 'evil-normal-state + "l" 'evil-normal-state) (setq dashboard-navigator-buttons `(;; line1 ( (,"Roam" "" "" (lambda (&rest _)) 'org-formula) @@ -1784,7 +1797,9 @@ I don't have this active right now since it's kinda weird with pgtk... ** Terminal #+BEGIN_SRC emacs-lisp :tangle config.el (add-to-list 'tramp-remote-path 'tramp-own-remote-path) -(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers +(after! vterm + (add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers +) #+END_SRC ** Elfeed #+BEGIN_SRC emacs-lisp :tangle config.el @@ -2080,7 +2095,7 @@ In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], { config, lib, pkgs-emacs, pkgs-stable, inputs, userSettings, systemSettings, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); - dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; + dashboardLogo = ./. + "/nix-" + themePolarity + ".webp"; in { imports = [ @@ -2188,7 +2203,7 @@ in source = "${inputs.org-sliced-images}"; }; - home.file.".emacs.d/dashboard-logo.png".source = dashboardLogo; + home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo; home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = { source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh; executable = true; diff --git a/user/app/doom-emacs/nix-dark.webp b/user/app/doom-emacs/nix-dark.webp new file mode 100644 index 0000000..b225ed7 Binary files /dev/null and b/user/app/doom-emacs/nix-dark.webp differ diff --git a/user/app/doom-emacs/nix-light.webp b/user/app/doom-emacs/nix-light.webp new file mode 100644 index 0000000..92c3aad Binary files /dev/null and b/user/app/doom-emacs/nix-light.webp differ diff --git a/user/app/games/games.nix b/user/app/games/games.nix index 441c61c..e512bd0 100644 --- a/user/app/games/games.nix +++ b/user/app/games/games.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, pkgs-stable, ... }: let myRetroarch = (pkgs.retroarch.override { @@ -22,7 +22,7 @@ let }); in { - home.packages = with pkgs; [ + home.packages = (with pkgs; [ # Games pegasus-frontend myRetroarch @@ -31,8 +31,10 @@ in qjoypad superTux superTuxKart - #pokefinder - ]; + gamepad-tool + ]) ++ (with pkgs-stable; [ + pokefinder + ]); nixpkgs.config = { allowUnfree = true; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 5499be7..7538a31 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -418,8 +418,8 @@ in src = fetchFromGitHub { owner = "hyprland-community"; repo = "pyprland"; - rev = "refs/tags/2.2.17"; - hash = "sha256-S1bIIazrBWyjF8tOcIk0AwwWq9gbpTKNsjr9iYA5lKk="; + rev = "refs/tags/2.3.8"; + hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s="; }; })) (hyprnome.override (oldAttrs: {