From c83219239b33f83fe49f91d657de74fd625798c8 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 9 Dec 2022 07:30:33 -0600 Subject: [PATCH] some changes I guess --- README.org | 9 ++++++--- eww/eww.scss | 8 ++++++-- eww/scripts/appname | 2 +- eww/scripts/workspace | 20 ++++++++++---------- macchina/macchina.toml | 2 +- system/kaladin/configuration.nix | 5 ++--- system/syl/configuration.nix | 5 ++--- user/home.nix | 4 ++++ 8 files changed, 32 insertions(+), 23 deletions(-) diff --git a/README.org b/README.org index 5cc435c..393ef56 100644 --- a/README.org +++ b/README.org @@ -207,7 +207,7 @@ services.greetd = { enable = true; settings = rec { initial_session = { - command = "/home/chris/bin/hyprland"; + command = "dbus-launch startplasma-wayland"; user = "chris"; }; default_session = initial_session; @@ -512,7 +512,6 @@ pkg-config libsForQt5.wrapQtAppsHook python310Packages.pyqt5 # LIBRARIES FOR DEV -qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras @@ -535,7 +534,7 @@ Let's create our own custom LightlyShaders package. This is in it's own file for Let's also add our own package from my WIP presenter #+NAME: librepresenter #+begin_src nix -(libsForQt5.callPackage /home/chris/dev/church-presenter {}) +# (libsForQt5.callPackage /home/chris/dev/church-presenter {}) #+end_src #+NAME: ydotool @@ -2301,6 +2300,10 @@ I also use home-manager for managing dotfiles. This means that everything is con source = ../fish/functions; }; + programs.nushell = { + enable = true; + }; + home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; home.file.".config/dunst" = { diff --git a/eww/eww.scss b/eww/eww.scss index 044a56f..7d1e6ef 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -193,9 +193,13 @@ tooltip label { background-color: rgba(00, 00, 00, 0.0); } -.0 , .01, .02, .03, .04, .05, .06, +.0, .01, .02, .03, .04, .05, .06, .011, .022, .033, .044, .055, .066 { - margin: 0px 7px 0px 0px; + margin: 0px 15px 0px 0px; +} + +.04 { + margin: 0px 2px 0px 0px; } /* Unoccupied */ diff --git a/eww/scripts/appname b/eww/scripts/appname index bb28cc8..a1856d8 100755 --- a/eww/scripts/appname +++ b/eww/scripts/appname @@ -26,7 +26,7 @@ echo "(box \ :image-width \"18\") \ (label \ :class \"app-name\" \ - :limit-width \"35\" \ + :limit-width \"55\" \ :text \"$title\" \ :tooltip \"$title\"))" } diff --git a/eww/scripts/workspace b/eww/scripts/workspace index 40a2578..7c1fb9c 100755 --- a/eww/scripts/workspace +++ b/eww/scripts/workspace @@ -1,7 +1,7 @@ #!/usr/bin/env bash #define icons for workspaces 1-9 -ic=(0     輸  " " " " ) +ic=(0       "" "" ) #initial check for occupied workspaces for num in $(hyprctl workspaces | grep ID | awk '{print $3}'); do @@ -51,15 +51,15 @@ module() { #output eww widget echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" \ (box :class \"works\" :orientation \"h\" :spacing 5 :space-evenly \"false\" :valign \"center\" \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 1\'\" :onrightclick \"hyprctl dispatch workspace 1 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o1$f1\" \"${ic[1]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 2\'\" :onrightclick \"hyprctl dispatch workspace 2 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o2$f2\" \"${ic[2]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 3\'\" :onrightclick \"hyprctl dispatch workspace 3 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o3$f3\" \"${ic[3]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 4\'\" :onrightclick \"hyprctl dispatch workspace 4 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o4$f4\" \"${ic[4]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 5\'\" :onrightclick \"hyprctl dispatch workspace 5 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o5$f5\" \"${ic[5]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 6\'\" :onrightclick \"hyprctl dispatch workspace 6 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o6$f6\" \"${ic[6]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 7\'\" :onrightclick \"hyprctl dispatch workspace 7 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o7$f7\" \"${ic[7]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 8\'\" :onrightclick \"hyprctl dispatch workspace 8 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o8$f8\" \"${ic[8]}\") \ - (button :onclick \"hyprctl dispatch exec \'~/.config/hypr/themes/neon/scripts/workspace 9\'\" :onrightclick \"hyprctl dispatch workspace 9 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o9$f9\" \"${ic[9]}\") \ + (button :onclick \"hyprctl dispatch workspace 1\" :onrightclick \"hyprctl dispatch workspace 1 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o1$f1\" \"${ic[1]}\") \ + (button :onclick \"hyprctl dispatch workspace 2\" :onrightclick \"hyprctl dispatch workspace 2 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o2$f2\" \"${ic[2]}\") \ + (button :onclick \"hyprctl dispatch workspace 3\" :onrightclick \"hyprctl dispatch workspace 3 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o3$f3\" \"${ic[3]}\") \ + (button :onclick \"hyprctl dispatch workspace 4\" :onrightclick \"hyprctl dispatch workspace 4 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o4$f4\" \"${ic[4]}\") \ + (button :onclick \"hyprctl dispatch workspace 5\" :onrightclick \"hyprctl dispatch workspace 5 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o5$f5\" \"${ic[5]}\") \ + (button :onclick \"hyprctl dispatch workspace 6\" :onrightclick \"hyprctl dispatch workspace 6 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o6$f6\" \"${ic[6]}\") \ + (button :onclick \"hyprctl dispatch workspace 7\" :onrightclick \"hyprctl dispatch workspace 7 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o7$f7\" \"${ic[7]}\") \ + (button :onclick \"hyprctl dispatch workspace 8\" :onrightclick \"hyprctl dispatch workspace 8 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o8$f8\" \"${ic[8]}\") \ + (button :onclick \"hyprctl dispatch workspace 9\" :onrightclick \"hyprctl dispatch workspace 9 && $HOME/.config/hypr/themes/neon/scripts/default_app\" :class \"0$o9$f9\" \"${ic[9]}\") \ )\ )" } diff --git a/macchina/macchina.toml b/macchina/macchina.toml index 9edd241..90cacff 100644 --- a/macchina/macchina.toml +++ b/macchina/macchina.toml @@ -45,4 +45,4 @@ theme = "Lithium" # - Memory # - Battery # Example: - show = ["Host", "Machine", "Kernel", "Distribution", "DesktopEnvironment", "Packages", "ProcessorLoad", "Memory", "Battery"] \ No newline at end of file + show = ["Host", "Machine", "Kernel", "Distribution", "DesktopEnvironment", "ProcessorLoad", "Memory", "Battery"] \ No newline at end of file diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index cb3a93a..f1168ca 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -119,7 +119,7 @@ enable = true; settings = rec { initial_session = { - command = "/home/chris/bin/hyprland"; + command = "dbus-launch startplasma-wayland"; user = "chris"; }; default_session = initial_session; @@ -391,7 +391,6 @@ libsForQt5.wrapQtAppsHook python310Packages.pyqt5 # LIBRARIES FOR DEV - qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras @@ -404,7 +403,7 @@ sqlite fennel (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) - (libsForQt5.callPackage /home/chris/dev/church-presenter {}) + # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) ]; # nixpkgs.overlays = [ diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 089b950..030f774 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -112,7 +112,7 @@ enable = true; settings = rec { initial_session = { - command = "/home/chris/bin/hyprland"; + command = "dbus-launch startplasma-wayland"; user = "chris"; }; default_session = initial_session; @@ -411,7 +411,6 @@ libsForQt5.wrapQtAppsHook python310Packages.pyqt5 # LIBRARIES FOR DEV - qt5.full qt5.qtbase qt5.qtquickcontrols2 qt5.qtx11extras @@ -424,7 +423,7 @@ sqlite fennel (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) - (libsForQt5.callPackage /home/chris/dev/church-presenter {}) + # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) ]; services.emacs = { diff --git a/user/home.nix b/user/home.nix index 214e833..f063543 100644 --- a/user/home.nix +++ b/user/home.nix @@ -342,6 +342,10 @@ source = ../fish/functions; }; + programs.nushell = { + enable = true; + }; + home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; home.file.".config/dunst" = {