various changes, shell, programs, river
This commit is contained in:
parent
848457efd9
commit
b19a0a5a38
|
@ -67,6 +67,7 @@
|
||||||
./hosts/JWST/configuration.nix
|
./hosts/JWST/configuration.nix
|
||||||
nixos-hardware.nixosModules.dell-xps-15-9520
|
nixos-hardware.nixosModules.dell-xps-15-9520
|
||||||
nixos-hardware.nixosModules.common-gpu-nvidia-disable
|
nixos-hardware.nixosModules.common-gpu-nvidia-disable
|
||||||
|
{ nixpkgs.overlays = overlays; }
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
efiSupport = true;
|
efiSupport = true;
|
||||||
configurationLimit = 10;
|
configurationLimit = 10;
|
||||||
device = "nodev";
|
device = "nodev";
|
||||||
extraEntriesBeforeNixOS = true; # still primarily using void
|
# extraEntriesBeforeNixOS = true; # still primarily using void
|
||||||
extraEntries = ''
|
extraEntries = ''
|
||||||
menuentry "Void" {
|
menuentry "Void" {
|
||||||
search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
|
search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
|
||||||
|
@ -51,6 +51,7 @@
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
services.geoclue2.enable = true;
|
||||||
|
|
||||||
# Enable sound.
|
# Enable sound.
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
@ -87,14 +88,23 @@
|
||||||
programs.river.extraPackages = with pkgs; [
|
programs.river.extraPackages = with pkgs; [
|
||||||
swaylock
|
swaylock
|
||||||
swayidle
|
swayidle
|
||||||
|
brightnessctl
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.waybar.enable = true;
|
programs.sway.enable = true;
|
||||||
programs.nm-applet.enable = true;
|
programs.sway.extraPackages = with pkgs; [
|
||||||
|
swaylock
|
||||||
|
swayidle
|
||||||
|
brightnessctl
|
||||||
|
];
|
||||||
|
|
||||||
|
# programs.waybar.enable = true;
|
||||||
|
# programs.nm-applet.enable = true;
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
vim
|
vim
|
||||||
|
exfat
|
||||||
];
|
];
|
||||||
defaultPackages = with pkgs; [
|
defaultPackages = with pkgs; [
|
||||||
perl
|
perl
|
||||||
|
|
|
@ -13,6 +13,16 @@
|
||||||
"$HOME/.dotnet"
|
"$HOME/.dotnet"
|
||||||
];
|
];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
rnote
|
||||||
|
texlive.combined.scheme-medium
|
||||||
|
libsixel
|
||||||
|
aspell
|
||||||
|
aspellDicts.en
|
||||||
|
qalculate-qt
|
||||||
|
fzf
|
||||||
|
zathura
|
||||||
|
pyocd
|
||||||
|
screen
|
||||||
wineWowPackages.unstable
|
wineWowPackages.unstable
|
||||||
comic-mono
|
comic-mono
|
||||||
maple-mono
|
maple-mono
|
||||||
|
@ -32,7 +42,6 @@
|
||||||
p7zip
|
p7zip
|
||||||
cachix
|
cachix
|
||||||
aria
|
aria
|
||||||
killall
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,8 @@
|
||||||
programs.bat = {
|
programs.bat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.rofi = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,7 @@
|
||||||
"browser.download.manager.addToRecentDocs" = false;
|
"browser.download.manager.addToRecentDocs" = false;
|
||||||
};
|
};
|
||||||
search = {
|
search = {
|
||||||
|
force = true;
|
||||||
default = "Celtic Lite";
|
default = "Celtic Lite";
|
||||||
engines = {
|
engines = {
|
||||||
"Nix Packages" = {
|
"Nix Packages" = {
|
||||||
|
|
|
@ -6,8 +6,9 @@
|
||||||
|
|
||||||
services.gammastep = {
|
services.gammastep = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dawnTime = "8:00-9:30";
|
# dawnTime = "8:00-9:30";
|
||||||
duskTime = "22:30-0:00";
|
# duskTime = "22:30-0:00";
|
||||||
|
provider = "geoclue2";
|
||||||
tray = true;
|
tray = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
{lib, ...}: {
|
{lib, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./zsh.nix
|
# ./zsh.nix
|
||||||
./bash.nix
|
./bash.nix
|
||||||
|
./fish.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# enableBashIntegration = true;
|
# enableBashIntegration = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
|
enableFishIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
add_newline = false;
|
add_newline = false;
|
||||||
format = lib.concatStrings [
|
format = lib.concatStrings [
|
||||||
|
|
9
users/tacocat/shell/fish.nix
Normal file
9
users/tacocat/shell/fish.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{...}: {
|
||||||
|
programs.fish = {
|
||||||
|
enable = true;
|
||||||
|
interactiveShellInit = ''
|
||||||
|
fish_vi_key_bindings
|
||||||
|
set -g fish_greeting
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -4,7 +4,7 @@
|
||||||
server.enable = true;
|
server.enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
main = {
|
main = {
|
||||||
shell = "/usr/bin/env zsh";
|
shell = "/usr/bin/env fish";
|
||||||
font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
|
font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
|
||||||
};
|
};
|
||||||
colors = {
|
colors = {
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
|
# 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+Shift Return spawn 'foot'
|
||||||
riverctl map normal Super D spawn 'rofi -show drun'
|
riverctl map normal Super D spawn 'rofi -show drun'
|
||||||
|
@ -141,8 +142,8 @@ do
|
||||||
riverctl map $mode None XF86AudioNext spawn 'playerctl next'
|
riverctl map $mode None XF86AudioNext spawn 'playerctl next'
|
||||||
|
|
||||||
# Control screen backlight brightness with light (https://github.com/haikarainen/light)
|
# Control screen backlight brightness with light (https://github.com/haikarainen/light)
|
||||||
riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5'
|
riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl s +5%'
|
||||||
riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
|
riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl s 5%-'
|
||||||
done
|
done
|
||||||
|
|
||||||
# Set background and border color
|
# Set background and border color
|
||||||
|
@ -177,4 +178,11 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# autostart apps
|
# 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'"
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
dunst &
|
||||||
|
gammastep-indicator &
|
||||||
|
nm-applet --indicator &
|
||||||
waybar &
|
waybar &
|
||||||
|
|
||||||
# void linux specific setup
|
# void linux specific setup
|
||||||
if test -f ~/.config/river/void-setup; then
|
# if test -f ~/.config/river/void-setup; then
|
||||||
exec ~/.config/river/void-setup
|
# exec ~/.config/river/void-setup
|
||||||
exit
|
# exit
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
exec swayidle -w \
|
exec swayidle -w \
|
||||||
timeout 600 'swaylock -f -c 14171d' \
|
timeout 600 'swaylock -f -c 14171d' \
|
||||||
|
|
|
@ -150,8 +150,8 @@
|
||||||
|
|
||||||
#tags button {
|
#tags button {
|
||||||
/*font-weight: bold;*/
|
/*font-weight: bold;*/
|
||||||
padding-left: 4pt;
|
padding-left: 1pt;
|
||||||
padding-right: 4pt;
|
padding-right: 1pt;
|
||||||
color: @white;
|
color: @white;
|
||||||
background: @unfocused;
|
background: @unfocused;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue