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

adding a lot of little additions and tweaks for the updated nix

Browse source
This commit is contained in:
Chris Cochrun 2023-01-03 07:23:08 -06:00
parent b68e8c45d8
commit e47b3fa5ff
13 changed files with 70 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

7
README.org
View file

@ -439,6 +439,7 @@ alacritty
libsForQt5.bismuth libsForQt5.bismuth
libnotify libnotify
rofi-wayland rofi-wayland
wf-recorder
wofi wofi
waybar waybar
tridactyl-native tridactyl-native
@ -2341,7 +2342,9 @@ I also use home-manager for managing dotfiles. This means that everything is con
enable = true; enable = true;
}; };
home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; home.file.".config/hypr" = {
source = config.lib.file.mkOutOfStoreSymlink /home/chris/.dotfiles/hypr;
};
home.file.".config/dunst" = { home.file.".config/dunst" = {
source = ../dunst; source = ../dunst;
@ -2373,7 +2376,7 @@ I also use home-manager for managing dotfiles. This means that everything is con
home.file.".config/mpv" = { home.file.".config/mpv" = {
source = ../mpv; source = ../mpv;
recursive = true; recursive = false;
}; };
home.file.".config/imv" = { home.file.".config/imv" = {

4
eww/eww.yuck
View file

@ -6,7 +6,7 @@
(include "volume.yuck") (include "volume.yuck")
(defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'") (defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'")
(defpoll clock_full :interval "5s" "date '+\%b \%d, \%Y, \%l:\%M \%p'") (defpoll clock_full :interval "5s" "date '+\%a \%b \%d, \%-I:\%M \%p'")
(defpoll clock_date :interval "1h" "date '+%b %d, %Y'") (defpoll clock_date :interval "1h" "date '+%b %d, %Y'")
(defpoll calendar_day :interval "2h" "date '+%d'") (defpoll calendar_day :interval "2h" "date '+%d'")
(defpoll calendar_year :interval "2h" "date '+%Y'") (defpoll calendar_year :interval "2h" "date '+%Y'")
@ -204,7 +204,7 @@
:orientation "h" :orientation "h"
:spacing "0" :spacing "0"
(label (label
:text {HOST == "kaladin" ? clock_full : clock_time} :text clock_full
:class "clock_time_class" ) :class "clock_time_class" )
(revealer :transition "slideleft" (revealer :transition "slideleft"
:reveal {HOST == "kaladin" ? false : time_rev} :reveal {HOST == "kaladin" ? false : time_rev}

49
firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css
View file

@ -54,11 +54,10 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 5px; margin-top: 0px;
max-height: 20px;
min-width: 100% !important; min-width: 100% !important;
padding: 0 10px !important;
} }
.tab-icon-image { .tab-icon-image {
margin-top: 4px; margin-top: 4px;
} }
@ -71,43 +70,36 @@ the close button is positioned to the far right */
-moz-box-flex: 1 -moz-box-flex: 1
} }
.tab-label {
margin-top: 5px !important;
}
/* Tab close button */ /* Tab close button */
.tab-close-button { .tab-close-button {
opacity: 1 !important; opacity: 1 !important;
min-width: 10px; min-width: 30px;
} }
#tabs-newtab-button { #tabs-newtab-button {
visibility: hidden !important; visibility: hidden !important;
} }
#tabbrowser-tabs {
max-height: 30px !important;
margin-top: 0px !important;
margin-bottom: -5px !important;
padding-bottom: 0px !important;
max-height: 10px !important;
}
#TabsToolbar{ #TabsToolbar{
margin-top: 8px !important; margin-top: 0px !important;
margin-bottom: -1px !important;
padding-bottom: opx !important;
max-height: 30px; max-height: 30px;
} }
.tabbrowser-tab, .tab-background, .tab-stack { .tabbrowser-tab, .tab-background, .tab-stack {
margin-top: 0px !important; margin-top: 0px !important;
margin-bottom: 0px !important; max-height: 20px !important;
max-height: 10px !important;
border: none !important; border: none !important;
border-radius: 1px !important; border-radius: 1px !important;
} }
.tab-background { .tab-background {
margin-top: 0px !important; margin-top: 0px !important;
max-height: 10px !important; max-height: 20px !important;
} }
.tab-background[selected]:-moz-lwtheme { .tab-background[selected]:-moz-lwtheme {
@ -122,15 +114,6 @@ the close button is positioned to the far right */
padding: 0px !important; padding: 0px !important;
} }
.tab-close-button {
margin-top: 5px;
min-width: 25px !important;
}
#navigator-toolbox {
padding: 0px !important;
}
/* Autohide Navbar */ /* Autohide Navbar */
#nav-bar:not([customizing="true"]):not([inFullscreen]) { #nav-bar:not([customizing="true"]):not([inFullscreen]) {
@ -178,7 +161,7 @@ the close button is positioned to the far right */
} }
#urlbar[breakout][breakout-extend] { #urlbar[breakout][breakout-extend] {
margin-top: 14px !important; margin-top: 0px !important;
top: 0px !important; top: 0px !important;
} }
@ -187,13 +170,3 @@ the close button is positioned to the far right */
padding-block: calc(2px + (var(--uc-toolbar-height) - var(--urlbar-height)) / 2); padding-block: calc(2px + (var(--uc-toolbar-height) - var(--urlbar-height)) / 2);
padding-inline: calc(5px + 2px); padding-inline: calc(5px + 2px);
} }
#nav-bar-customization-target{
margin-top: 0px;
}
#nav-bar-overflow-button{
margin-top: 0px !important;
}
#PanelUI-button{
margin-top: 0px !important;
}

44
flake.lock generated
View file

@ -4,7 +4,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
@ -222,9 +222,7 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
@ -278,7 +276,7 @@
"inputs": { "inputs": {
"cargo2nix": "cargo2nix", "cargo2nix": "cargo2nix",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1671049146, "lastModified": 1671049146,
@ -298,7 +296,7 @@
"inputs": { "inputs": {
"extra-container": "extra-container", "extra-container": "extra-container",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
@ -318,16 +316,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1654275867, "lastModified": 1672262501,
"narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "release-22.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -365,6 +363,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1654275867,
"narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1670507980, "lastModified": 1670507980,
"narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
@ -380,7 +394,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1670700605, "lastModified": 1670700605,
"narHash": "sha256-5dlpATkcyITpdtMflhltuD+A3RNpsVI1Mb+dtKkll6Y=", "narHash": "sha256-5dlpATkcyITpdtMflhltuD+A3RNpsVI1Mb+dtKkll6Y=",
@ -396,7 +410,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1671983799,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
@ -420,7 +434,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"libre-presenter": "libre-presenter", "libre-presenter": "libre-presenter",
"nix-bitcoin": "nix-bitcoin", "nix-bitcoin": "nix-bitcoin",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
} }
}, },

4
hypr/hyprland.conf
View file

@ -103,6 +103,9 @@ windowrule=workspace 2,emacs
windowrule=float,btop windowrule=float,btop
windowrule=size 70% 70%,btop windowrule=size 70% 70%,btop
windowrule=center,btop windowrule=center,btop
windowrule=float,presenter
windowrule=size 80% 80%,presenter
windowrule=center,presenter
# example binds # example binds
bind=SUPER,RETURN,exec,alacritty bind=SUPER,RETURN,exec,alacritty
@ -191,3 +194,4 @@ exec-once=hyprpaper
exec-once=dunst exec-once=dunst
exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35" exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35"
exec-once=dbus-update-activation-environment --systemd --all exec-once=dbus-update-activation-environment --systemd --all
exec-once=jellyfin-mpv-shim

2
mpv/mpv.conf
View file

@ -2,7 +2,7 @@
osc=no osc=no
vo=gpu vo=gpu
af=scaletempo2 af=scaletempo2
autofit=2800 autofit=2800x1800
geometry=50%:50% geometry=50%:50%
# input-ipc-server="/tmp/mpvsocket" # input-ipc-server="/tmp/mpvsocket"
hwdec=auto hwdec=auto

2
scripts/emacslof
View file

@ -22,7 +22,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then
exit exit
else else
echo WAYLAND echo WAYLAND
emacsrg=$(wlrctl window list | rg Emacs) emacsrg=$(wlrctl window list | rg emacs)
emacswin=$(echo $emacsrg | sed 's/.*\: //') emacswin=$(echo $emacsrg | sed 's/.*\: //')
echo $emacswin echo $emacswin

2
scripts/startup.sh
View file

@ -4,13 +4,13 @@ kwalletd5 &
systemctl --user stop jellyfin-mpv-shim.service & systemctl --user stop jellyfin-mpv-shim.service &
systemctl --user stop nextcloud-client.service & systemctl --user stop nextcloud-client.service &
systemctl --user stop emacs.service & systemctl --user stop emacs.service &
killall .jellyfin-mpv-shim
/usr/lib/kdeconnectd & /usr/lib/kdeconnectd &
nm-applet & nm-applet &
greenclip daemon & greenclip daemon &
rbw-agent & rbw-agent &
emacs --daemon & emacs --daemon &
nextcloud --background & nextcloud --background &
jellyfin-mpv-shim &
killall eww killall eww

8
scripts/voldown
View file

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
touch /tmp/vol # killall volup
awesome-client "naughty.destroy_all_notifications()" # killall voldown
pamixer --allow-boost -d 5 pamixer --allow-boost -d 5
pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga
volume=$(pulsemixer --get-volume | awk '{print $1}' | cut -c 1-2) volume=$(pulsemixer --get-volume | awk '{print $1}')
echo $volume >> /tmp/vol echo $volume > /tmp/vol
eww open volume eww open volume

16
scripts/volup
View file

@ -1,20 +1,14 @@
#!/usr/bin/env bash #!/bin/sh
touch /tmp/vol # killall volup
touch /tmp/ewwvol # killall voldown
echo on > /tmp/ewwvol
pamixer --allow-boost -i 5 pamixer --allow-boost -i 5
pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga
volume=$(pulsemixer --get-volume | awk '{print $1}' | cut -c 1-2) volume=$(pulsemixer --get-volume | awk '{print $1}')
echo $volume >> /tmp/vol echo $volume > /tmp/vol
ewwvol=$(cat /tmp/ewwvol)
eww open volume eww open volume
sleep 3 sleep 3
if [[ ewwvol == "on" ]]; then
fi
eww close volume eww close volume

1
system/kaladin/configuration.nix
View file

@ -316,6 +316,7 @@
libsForQt5.bismuth libsForQt5.bismuth
libnotify libnotify
rofi-wayland rofi-wayland
wf-recorder
wofi wofi
waybar waybar
tridactyl-native tridactyl-native

1
system/syl/configuration.nix
View file

@ -335,6 +335,7 @@
libsForQt5.bismuth libsForQt5.bismuth
libnotify libnotify
rofi-wayland rofi-wayland
wf-recorder
wofi wofi
waybar waybar
tridactyl-native tridactyl-native

5
user/home.nix
View file

@ -346,7 +346,9 @@
enable = true; enable = true;
}; };
home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; home.file.".config/hypr" = {
source = config.lib.file.mkOutOfStoreSymlink /home/chris/.dotfiles/hypr;
};
home.file.".config/dunst" = { home.file.".config/dunst" = {
source = ../dunst; source = ../dunst;
@ -378,6 +380,7 @@
home.file.".config/mpv" = { home.file.".config/mpv" = {
source = ../mpv; source = ../mpv;
recursive = false;
}; };
home.file.".config/imv" = { home.file.".config/imv" = {