chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

general updates

Browse source
This commit is contained in:
Chris Cochrun 2022-09-04 10:52:38 -05:00
parent 19d514e405
commit 1776b30851
10 changed files with 138 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
README.org
View file

@ -329,6 +329,11 @@ alacritty
libsForQt5.bismuth
libnotify
rofi-wayland
waybar
eww
wlrctl
hyprpaper
swaylock-fancy
aha
glxinfo
vulkan-tools
@ -1035,10 +1040,30 @@ Dalinar's config is of course server oriented.
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
<<base-packages>>
vim
wget
yt-dlp
bat
ripgrep
ffmpeg-full
rsync
dutree
tmux
git
samba
exa
jq
fd
bc
sysstat
procs
btop
htop
unzip
#blesh
];
<<containers>>
virtualisation.docker.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@ -1058,20 +1083,43 @@ Dalinar's config is of course server oriented.
lidSwitchExternalPower = "ignore";
};
services.monero = {
enable = true;
dataDir = "/storage/monero";
};
# DDCLIENT
services.ddclient = {
enable = true;
domains = [
"nc.cochrun.xyz"
"home.cochrun.xyz"
"mail.cochrun.xyz"
"jelly.cochrun.xyz"
];
passwordFile = "/etc/nixos/ddclientp";
protocol = "namecheap";
use = "web, web=dynamicdns.park-your-domain.com/getip";
server = "dynamicdns.park-your-domain.com";
username = "cochrun.xyz";
configFile = /etc/nixos/ddclient.conf;
#domains = [
# "nc.cochrun.xyz"
# "home.cochrun.xyz"
# "mail.cochrun.xyz"
# "jelly.cochrun.xyz"
#];
#passwordFile = "/etc/nixos/ddclientp";
#protocol = "namecheap";
#use = "web, web=dynamicdns.park-your-domain.com/getip";
#server = "dynamicdns.park-your-domain.com";
#username = "cochrun.xyz";
#extraConfig = ''
#use=web, web=dynamicdns.park-your-domain.com/getip
#protocol=namecheap
#server=dynamicdns.park-your-domain.com
#login=livingseedco.shop
#password=e157e42337fc4ccd850d0a3904733f46
#@
#use=web, web=dynamicdns.park-your-domain.com/getip
#protocol=namecheap
#server=dynamicdns.park-your-domain.com
#login=cochrun.xyz
#password=94602c373f9f4743838bf567def2eb72
#@,nc.cochrun.xyz,home.cochrun.xyz,mail.cochrun.xyz,jelly.cochrun.xyz
#'';
};
# CADDY
@ -1082,11 +1130,26 @@ Dalinar's config is of course server oriented.
reverse_proxy localhost:8123
'';
};
virtualHosts = {
"jelly.cochrun.xyz".extraConfig = ''
reverse_proxy localhost:8096
'';
};
virtualHosts = {
"livingseedco.shop".extraConfig = ''
reverse_proxy localhost:8282
'';
};
virtualHosts = {
"sonarr.cochrun.xyz".extraConfig = ''
reverse_proxy localhost:7879
'';
};
virtualHosts = {
"192.168.1.2".extraConfig = ''
reverse_proxy localhost:9091
'';
};
virtualHosts = {
"nc.cochrun.xyz".extraConfig = ''
reverse_proxy localhost:8080
@ -1175,7 +1238,7 @@ Dalinar's hardware
I also use home-manager for managing dotfiles. This means that everything is contained in this folder and then tangled out to their respective places when rebuilding the system.
#+begin_src nix :tangle user/home.nix
{ config, pkgs, ... }:
{ config, lib, pkgs, ... }:
{
# Home Manager needs a bit of information about you and the
@ -1418,7 +1481,7 @@ I also use home-manager for managing dotfiles. This means that everything is con
services.nextcloud-client = {
enable = true;
# startInBackground = true;
startInBackground = true;
};
services.syncthing.enable = true;
@ -1689,7 +1752,7 @@ I also use home-manager for managing dotfiles. This means that everything is con
};
Install = {
WantedBy = ["multi-user.target"];
WantedBy = ["graphical-session.target"];
};
};
@ -1706,6 +1769,16 @@ I also use home-manager for managing dotfiles. This means that everything is con
WantedBy = ["default.target"];
};
};
nextlcoud-client = {
Unit = {
Description = "Nextcloud Client";
After = [ "plasma-workspace.target" ];
# PartOf = [ "plasma-workspace.target" ];
};
# Install = { WantedBy = [ "plasma-workspace.target" ]; };
};
};
}

14
eww/eww.yuck
View file

@ -14,10 +14,10 @@
:initial "getvol"
'tail -F /tmp/vol')
(defwidget volslider []
(box :orientation "horizontal"
:halign "center"
volume
(scale :value volume
:min 0
:max 100)))
;; (defwidget volslider []
;; (box :orientation "horizontal"
;; :halign "center"
;; volume
;; (scale :value volume
;; :min 0
;; :max 100)))

2
rofi/launchers-git/launcher.sh
View file

@ -12,7 +12,7 @@ else
#echo "this is not hidpi"
fi
rofi -no-lazy-grab -show combi -combi-modi "drun,run" -theme launchers-git/"$style".rasi
rofi -no-lazy-grab -modi combi -show combi -combi-modi "drun,run" -theme launchers-git/"$style".rasi
# $@ &

11
scripts/emacslof
View file

@ -2,11 +2,12 @@
# Check to see if an emacsclient is running
if [ $(pgrep -c emacsclient) -gt 0 ]; then
echo hi
if [ $XDG_SESSION_TYPE = "x11" ]; then
if [ "$XDG_SESSION_TYPE" == "x11" ]; then
#X11
emacsrg=$(wmctrl -lx | rg emacs.Emacs | rg -v org-agenda | awk '{print $1}')
# echo $emacsrg
echo $emacsrg
if [ -z $emacsrg ]; then
exec emacsclient -c &
@ -16,15 +17,15 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then
exit
fi
else
if [ $KDE_FULL_SESSION = "true" ]; then
if [ "$KDE_FULL_SESSION" == "true" ]; then
exec /home/chris/bin/ww -fa Emacs -c emacsclient
exit
else
# WAYLAND
emacsrg=$(wlrctl window list | rg -v 'emacs:\sorg-agenda' | rg 'emacs:')
emacsrg=$(wlrctl window list | rg -v 'Emacs:\sorg-agenda' | rg 'Emacs:')
emacswin=$(echo $emacsrg | sed 's/.*\: //')
# echo $emacswin
echo $emacswin
exec wlrctl toplevel focus title:"$emacswin"
exit

6
scripts/fflof
View file

@ -6,7 +6,7 @@ echo $MOZ_ENABLE_WAYLAND
if [ $(pgrep -c firefox) -gt 0 ]; then
echo "ff running"
if [ $XDG_SESSION_TYPE = "x11" ]; then
if [ "$XDG_SESSION_TYPE" = "x11" ]; then
#X11
ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}')
# echo $emacsrg
@ -19,7 +19,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
exit
fi
else
if [ $KDE_FULL_SESSION = "true" ]; then
if [ "$KDE_FULL_SESSION" = "true" ]; then
echo "KDE"
exec /home/chris/bin/ww -f firefox -c firefox
exit
@ -30,7 +30,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
ffwin=$(echo $ffrg | sed 's/.*\: //')
# echo $ffwin
exec wlrctl toplevel focus title:"$ffwin"
exec wlrctl toplevel focus firefox
exit
fi
fi

6
scripts/startup.sh
View file

@ -2,9 +2,9 @@
waybar &
rbw-agent &
killall jellyfin-mpv-shim && jellyfin-mpv-shim &
systemctl --user restart jellyfin-mpv-shim.service &
systemctl --user restart nextcloud-client.service &
systemctl --user restart emacs.service &
/usr/lib/kdeconnectd &
emacs --daemon &
nm-applet &
nextcloud --background &
greenclip daemon &

5
system/kaladin/configuration.nix
View file

@ -229,6 +229,11 @@
libsForQt5.bismuth
libnotify
rofi-wayland
waybar
eww
wlrctl
hyprpaper
swaylock-fancy
aha
glxinfo
vulkan-tools

5
system/syl/configuration.nix
View file

@ -242,6 +242,11 @@
libsForQt5.bismuth
libnotify
rofi-wayland
waybar
eww
wlrctl
hyprpaper
swaylock-fancy
aha
glxinfo
vulkan-tools

16
user/home.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, lib, pkgs, ... }:
{
# Home Manager needs a bit of information about you and the
@ -241,7 +241,7 @@
services.nextcloud-client = {
enable = true;
# startInBackground = true;
startInBackground = true;
};
services.syncthing.enable = true;
@ -512,7 +512,7 @@
};
Install = {
WantedBy = ["multi-user.target"];
WantedBy = ["graphical-session.target"];
};
};
@ -529,6 +529,16 @@
WantedBy = ["default.target"];
};
};
nextlcoud-client = {
Unit = {
Description = "Nextcloud Client";
After = [ "plasma-workspace.target" ];
# PartOf = [ "plasma-workspace.target" ];
};
# Install = { WantedBy = [ "plasma-workspace.target" ]; };
};
};
}

9
waybar/config
View file

@ -4,7 +4,7 @@
"height": 30, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
// Choose the order of the modules "custom/wintitle",
"modules-left": ["sway/workspaces", "custom/wintitle", "river/tags", "sway/mode", "sway/window"],
"modules-left": ["sway/workspaces", "custom/wintitle", "hyprland/window", "river/tags", "sway/mode", "sway/window"],
"modules-center": ["clock"],
"modules-right": ["pulseaudio", "network", "memory", "cpu", "battery", "battery#bat2", "tray"],
"margin-top": 0,
@ -30,6 +30,9 @@
"river/tags": {
"num-tags": 8
},
"hyprland/window": {
"format": "{}"
},
"sway/mode": {
"format": "<span style=\"italic\"> {}</span>"
},
@ -41,7 +44,7 @@
}
},
"tray": {
// "icon-size": 21,
"icon-size": 21,
"spacing": 10
},
"clock": {
@ -146,7 +149,7 @@
// "default": "🎜"
//},
"interval": 1,
"exec": "wintitle"
"exec": "/home/chris/bin/wintitle"
},
"wlr/taskbar": {
"format": "{icon}",