diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc index fa514af..69ec840 120000 --- a/files/.config/htop/htoprc +++ b/files/.config/htop/htoprc @@ -1 +1 @@ -/nix/store/d1164dadvqwlkh5rs2glfaa1ajvm2c0w-home-manager-files/.config/htop/htoprc \ No newline at end of file +/nix/store/sg6xd3ga2g2m7d8bm5519cllgjlnh2hx-home-manager-files/.config/htop/htoprc \ No newline at end of file diff --git a/files/.xmonad/lib/Rofi.hs b/files/.xmonad/lib/Rofi.hs index eb61ecb..35156a7 100644 --- a/files/.xmonad/lib/Rofi.hs +++ b/files/.xmonad/lib/Rofi.hs @@ -28,10 +28,10 @@ instance Default RofiConfig where def = RofiConfig { theme = smallTheme, caseInsensitive = True, fuzzy = True } smallTheme :: String -smallTheme = "/home/leon/scripts/rofi-scripts/launcher_grid_style.rasi" +smallTheme = "/home/leon/scripts/rofi/launcher_grid_style.rasi" bigTheme :: String -bigTheme = "/home/leon/scripts/rofi-scripts/launcher_grid_full_style.rasi" +bigTheme = "/home/leon/scripts/rofi/launcher_grid_full_style.rasi" toArgList :: RofiConfig -> [String] toArgList RofiConfig {..} = concat diff --git a/files/auswahl/auswahlrc b/files/auswahl/auswahlrc index 506613d..617d6e6 100644 --- a/files/auswahl/auswahlrc +++ b/files/auswahl/auswahlrc @@ -1,4 +1,4 @@ -use: rofi -dmenu -i -theme /home/leon/scripts/rofi-scripts/default_theme.rasi +use: rofi -dmenu -i -theme /home/leon/scripts/rofi/default_theme.rasi menu: set-redshift :: -no-custom off => redshift -x diff --git a/files/nix-stuff/nixpkgs/config/zsh.nix b/files/nix-stuff/nixpkgs/config/zsh.nix index 6bef089..91a7dac 100644 --- a/files/nix-stuff/nixpkgs/config/zsh.nix +++ b/files/nix-stuff/nixpkgs/config/zsh.nix @@ -12,7 +12,7 @@ let gaa = "git add --all"; gs = "git status"; cxmonad = "cd ~/.xmonad && nvim ~/.xmonad/lib/Config.hs && cd -"; - cnix = "cd ~/nixpkgs/ && nvim && cd -"; + cnix = "cd ~/nixpkgs/ && nvim home.nix && cd -"; }; manFunction = '' diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix index 89a634e..e5e1431 100644 --- a/files/nix-stuff/nixpkgs/home.nix +++ b/files/nix-stuff/nixpkgs/home.nix @@ -98,6 +98,12 @@ in udiskie.enable = true; }; + + home.sessionVariables = { + LOCALE_ARCHIVE_2_11 = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = "/usr/bin/locale"; + }; home.username = "leon"; home.homeDirectory = "/home/leon"; diff --git a/files/scripts/rofi-open.sh b/files/scripts/rofi-open.sh index a700356..bc2a36c 100755 --- a/files/scripts/rofi-open.sh +++ b/files/scripts/rofi-open.sh @@ -3,11 +3,11 @@ groups="$(ls "$HOME/scripts/bookmarks")\nauswahl" -group_selection=$(echo -e "$groups" | rofi -i -matching fuzzy -p open -dmenu -no-custom -theme /home/leon/scripts/rofi-scripts/default_theme.rasi ) +group_selection=$(echo -e "$groups" | rofi -i -matching fuzzy -p open -dmenu -no-custom -theme /home/leon/scripts/rofi/default_theme.rasi ) if [ "$group_selection" = "auswahl" ]; then - auswahl "$(auswahl --list | rofi -dmenu -theme /home/leon/scripts/rofi-scripts/default_theme.rasi -i -no-custom)" + auswahl "$(auswahl --list | rofi -dmenu -theme /home/leon/scripts/rofi/default_theme.rasi -i -no-custom)" else - selection=$( cat "$HOME/scripts/bookmarks/$group_selection" | sed -r 's/^([^ ]*) .*$/\1/' | rofi -p open -matching fuzzy -dmenu -i -no-custom -theme /home/leon/scripts/rofi-scripts/default_theme.rasi ) + selection=$( cat "$HOME/scripts/bookmarks/$group_selection" | sed -r 's/^([^ ]*) .*$/\1/' | rofi -p open -matching fuzzy -dmenu -i -no-custom -theme /home/leon/scripts/rofi/default_theme.rasi ) [ -z "$selection" ] && exit 1 cat "$HOME/scripts/bookmarks/$group_selection" | sed -n -r "s/^$selection (.*)$/\1/p" | bash diff --git a/files/scripts/rofi-scripts/colors.rasi b/files/scripts/rofi/colors.rasi similarity index 100% rename from files/scripts/rofi-scripts/colors.rasi rename to files/scripts/rofi/colors.rasi diff --git a/files/scripts/rofi-scripts/colorschemes/arc-dark.rasi b/files/scripts/rofi/colorschemes/arc-dark.rasi similarity index 100% rename from files/scripts/rofi-scripts/colorschemes/arc-dark.rasi rename to files/scripts/rofi/colorschemes/arc-dark.rasi diff --git a/files/scripts/rofi-scripts/colorschemes/gruvbox.rasi b/files/scripts/rofi/colorschemes/gruvbox.rasi similarity index 100% rename from files/scripts/rofi-scripts/colorschemes/gruvbox.rasi rename to files/scripts/rofi/colorschemes/gruvbox.rasi diff --git a/files/scripts/rofi-scripts/colorschemes/teal.rasi b/files/scripts/rofi/colorschemes/teal.rasi similarity index 100% rename from files/scripts/rofi-scripts/colorschemes/teal.rasi rename to files/scripts/rofi/colorschemes/teal.rasi diff --git a/files/scripts/rofi-scripts/default_theme.rasi b/files/scripts/rofi/default_theme.rasi similarity index 100% rename from files/scripts/rofi-scripts/default_theme.rasi rename to files/scripts/rofi/default_theme.rasi diff --git a/files/scripts/rofi-scripts/launcher_grid_full_style.rasi b/files/scripts/rofi/launcher_grid_full_style.rasi similarity index 100% rename from files/scripts/rofi-scripts/launcher_grid_full_style.rasi rename to files/scripts/rofi/launcher_grid_full_style.rasi diff --git a/files/scripts/rofi-scripts/launcher_grid_style.rasi b/files/scripts/rofi/launcher_grid_style.rasi similarity index 100% rename from files/scripts/rofi-scripts/launcher_grid_style.rasi rename to files/scripts/rofi/launcher_grid_style.rasi