Compare commits

...

5 Commits

Author SHA1 Message Date
Ryan Rix ba0464f7ca my custom lookandfeel commands to have the window decoration match up w/ my themes 2023-12-18 23:10:57 -08:00
Ryan Rix c8849448aa fix 2023-12-18 23:07:17 -08:00
Ryan Rix 6f78209788 get bismuth to work well enough in wayland and plasma 5.27 2023-12-18 23:07:01 -08:00
Ryan Rix 1f8f83b9ac change up common command environment 2023-12-18 23:06:42 -08:00
Ryan Rix d5b65613c3 default to plasmawayland 2023-12-18 23:06:23 -08:00
7 changed files with 54 additions and 13 deletions

View File

@ -77,8 +77,9 @@ in
(mkNixGLWrapper { name="xournal"; }) (mkNixGLWrapper { name="xournal"; })
(mkNixGLWrapper { name="xournalpp"; }) (mkNixGLWrapper { name="xournalpp"; })
# (mkNixGLWrapper { name="element-desktop"; }) (mkNixGLWrapper { name="element-desktop"; })
(mkNixGLWrapper { name="schildichat-desktop"; }) # https://github.com/NixOS/nixpkgs/pull/272270 🫡
# (mkNixGLWrapper { name="schildichat-desktop"; })
(mkNixGLWrapper { name="neochat"; }) (mkNixGLWrapper { name="neochat"; })
(mkNixGLWrapper { name="discord"; }) (mkNixGLWrapper { name="discord"; })
(mkNixGLWrapper { name="signal-desktop"; }) (mkNixGLWrapper { name="signal-desktop"; })

View File

@ -16,7 +16,6 @@ This [[id:09779ac0-4d5f-40db-a340-49595c717e03][noweb]] document constructs a cu
- I deploy firefox with settings in both =about:config= below and enterprise policies [[id:firefox-with-policy][further down]]. - I deploy firefox with settings in both =about:config= below and enterprise policies [[id:firefox-with-policy][further down]].
- =userChrome.css= and =userContent.css= loaded from [[id:cce/firefox_user_chrome][A Custom Firefox User Chrome]] - =userChrome.css= and =userContent.css= loaded from [[id:cce/firefox_user_chrome][A Custom Firefox User Chrome]]
- *this sucked and fought with firefox sync, didn't hit the security considerations I was hoping for*: Extensions are defined [[id:firefox-nix-extensions][below]] and bundled in to my Nix deployments - *this sucked and fought with firefox sync, didn't hit the security considerations I was hoping for*: Extensions are defined [[id:firefox-nix-extensions][below]] and bundled in to my Nix deployments
#+begin_src nix :tangle ~/arroyo-nix/hm/firefox.nix :noweb yes -r #+begin_src nix :tangle ~/arroyo-nix/hm/firefox.nix :noweb yes -r
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -29,6 +28,7 @@ This [[id:09779ac0-4d5f-40db-a340-49595c717e03][noweb]] document constructs a cu
}; };
home.sessionVariables = { home.sessionVariables = {
GTK_USE_PORTAL = 1; # (ref:gtk-use-portal) GTK_USE_PORTAL = 1; # (ref:gtk-use-portal)
MOZ_ENABLE_WAYLAND = 1;
}; };
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -92,7 +92,7 @@ per [[https://github.com/NixOS/nixpkgs/blob/master/doc/builders/packages/firefox
#+begin_src nix #+begin_src nix
pkgs.wrapFirefox pkgs.firefox-unwrapped { pkgs.wrapFirefox pkgs.firefox-unwrapped {
# nixExtensions = pkgs.callPackage ./firefox {}; # (ref:extensionsImport) # nixExtensions = pkgs.callPackage ./firefox {}; # (ref:extensionsImport)
extraNativeMessagingHosts = [ nativeMessagingHosts = [
pkgs.plasma5Packages.plasma-browser-integration pkgs.plasma5Packages.plasma-browser-integration
pkgs.browserpass pkgs.browserpass
pkgs.tridactyl-native pkgs.tridactyl-native

View File

@ -82,12 +82,21 @@ Make the sound work and the console legible.
Gotta have the soft keyboard since I'm actually goign to use this as a tablet for light web browsing. It still has to be enabled in System Settings, I need to automate the declarative setup of KDE and Plasma... Gotta have the soft keyboard since I'm actually goign to use this as a tablet for light web browsing. It still has to be enabled in System Settings, I need to automate the declarative setup of KDE and Plasma...
#+begin_src #+begin_src nix :tangle ~/arroyo-nix/nixos/gpd-pocket-3.nix
environment.systemPackages = [ environment.systemPackages = [
pkgs.maliit-framework pkgs.maliit-framework
pkgs.maliit-keyboard pkgs.maliit-keyboard
pkgs.wl-clipboard pkgs.wl-clipboard
]; ];
services.xserver.desktopManager.plasma5 = {
kwinrc = {
"Wayland" = {
"InputMethod[$e]" = "/run/current-system/sw/share/applications/com.github.maliit.keyboard.desktop";
"VirtualKeyboardEnabled" = "true";
};
};
};
#+END_SRC #+END_SRC
Include the rotate script below: Include the rotate script below:

View File

@ -87,7 +87,28 @@ I customize my KDE installation a fair bit both within [[id:cce/home-manager][ho
partition-manager partition-manager
gparted gparted
plasma5Packages.kamoso plasma5Packages.kamoso
plasma5Packages.bismuth (libsForQt5.bismuth.overrideAttrs
(finalAttrs: previousAttrs: {
patches =
(previousAttrs.patches or [])
++ [
# (fetchpatch {
# name = "bismuth-3.1-4-border-color.patch";
# url = "https://github.com/I-Want-ToBelieve/bismuth/commit/dac110934fe1ae0da9e4aca8c331f27987b033cf.patch";
# sha256 = "sha256-3fQs/A4hc/qeiu+792nZBTl4ujg8rQD25kuwNr03YUs=";
# })
# (fetchpatch {
# name = "bismuth-3.1-4-static-block.patch";
# url = "https://github.com/I-Want-ToBelieve/bismuth/commit/99438b55a82f90d4df3653d00f1f0978eddc2725.patch";
# sha256 = "sha256-jEt0YdS7k0bJRIS0UMY21o71jgrJcwNp3gFA8e8TG6I=";
# })
(fetchpatch {
name = "bismuth-3.1-4-window-id.patch";
url = "https://github.com/jkcdarunday/bismuth/commit/ce377a33232b7eac80e7d99cb795962a057643ae.patch";
sha256 = "sha256-15txf7pRhIvqsrBdBQOH1JDQGim2Kh5kifxQzVs5Zm0=";
})
];
}))
]); ]);
# auto login # auto login
@ -95,7 +116,7 @@ I customize my KDE installation a fair bit both within [[id:cce/home-manager][ho
services.xserver.displayManager = { services.xserver.displayManager = {
autoLogin.enable = true; autoLogin.enable = true;
autoLogin.user = "rrix"; autoLogin.user = "rrix";
defaultSession = "plasma"; defaultSession = "plasmawayland";
lightdm.enable = true; lightdm.enable = true;
}; };
} }

View File

@ -58,6 +58,10 @@ rec {
services.openssh.enable = true; services.openssh.enable = true;
environment.systemPackages = with pkgs; [
pkgs.htop
];
boot = { boot = {
kernelParams = [ "console=ttyS0" "boot.shell_on_fail" ]; kernelParams = [ "console=ttyS0" "boot.shell_on_fail" ];
loader.timeout = 5; loader.timeout = 5;
@ -122,7 +126,6 @@ rec {
(-map (lambda (r) (format "../../%s" r))) (-map (lambda (r) (format "../../%s" r)))
(butlast) (butlast)
(s-join "\n")) (s-join "\n"))
;; (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- generate -m home-manager -r server 2>/dev/null | sort")
#+end_src #+end_src
#+results: arroyo_home-manager_imports #+results: arroyo_home-manager_imports

View File

@ -20,7 +20,7 @@ When I capture a web page using [[id:cce/org_protocol][org-protocol to quickly a
(defun cce/org-roam-rename-file (file) (defun cce/org-roam-rename-file (file)
(interactive (interactive
(list (list
(if (org-roam--org-roam-file-p) (if (org-roam-file-p)
(buffer-file-name) (buffer-file-name)
(ivy-read "File: " (ivy--sorted-files org-roam-directory))))) (ivy-read "File: " (ivy--sorted-files org-roam-directory)))))
(let ((destination (let ((destination

View File

@ -2,7 +2,7 @@
:ID: cce/toggle_bright_dark_theme_in_emacs_kde_and_firefox :ID: cce/toggle_bright_dark_theme_in_emacs_kde_and_firefox
:END: :END:
#+TITLE: Toggle Bright/Dark Theme in Emacs, KDE and FireFox #+TITLE: Toggle Bright/Dark Theme in Emacs, KDE and FireFox
#+filetags: :CCE: #+filetags: :Project:CCE:
#+ARROYO_EMACS_MODULE: toggle-theme #+ARROYO_EMACS_MODULE: toggle-theme
#+ARCOLOGY_KEY: cce/toggle-theme #+ARCOLOGY_KEY: cce/toggle-theme
@ -25,7 +25,7 @@ Those code could really use a re-factor already, and I just wrote it! toggles li
(disable-theme cce/light-theme) (disable-theme cce/light-theme)
(enable-theme cce/dark-theme) (enable-theme cce/dark-theme)
(save-excursion (save-excursion
(call-process-shell-command "lookandfeeltool -a 'org.kde.breezedark.desktop'") (call-process-shell-command "lookandfeeltool -a 'garden.arcology.arroyo.bismuth'")
;; (cce/toggle-firefox-darkreader) ;; (cce/toggle-firefox-darkreader)
)) ))
@ -35,7 +35,7 @@ Those code could really use a re-factor already, and I just wrote it! toggles li
(disable-theme cce/dark-theme) (disable-theme cce/dark-theme)
(enable-theme cce/light-theme) (enable-theme cce/light-theme)
(save-excursion (save-excursion
(call-process-shell-command "lookandfeeltool -a 'org.kde.breeze.desktop'") (call-process-shell-command "lookandfeeltool -a 'garden.arcology.arroyo.bismuth.light'")
;; (cce/toggle-firefox-darkreader) ;; (cce/toggle-firefox-darkreader)
)) ))
@ -55,5 +55,12 @@ Those code could really use a re-factor already, and I just wrote it! toggles li
((eq active-theme cce/light-theme) ((eq active-theme cce/light-theme)
(cce/switch-dark-theme)) (cce/switch-dark-theme))
((eq active-theme cce/dark-theme) ((eq active-theme cce/dark-theme)
(cce/switch-light-theme))))) (cce/switch-light-theme))))
(cce-update-org-todo-keyword-faces))
#+END_SRC #+END_SRC
* NEXT move the look-and-feel themes int o code control
[rrix@virtuous-cassette:~/org/arcology-django]$ find ~ -name "garden.arcology.arroyo.*"
/home/rrix/.local/share/plasma/look-and-feel/garden.arcology.arroyo.bismuth.light
/home/rrix/.local/share/plasma/look-and-feel/garden.arcology.arroyo.bismuth