balls
This commit is contained in:
parent
0bef89bc91
commit
ca239fe518
10 changed files with 117 additions and 172 deletions
|
|
@ -3,7 +3,7 @@
|
|||
#home-manager modules
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
#aux files to make finding specific things easier
|
||||
./nixvim
|
||||
./sway.nix
|
||||
|
|
@ -23,19 +23,13 @@
|
|||
};
|
||||
};
|
||||
programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
|
||||
#targets.genericLinux.enable = (!vars.isNixOS);
|
||||
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
settings.main.font = "monospace:size=10";
|
||||
#settings.colors.alpha = "0.8";
|
||||
};
|
||||
programs.ncmpcpp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
tags_separator = ";";
|
||||
};
|
||||
};
|
||||
|
||||
programs.foot.enable = true;
|
||||
programs.foot.settings.main.font = "monospace:size=10";
|
||||
|
||||
programs.ncmpcpp.enable = true;
|
||||
programs.ncmpcpp.settings.tags_separator = ";";
|
||||
|
||||
programs.password-store = {
|
||||
enable = true;
|
||||
package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-import]);
|
||||
|
|
@ -51,16 +45,18 @@
|
|||
type "pipewire"
|
||||
name "default pipewire"
|
||||
}
|
||||
audio_output {
|
||||
type "alsa"
|
||||
name "alsa"
|
||||
}
|
||||
'';
|
||||
};
|
||||
services.syncthing.enable = (vars.useSyncthing);
|
||||
|
||||
services.mpd-mpris = {
|
||||
enable = true;
|
||||
};
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.mpd-mpris.enable = true;
|
||||
|
||||
programs.waybar.enable = true;
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "beanigen";
|
||||
|
|
@ -72,17 +68,18 @@
|
|||
init.defaultBranch = "main";
|
||||
};
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
|
||||
configPackages = [ pkgs.xdg-desktop-portal-wlr ];
|
||||
};
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
wlrobs
|
||||
obs-backgroundremoval
|
||||
obs-pipewire-audio-capture
|
||||
];
|
||||
};
|
||||
# programs.obs-studio = {
|
||||
# enable = true;
|
||||
# plugins = with pkgs.obs-studio-plugins; [
|
||||
# wlrobs
|
||||
# obs-backgroundremoval
|
||||
# obs-pipewire-audio-capture
|
||||
# ];
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,48 +1,45 @@
|
|||
{pkgs, vars, ...}:{
|
||||
home.packages = with pkgs; [
|
||||
prismlauncher
|
||||
libgpod
|
||||
vesktop
|
||||
kdePackages.ark
|
||||
v4l-utils
|
||||
nextcloud-client
|
||||
blender-hip
|
||||
brightnessctl
|
||||
cinny-desktop
|
||||
libimobiledevice
|
||||
mpc
|
||||
strawberry
|
||||
# lmms
|
||||
kanshi
|
||||
emacs
|
||||
comma
|
||||
emacs
|
||||
firefox
|
||||
fzf
|
||||
gamescope
|
||||
gimp
|
||||
grim
|
||||
gtklock
|
||||
gzdoom
|
||||
hyfetch
|
||||
inkscape
|
||||
kanshi
|
||||
kdePackages.ark
|
||||
libgpod
|
||||
libimobiledevice
|
||||
libreoffice
|
||||
mpc
|
||||
nemo
|
||||
nextcloud-client
|
||||
openrct2
|
||||
openscad
|
||||
openutau
|
||||
wlr-randr
|
||||
grim
|
||||
slurp
|
||||
swaynotificationcenter
|
||||
udiskie
|
||||
gtklock
|
||||
swaybg
|
||||
gzdoom
|
||||
fzf
|
||||
openrct2
|
||||
wl-clipboard
|
||||
brightnessctl
|
||||
nemo
|
||||
xfce.ristretto
|
||||
xfce.tumbler
|
||||
inkscape
|
||||
hyfetch
|
||||
pamixer
|
||||
pavucontrol
|
||||
gimp
|
||||
prusa-slicer
|
||||
gamescope
|
||||
vlc
|
||||
playerctl
|
||||
firefox
|
||||
prismlauncher
|
||||
prusa-slicer
|
||||
slurp
|
||||
swaybg
|
||||
swaynotificationcenter
|
||||
udiskie
|
||||
v4l-utils
|
||||
libreoffice
|
||||
] ++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
|
||||
vesktop
|
||||
vlc
|
||||
wl-clipboard
|
||||
wlr-randr
|
||||
xfce.ristretto
|
||||
xfce.tumbler
|
||||
]; #++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{lib, osConfig, pkgs, vars, inputs, ...}:{
|
||||
{lib, pkgs, vars, ...}:{
|
||||
wayland.windowManager.sway = {
|
||||
package = pkgs.swayfx;
|
||||
enable = true;
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
workspaceLayout = "default";
|
||||
keybindings = lib.mkOptionDefault {
|
||||
"Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/screenshot-`date +%F-%T`.png";
|
||||
"Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf | xargs swaymsg exec --'";
|
||||
"Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf --bind=enter:replace-query+print-query | xargs swaymsg exec --'";
|
||||
"Mod4+t" = "exec foot --title music --app-id mpd-control-foot ncmpcpp";
|
||||
"XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0";
|
||||
"XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
"XF86AudioMedia" = "exec vlc";
|
||||
"XF86Launch1" = "exec nmcli device wifi rescan";
|
||||
"Shift_L+Control_L+B" = "exec playerctl position 10-";
|
||||
"Shift_L+Control_L+F" = "exec playerctl position 10+";
|
||||
"Shift_L+Control_L+F" = "exec--bind=enter:replace-query+print-query playerctl position 10+";
|
||||
"Mod4+w" = null;
|
||||
"Mod4+s" = null;
|
||||
|
||||
|
|
@ -83,22 +83,6 @@
|
|||
{ app_id = "^mpd-control-foot$";}
|
||||
{ con_mark = "DELTARUNE Chapter 1&2";}
|
||||
];
|
||||
# colors = {
|
||||
# focused = import ./swaycolors.nix;
|
||||
# focused = {
|
||||
# border = "#cba6f7";
|
||||
# };
|
||||
# focusedInactive = import ./swaycolors.nix;
|
||||
# focusedInactive = {
|
||||
# background = "#440c88";
|
||||
# indicator = "#440c88";
|
||||
# };
|
||||
# unfocused = import ./swaycolors.nix;
|
||||
# unfocused = {
|
||||
# background = "#440c88";
|
||||
# indicator = "#440c88";
|
||||
# };
|
||||
# };
|
||||
window = {
|
||||
titlebar = false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
"memory": {
|
||||
"format": " {avail} + {swapAvail} GiB",
|
||||
},
|
||||
|
||||
"cava": {
|
||||
"method": "pipewire",
|
||||
"format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
|
||||
|
|
@ -25,13 +26,16 @@
|
|||
"noise_reduction": 0.5,
|
||||
"sensitivity": 13,
|
||||
},
|
||||
|
||||
"disk": {
|
||||
"format": " {free} {path}",
|
||||
},
|
||||
|
||||
"cpu": {
|
||||
"format": " {usage}% {max_frequency}GHz",
|
||||
"states": { "highcpu": 85 },
|
||||
},
|
||||
|
||||
"group/dtray": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
|
|
@ -40,11 +44,13 @@
|
|||
},
|
||||
"modules": ["custom/arrow", "tray"]
|
||||
},
|
||||
|
||||
"group/audio": {
|
||||
"orientation": "inherit",
|
||||
"modules": ["wireplumber", ],
|
||||
"on-click": "pavucontrol",
|
||||
},
|
||||
|
||||
"group/mpdg": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
|
|
@ -54,33 +60,41 @@
|
|||
},
|
||||
"modules": ["mpd", "custom/playpause", "custom/prev", "custom/next"]
|
||||
},
|
||||
|
||||
"custom/playpause": {
|
||||
"format": "",
|
||||
"on-click": "mpc toggle"
|
||||
},
|
||||
|
||||
"custom/prev": {
|
||||
"format": "",
|
||||
"on-click": "mpc prev"
|
||||
},
|
||||
|
||||
"custom/next": {
|
||||
"format": "",
|
||||
"on-click": "mpc next"
|
||||
},
|
||||
|
||||
"custom/arrow": {
|
||||
"format": " ",
|
||||
"tooltip": false
|
||||
},
|
||||
|
||||
"tray": {
|
||||
"spacing": 5
|
||||
},
|
||||
|
||||
"clock": {
|
||||
"format": "{:%I:%M %p}",
|
||||
},
|
||||
|
||||
"wireplumber": {
|
||||
"on-click": "pavucontrol",
|
||||
"format": " {volume}%",
|
||||
"format-muted": " {volume}%",
|
||||
},
|
||||
|
||||
"mpd": {
|
||||
"on-click": "mpc toggle",
|
||||
"format-disconnected": "MPD seems to be down",
|
||||
|
|
@ -88,6 +102,7 @@
|
|||
"format": "{title} - {album} - {artist}",
|
||||
"format-paused": "{title} - {album} - {artist}",
|
||||
},
|
||||
|
||||
"battery": {
|
||||
"bat": "BAT0",
|
||||
"interval": 5,
|
||||
|
|
@ -100,6 +115,7 @@
|
|||
"format": "{icon} {capacity}%",
|
||||
"tooltip-format": "BAT0, {power}W"
|
||||
},
|
||||
|
||||
"battery#bat1": {
|
||||
"bat": "BAT1",
|
||||
"interval": 5,
|
||||
|
|
@ -112,6 +128,7 @@
|
|||
"format": "{icon} {capacity}%",
|
||||
"tooltip-format": "BAT1, {power}W"
|
||||
},
|
||||
|
||||
"battery#bat2": {
|
||||
"bat": "BAT2",
|
||||
"interval": 5,
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ window#waybar {
|
|||
border-radius: 10px;
|
||||
border: 0.2em solid #cba6f7;
|
||||
background: @surface2;
|
||||
min-height: 0;
|
||||
min-height: 0;
|
||||
margin: 0.2em;
|
||||
}
|
||||
#battery.warning {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue