diff --git a/flake.nix b/flake.nix index 3b4c780..e7bcadf 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ ./hosts/JWST/configuration.nix nixos-hardware.nixosModules.dell-xps-15-9520 nixos-hardware.nixosModules.common-gpu-nvidia-disable + { nixpkgs.overlays = overlays; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix index 759cfd7..be1ea96 100644 --- a/hosts/JWST/configuration.nix +++ b/hosts/JWST/configuration.nix @@ -18,7 +18,7 @@ efiSupport = true; configurationLimit = 10; device = "nodev"; - extraEntriesBeforeNixOS = true; # still primarily using void + # extraEntriesBeforeNixOS = true; # still primarily using void extraEntries = '' menuentry "Void" { search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f @@ -51,6 +51,7 @@ # Enable CUPS to print documents. services.printing.enable = true; + services.geoclue2.enable = true; # Enable sound. sound.enable = true; @@ -87,14 +88,23 @@ programs.river.extraPackages = with pkgs; [ swaylock swayidle + brightnessctl ]; - programs.waybar.enable = true; - programs.nm-applet.enable = true; + programs.sway.enable = true; + programs.sway.extraPackages = with pkgs; [ + swaylock + swayidle + brightnessctl + ]; + + # programs.waybar.enable = true; + # programs.nm-applet.enable = true; environment = { systemPackages = with pkgs; [ vim + exfat ]; defaultPackages = with pkgs; [ perl diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index c4ccfee..cd2bced 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -13,6 +13,16 @@ "$HOME/.dotnet" ]; packages = with pkgs; [ + rnote + texlive.combined.scheme-medium + libsixel + aspell + aspellDicts.en + qalculate-qt + fzf + zathura + pyocd + screen wineWowPackages.unstable comic-mono maple-mono @@ -32,7 +42,6 @@ p7zip cachix aria - killall ]; }; diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix index 6a683dd..a677d81 100644 --- a/users/tacocat/programs/default.nix +++ b/users/tacocat/programs/default.nix @@ -15,4 +15,8 @@ programs.bat = { enable = true; }; + + programs.rofi = { + enable = true; + }; } diff --git a/users/tacocat/programs/firefox.nix b/users/tacocat/programs/firefox.nix index 9e91783..77d317f 100644 --- a/users/tacocat/programs/firefox.nix +++ b/users/tacocat/programs/firefox.nix @@ -51,6 +51,7 @@ "browser.download.manager.addToRecentDocs" = false; }; search = { + force = true; default = "Celtic Lite"; engines = { "Nix Packages" = { diff --git a/users/tacocat/services/default.nix b/users/tacocat/services/default.nix index fa24a58..0ebba1f 100644 --- a/users/tacocat/services/default.nix +++ b/users/tacocat/services/default.nix @@ -6,8 +6,9 @@ services.gammastep = { enable = true; - dawnTime = "8:00-9:30"; - duskTime = "22:30-0:00"; + # dawnTime = "8:00-9:30"; + # duskTime = "22:30-0:00"; + provider = "geoclue2"; tray = true; }; diff --git a/users/tacocat/shell/default.nix b/users/tacocat/shell/default.nix index 4ee84a8..3eeba85 100644 --- a/users/tacocat/shell/default.nix +++ b/users/tacocat/shell/default.nix @@ -1,13 +1,15 @@ {lib, ...}: { imports = [ - ./zsh.nix + # ./zsh.nix ./bash.nix + ./fish.nix ]; programs.starship = { enable = true; # enableBashIntegration = true; enableZshIntegration = true; + enableFishIntegration = true; settings = { add_newline = false; format = lib.concatStrings [ diff --git a/users/tacocat/shell/fish.nix b/users/tacocat/shell/fish.nix new file mode 100644 index 0000000..1bf8db8 --- /dev/null +++ b/users/tacocat/shell/fish.nix @@ -0,0 +1,9 @@ +{...}: { + programs.fish = { + enable = true; + interactiveShellInit = '' + fish_vi_key_bindings + set -g fish_greeting + ''; + }; +} diff --git a/users/tacocat/wayland/foot.nix b/users/tacocat/wayland/foot.nix index 18a78da..1d876c7 100644 --- a/users/tacocat/wayland/foot.nix +++ b/users/tacocat/wayland/foot.nix @@ -4,7 +4,7 @@ server.enable = true; settings = { main = { - shell = "/usr/bin/env zsh"; + shell = "/usr/bin/env fish"; font = "Mononoki:size=14,FiraCode Nerd Font:size=14"; }; colors = { diff --git a/users/tacocat/wayland/river/init b/users/tacocat/wayland/river/init index 5fab82f..6538147 100755 --- a/users/tacocat/wayland/river/init +++ b/users/tacocat/wayland/river/init @@ -5,7 +5,8 @@ # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. -riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river" +# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river" +riverctl spawn "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP" riverctl map normal Super+Shift Return spawn 'foot' riverctl map normal Super D spawn 'rofi -show drun' @@ -141,8 +142,8 @@ do riverctl map $mode None XF86AudioNext spawn 'playerctl next' # Control screen backlight brightness with light (https://github.com/haikarainen/light) - riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5' - riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5' + riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl s +5%' + riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl s 5%-' done # Set background and border color @@ -177,4 +178,11 @@ else fi # autostart apps -"$HOME/.config/river/process" +# riverctl spawn "$HOME/.config/river/process" +riverctl spawn 'dunst' +riverctl spawn 'gammastep-indicator' +riverctl spawn 'nm-applet --indicator' +riverctl spawn 'waybar' +riverctl spawn "swayidle -w \ + timeout 600 'swaylock -f -c 14171d' \ + before-sleep 'swaylock -f -c 14171d'" diff --git a/users/tacocat/wayland/river/process b/users/tacocat/wayland/river/process index 6ea77e0..55582e8 100755 --- a/users/tacocat/wayland/river/process +++ b/users/tacocat/wayland/river/process @@ -1,12 +1,15 @@ #!/usr/bin/env bash +dunst & +gammastep-indicator & +nm-applet --indicator & waybar & # void linux specific setup -if test -f ~/.config/river/void-setup; then - exec ~/.config/river/void-setup - exit -fi +# if test -f ~/.config/river/void-setup; then +# exec ~/.config/river/void-setup +# exit +# fi exec swayidle -w \ timeout 600 'swaylock -f -c 14171d' \ diff --git a/users/tacocat/wayland/waybar/style.css b/users/tacocat/wayland/waybar/style.css index a399b53..7b297bc 100644 --- a/users/tacocat/wayland/waybar/style.css +++ b/users/tacocat/wayland/waybar/style.css @@ -150,8 +150,8 @@ #tags button { /*font-weight: bold;*/ - padding-left: 4pt; - padding-right: 4pt; + padding-left: 1pt; + padding-right: 1pt; color: @white; background: @unfocused; }