From bf0cd92f705d5c1d7cf0e4b72ae4cb9c0c1706d7 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 25 Jan 2023 11:03:48 -0800 Subject: [PATCH 1/4] Enable org-roam --- emacs/.doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index 071a476..b89cbd0 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -153,7 +153,7 @@ ;;nim ; python + lisp at the speed of c nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - org ; organize your plain life in plain text + (org +roam2) ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional From dd04c9bdb5018224dc33e2b4c057548b9ac6f61c Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 25 Jan 2023 15:29:59 -0800 Subject: [PATCH 2/4] Fix and improve automatic i3 layout --- hosts/desktop/i3/default.nix | 8 ++++++-- hosts/desktop/i3/layout.sh | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 hosts/desktop/i3/layout.sh diff --git a/hosts/desktop/i3/default.nix b/hosts/desktop/i3/default.nix index feea8f7..550dbb4 100644 --- a/hosts/desktop/i3/default.nix +++ b/hosts/desktop/i3/default.nix @@ -1,10 +1,14 @@ -{ ... }: +{ pkgs, ... }: { xsession.windowManager.i3.config = { startup = [ { - command = ''i3-msg workspace 1 && (firefox &) && i3-msg "workspace 2; append_layout ${./tree.json}; open" && (for i in {1..4}; do i3-msg move left; done) && (discord &) && firefox --new-window https://youtube.com && i3-msg workspace 1''; + command = let layout = pkgs.substituteAll { + src = ./layout.sh; + tree = ./tree.json; + isExecutable = true; + }; in "${layout}"; always = true; notification = false; } diff --git a/hosts/desktop/i3/layout.sh b/hosts/desktop/i3/layout.sh new file mode 100644 index 0000000..31173fc --- /dev/null +++ b/hosts/desktop/i3/layout.sh @@ -0,0 +1,10 @@ +i3-msg workspace 1 +firefox & + +i3-msg "workspace 2; append_layout @tree@; open" +for i in {1..4}; do + i3-msg move left +done +discord +firefox --new-window https://youtube.com +i3-msg workspace 1 From 5efa9a24bbea5cb88b55fbeaf6d3a949c4f1f62a Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 25 Jan 2023 15:49:18 -0800 Subject: [PATCH 3/4] Format rasi files as CSS in Emacs --- emacs/.doom.d/init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index b89cbd0..24e78a0 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -207,3 +207,6 @@ ;; LaTeX editing (add-hook 'org-mode-hook 'org-fragtog-mode) ;; automatically expand/preview LaTeX (add-hook 'org-mode-hook 'org-latex-preview) ;; automatically preview LaTeX on open + +;; Display .rasi (rofi theme files) as CSS +(add-to-list 'auto-mode-alist '("\\.rasi\\'" . css-mode)) From cd0afe0797d086ddd87cc1dba5fde8445c699840 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 25 Jan 2023 17:47:51 -0800 Subject: [PATCH 4/4] Improve color system, rofi theme formatting system --- colors/default.nix | 10 +++++++--- colors/everforest/default.nix | 2 ++ colors/nord/default.nix | 2 ++ rofi/default.nix | 11 ++++++++--- rofi/{theme.nix => theme.rasi} | 23 ++++++++++------------- 5 files changed, 29 insertions(+), 19 deletions(-) rename rofi/{theme.nix => theme.rasi} (71%) diff --git a/colors/default.nix b/colors/default.nix index 7e8d926..d221312 100644 --- a/colors/default.nix +++ b/colors/default.nix @@ -1,8 +1,12 @@ let theme = import ./everforest; + colors = { + undefined = "#ff00ff"; + fg1 = "#ffffff"; + }; in { - undefined = "#ff00ff"; - fg1 = "#ffffff"; css = lib: lib.strings.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (k: v: " --${k}: ${v};") theme.colors)); -} // theme // theme.colors +} +// colors // theme.colors # Root colors +// theme // { colors = theme.colors // colors; } # Dedicated color set diff --git a/colors/everforest/default.nix b/colors/everforest/default.nix index a5b4ce5..a7515a0 100644 --- a/colors/everforest/default.nix +++ b/colors/everforest/default.nix @@ -1,4 +1,6 @@ { + theme = "everforest"; + kitty-theme = "Everforest Dark Hard"; gtkTheme = pkgs: { package = pkgs.callPackage ./gtk.nix {}; diff --git a/colors/nord/default.nix b/colors/nord/default.nix index af7f861..e8e6f6e 100644 --- a/colors/nord/default.nix +++ b/colors/nord/default.nix @@ -1,4 +1,6 @@ { + theme = "nord"; + kitty-theme = "Nord"; wallpaper = "roxynord.png"; gtkTheme = pkgs: { diff --git a/rofi/default.nix b/rofi/default.nix index 4ff19b8..a1948be 100644 --- a/rofi/default.nix +++ b/rofi/default.nix @@ -1,13 +1,18 @@ { pkgs, ... }: -{ +let + colors = import ../colors; + theme = colors.theme; +in { home.packages = with pkgs; [ (pkgs.callPackage ./power.nix { }) wmctrl # TODO: add as dependency of rofi-power ]; programs.rofi = { enable = true; - theme = "theme"; + inherit theme; }; - home.file.".config/rofi/theme.rasi".text = import ./theme.nix; + home.file.".config/rofi/${theme}.rasi".source = pkgs.substituteAll ({ + src = ./theme.rasi; + } // colors.colors); } diff --git a/rofi/theme.nix b/rofi/theme.rasi similarity index 71% rename from rofi/theme.nix rename to rofi/theme.rasi index 3e04f6b..4b19e8e 100644 --- a/rofi/theme.nix +++ b/rofi/theme.rasi @@ -1,6 +1,4 @@ -# Modified from https://github.com/undiabler/nord-rofi-theme -let colors = import ../colors; in -'' +/* Modified from https://github.com/undiabler/nord-rofi-theme */ configuration { font: "Noto Sans Mono 12"; width: 30; @@ -18,7 +16,7 @@ configuration { * { background-color: transparent; - highlight: underline bold ${colors.fg1}; + highlight: underline bold @fg1@; } window { @@ -40,16 +38,16 @@ mainbox { } message { - color: ${colors.bg0}; + color: @bg0@; padding: 5; - border-color: ${colors.fg0}; + border-color: @fg0@; border: 0px 2px 2px 2px; } inputbar { - color: ${colors.fg0}; + color: @fg0@; padding: 11px; - background-color: ${colors.bg1}; + background-color: @bg1@; } entry, prompt, case-indicator { @@ -64,23 +62,22 @@ prompt { listview { padding: 8px; border: 0; - background-color: ${colors.bg0}e5; + background-color: @bg0@e5; dynamic: false; } element { padding: 3px; border-radius: 4px; - text-color: ${colors.fg0}; + text-color: @fg0@; } element selected.normal { - background-color: ${colors.primary}; - text-color: ${colors.bg0}; + background-color: @primary@; + text-color: @bg0@; } element-text, element-icon { background-color: inherit; text-color: inherit; } -''