diff options
| -rw-r--r-- | nixos/environment.nix | 17 | ||||
| -rw-r--r-- | nixos/home.nix | 12 | ||||
| -rw-r--r-- | quickshell/BatteryModeConfig.qml | 4 | ||||
| -rw-r--r-- | quickshell/shell.qml | 2 |
4 files changed, 20 insertions, 15 deletions
diff --git a/nixos/environment.nix b/nixos/environment.nix index 0919898..0399eaa 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -1,5 +1,22 @@ { config, pkgs, ... }: { + environment.variables = { + EDITOR = "nvim"; + XDG_CONFIG_HOME = "$HOME/.config"; + XDG_CACHE_HOME = "$HOME/.cache"; + PATH = [ + "$HOME/.bin" + "$HOME/.cargo/bin" + "/opt/android-sdk/cmdline-tools/latest/bin" + "/opt/android-sdk/platform-tools" + "/opt/android-sdk/emulator" + ]; + PKG_CONFIG_PATH="$HOME/.local/lib/pkgconfig $HOME/.local/lib64/pkgconfig"; + LD_LIBRARY_PATH="$HOME/.local/lib $HOME/.local/lib64"; + ANDROID_NDK_HOME="/opt/android-ndk"; + ANDROID_NDK_ROOT="/opt/android-ndk"; + ANDROID_HOME="/opt/android-sdk"; + }; programs.nix-ld.enable = true; environment.systemPackages = with pkgs; [ man-pages-posix diff --git a/nixos/home.nix b/nixos/home.nix index c0a7719..c37e743 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -73,18 +73,6 @@ function mkcd mkdir -p $argv[1] cd $argv[1] end - -set -x PKG_CONFIG_PATH $HOME/.local/lib/pkgconfig $HOME/.local/lib64/pkgconfig -set -x LD_LIBRARY_PATH $HOME/.local/lib $HOME/.local/lib64 -set -U fish_user_paths /home/comet/.cargo/bin $fish_user_paths -set -U fish_user_paths /opt/android-sdk/cmdline-tools/latest/bin $fish_user_paths -set -U fish_user_paths /opt/android-sdk/platform-tools $fish_user_paths -set -U fish_user_paths /opt/android-sdk/emulator $fish_user_paths -set -U fish_user_paths $HOME/.bin $fish_user_paths - -set ANDROID_NDK_HOME /opt/android-ndk -set ANDROID_NDK_ROOT /opt/android-ndk -set ANDROID_HOME /opt/android-sdk ''; }; environment.systemPackages = with pkgs; [ diff --git a/quickshell/BatteryModeConfig.qml b/quickshell/BatteryModeConfig.qml index 0945888..4ef80c5 100644 --- a/quickshell/BatteryModeConfig.qml +++ b/quickshell/BatteryModeConfig.qml @@ -12,8 +12,8 @@ Rectangle { Layout.fillHeight: true color: shellRoot.black antialiasing: true - bottomLeftRadius: 10 - bottomRightRadius: 10 + topLeftRadius: 10 + topRightRadius: 10 property int current: 1 Timer { diff --git a/quickshell/shell.qml b/quickshell/shell.qml index 0a6224d..ca17fb4 100644 --- a/quickshell/shell.qml +++ b/quickshell/shell.qml @@ -181,7 +181,7 @@ ShellRoot { visible: shellRoot.batteryModeConfig anchors { - top: true + bottom: true left: true } |