treewide: read commit description
What changed here was: - I updated the lock file - I added ZNC to my services - I moved my services to a new directory - I renamed my user to arturm - I renamed my system to cityseventeen - I moved to en_US.UTF-8 - I switched to using Rose Pine - I added a Mako option - Some refactoring where it was needed These are all changes I forgot to commit, I had intentions of commiting them but I didn't until now. Oops!
This commit is contained in:
parent
0d7aa6843b
commit
cddcce6db9
SSH key fingerprint:
SHA256:ubvwT66gNUKSsgSzEb2UQnX8pzTq5N+r8eRVYGJJm4Q
20 changed files with 380 additions and 226 deletions
|
|
@ -1,29 +1,29 @@
|
|||
[main]
|
||||
pad=12x12
|
||||
font=monospace:size=16.5
|
||||
font=monospace:size=13
|
||||
|
||||
[colors]
|
||||
foreground=a9b1d6
|
||||
background=1a1b26
|
||||
regular0=16161e # black
|
||||
regular1=c0caf5 # red
|
||||
regular2=9ece6a # green
|
||||
regular3=0db9d7 # yellow
|
||||
regular4=2ac3de # blue
|
||||
regular5=bb9af7 # magenta
|
||||
regular6=b4f9f8 # cyan
|
||||
regular7=cbccd1 # white
|
||||
bright0=2f3549 # bright black
|
||||
bright1=c0caf5 # bright red
|
||||
bright2=9ece6a # bright green
|
||||
bright3=0db9d7 # bright yellow
|
||||
bright4=2ac3de # bright blue
|
||||
bright5=bb9af7 # bright magenta
|
||||
bright6=b4f9f8 # bright cyan
|
||||
bright7=d5d6db # bright white
|
||||
16=a9b1d6
|
||||
17=f7768e
|
||||
18=16161e
|
||||
19=2f3549
|
||||
20=787c99
|
||||
21=cbccd1
|
||||
foreground=e0def4
|
||||
background=191724
|
||||
regular0=1f1d2e # black
|
||||
regular1=eb6f92 # red
|
||||
regular2=31748f # green
|
||||
regular3=ebbcba # yellow
|
||||
regular4=c4a7e7 # blue
|
||||
regular5=f6c177 # magenta
|
||||
regular6=9ccfd8 # cyan
|
||||
regular7=e0def4 # white
|
||||
bright0=26233a # bright black
|
||||
bright1=eb6f92 # bright red
|
||||
bright2=31748f # bright green
|
||||
bright3=ebbcba # bright yellow
|
||||
bright4=c4a7e7 # bright blue
|
||||
bright5=f6c177 # bright magenta
|
||||
bright6=9ccfd8 # bright cyan
|
||||
bright7=524f67 # bright white
|
||||
16=f6c177
|
||||
17=524f67
|
||||
18=1f1d2e
|
||||
19=26233a
|
||||
20=908caa
|
||||
21=e0def4
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
# output=<not set>
|
||||
font=Monospace:size=16
|
||||
font=Monospace:size=13
|
||||
# dpi-aware=auto
|
||||
# use-bold=no
|
||||
# prompt="> "
|
||||
prompt=" "
|
||||
# placeholder=
|
||||
# icon-theme=hicolor
|
||||
# icons-enabled=yes
|
||||
icons-enabled=no
|
||||
# hide-before-typing=no
|
||||
# fields=filename,name,generic
|
||||
# password-character=*
|
||||
|
|
@ -16,14 +16,14 @@ font=Monospace:size=16
|
|||
# delayed-filter-ms=300
|
||||
# delayed-filter-limit=20000
|
||||
# show-actions=no
|
||||
# terminal=$TERMINAL -e # Note: you cannot actually use environment variables here
|
||||
terminal=foot -e # Note: you cannot actually use environment variables here
|
||||
# launch-prefix=<not set>
|
||||
# list-executables-in-path=no
|
||||
|
||||
# anchor=center
|
||||
# x-margin=0
|
||||
# y-margin=0
|
||||
# lines=15
|
||||
lines=10
|
||||
# width=30
|
||||
# tabs=8
|
||||
# horizontal-pad=40
|
||||
|
|
@ -45,13 +45,13 @@ font=Monospace:size=16
|
|||
# match-workers=<number of logical CPUs>
|
||||
|
||||
[colors]
|
||||
background=1A1B26ff
|
||||
text=A9B1D6ff
|
||||
match=2AC3DEff
|
||||
selection=444B6Aff
|
||||
selection-text=CBCCD1ff
|
||||
selection-match=2AC3DEff
|
||||
border=A9B1D6ff
|
||||
background=191724ff
|
||||
text=e0def4ff
|
||||
match=9ccfd8ff
|
||||
selection=26233aff
|
||||
selection-text=908caaff
|
||||
selection-match=ebbcbaff
|
||||
border=9ccfd8ff
|
||||
|
||||
[border]
|
||||
width=1
|
||||
|
|
|
|||
|
|
@ -1,110 +1,110 @@
|
|||
[alias]
|
||||
a=add
|
||||
aa=add .
|
||||
aliases=! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM=$(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^ ||'
|
||||
ap=add -p
|
||||
b=! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'
|
||||
bD=branch -D
|
||||
ba=branch -a
|
||||
bc=branch -c
|
||||
bd=branch -d
|
||||
br=branch -r
|
||||
c=! git commit --verbose; git push
|
||||
ca=! git c --amend
|
||||
cf=! git commit --verbose; git push --force
|
||||
ch=switch -C
|
||||
change=switch -C
|
||||
cl=clone
|
||||
cm=commit -m
|
||||
co=checkout
|
||||
cp=cherry-pick ; usually abusive; sometimes necessary
|
||||
create=! git bc
|
||||
d=diff
|
||||
dc=diff --cached
|
||||
ds=diff --stat
|
||||
expire=! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now
|
||||
f=fetch
|
||||
fe=fetch
|
||||
filelog=log --patch
|
||||
find=! git ls-files | grep -i
|
||||
fl=log --patch
|
||||
fp=fetch --prune ; removes branches not in upstream
|
||||
gr=grep -Ii
|
||||
grep=grep -Ii
|
||||
greproot=! git grr
|
||||
grr=! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f
|
||||
invert=revert
|
||||
l=log --oneline --graph --decorate --parents
|
||||
lasttag=describe --tags --abbrev=0
|
||||
ll=log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
||||
lref=log --oneline --graph --decorate --parents --reflog
|
||||
ls=log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
|
||||
lt=describe --tags --abbrev=0
|
||||
mailmap=! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f
|
||||
one=log -1 ; no input displays HEAD
|
||||
pd=push -d
|
||||
pf=push --force
|
||||
pl=pull
|
||||
pp=pull --prune ; removes branches not in upstream
|
||||
pr=pull --rebase ; rebases commits onto upstream
|
||||
ps=push
|
||||
pt=! f(){ git push $1 tag $2; }; f
|
||||
r=rebase
|
||||
ra=rebase --skip
|
||||
rc=rebase --continue
|
||||
re=restore
|
||||
ref=reflog
|
||||
ri=rebase --interactive
|
||||
rm=rm -r
|
||||
rmf=! git rm --force
|
||||
rq=rebase --quit
|
||||
rs=rebase --abort
|
||||
sh=show
|
||||
st=status
|
||||
sw=switch ; new checkout - only switching branch w/o restoring worktree
|
||||
sync=! git fe upstream; git rebase upstream/main; git push
|
||||
t=tag
|
||||
td=tag --delete
|
||||
un=restore --staged --worktree
|
||||
uncommit=switch -C
|
||||
undo=restore --staged --worktree
|
||||
undo-specific=! f(){ git restore --source=\"$1\" $2; }; f
|
||||
undo-stage=restore
|
||||
undo-unstaged=restore
|
||||
undo-work=restore --staged --worktree
|
||||
undo-wt=restore --staged --worktree
|
||||
unstage=restore --staged
|
||||
wa=! f(){ git worktree add ../$1 $1; }; f
|
||||
wc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f
|
||||
wcreate=! git wc
|
||||
wmv=worktree move
|
||||
wnew=! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f
|
||||
wr=worktree remove
|
||||
wrm=! git wr
|
||||
wsc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f
|
||||
wshallow=! git wsc
|
||||
a = "add"
|
||||
aa = "add ."
|
||||
aliases = "! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM= $(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^ ||'"
|
||||
ap = "add -p"
|
||||
b = "! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'"
|
||||
bD = "branch -D"
|
||||
ba = "branch -a"
|
||||
bc = "branch -c"
|
||||
bd = "branch -d"
|
||||
br = "branch -r"
|
||||
c = "! git commit --verbose; git push"
|
||||
ca = "! git c --amend"
|
||||
cf = "! git commit --verbose; git push --force"
|
||||
ch = "switch -C"
|
||||
change = "switch -C"
|
||||
cl = "clone"
|
||||
cm = "commit -m"
|
||||
co = "checkout "
|
||||
cp = "cherry-pick ; usually abusive; sometimes necessary"
|
||||
create = "! git bc"
|
||||
d = "diff"
|
||||
dc = "diff --cached"
|
||||
ds = "diff --stat"
|
||||
expire = "! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now"
|
||||
f = "fetch"
|
||||
fe = "fetch"
|
||||
filelog = "log --patch"
|
||||
find = "! git ls-files | grep -i"
|
||||
fl = "log --patch"
|
||||
fp = "fetch --prune ; removes branches not in upstream"
|
||||
gr = "grep -Ii"
|
||||
grep = "grep -Ii"
|
||||
greproot = "! git grr"
|
||||
grr = "! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f"
|
||||
invert = "revert"
|
||||
l = "log --oneline --graph --decorate --parents"
|
||||
lasttag = "describe --tags --abbrev=0"
|
||||
ll = "log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat"
|
||||
lref = "log --oneline --graph --decorate --parents --reflog"
|
||||
ls = "log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short"
|
||||
lt = "describe --tags --abbrev=0"
|
||||
mailmap = "! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f"
|
||||
one = "log -1 ; no input displays HEAD"
|
||||
pd = "push -d"
|
||||
pf = "push --force"
|
||||
pl = "pull"
|
||||
pp = "pull --prune ; removes branches not in upstream"
|
||||
pr = "pull --rebase ; rebases commits onto upstream"
|
||||
ps = "push"
|
||||
pt = "! f(){ git push $1 tag $2; }; f"
|
||||
r = "rebase"
|
||||
ra = "rebase --skip"
|
||||
rc = "rebase --continue"
|
||||
re = "restore"
|
||||
ref = "reflog"
|
||||
ri = "rebase --interactive"
|
||||
rm = "rm -r"
|
||||
rmf = "! git rm --force"
|
||||
rq = "rebase --quit"
|
||||
rs = "rebase --abort"
|
||||
sh = "show"
|
||||
st = "status"
|
||||
sw = "switch ; new checkout - only switching branch w/o restoring worktree"
|
||||
sync = "! git fe upstream; git rebase upstream/main; git push"
|
||||
t = "tag"
|
||||
td = "tag --delete"
|
||||
un = "restore --staged --worktree"
|
||||
uncommit = "switch -C"
|
||||
undo = "restore --staged --worktree"
|
||||
undo-specific = "! f(){ git restore --source=\"$1\" $2; }; f"
|
||||
undo-stage = "restore"
|
||||
undo-unstaged = "restore"
|
||||
undo-work = "restore --staged --worktree"
|
||||
undo-wt = "restore --staged --worktree"
|
||||
unstage = "restore --staged"
|
||||
wa = "! f(){ git worktree add ../$1 $1; }; f"
|
||||
wc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f"
|
||||
wcreate = "! git wc"
|
||||
wmv = "worktree move"
|
||||
wnew = "! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f"
|
||||
wr = "worktree remove"
|
||||
wrm = "! git wr"
|
||||
wsc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f"
|
||||
wshallow = "! git wsc"
|
||||
|
||||
[branch]
|
||||
autosetuprebase=always
|
||||
autosetuprebase = "always"
|
||||
|
||||
[color]
|
||||
branch=auto
|
||||
diff=auto
|
||||
status=auto
|
||||
branch = "auto"
|
||||
diff = "auto"
|
||||
status = "auto"
|
||||
|
||||
[commit]
|
||||
gpgsign=true
|
||||
gpgsign = "true"
|
||||
|
||||
[gpg]
|
||||
format=ssh
|
||||
format = "ssh"
|
||||
|
||||
[user]
|
||||
email=amad@atl.tools
|
||||
name=Artur Manuel
|
||||
signingKey=~/.ssh/id_ed25519.pub
|
||||
email = "amad@atl.tools"
|
||||
name = "Artur Manuel"
|
||||
signingKey = "~/.ssh/id_ed25519.pub"
|
||||
|
||||
[init]
|
||||
defaultBranch = "main"
|
||||
|
||||
[credential]
|
||||
helper = "git-credential-libsecret"
|
||||
helper ="git-credential-libsecret"
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
font=monospace 15
|
||||
font=monospace 13
|
||||
width=450
|
||||
height=220
|
||||
text-color=#A9B1D6ff
|
||||
background-color=#16161Eff
|
||||
border-color=#0DB9D7ff
|
||||
border-size=1
|
||||
text-color=#e0def4ff
|
||||
background-color=#191724ff
|
||||
border-color=#9ccfd8ff
|
||||
border-size=1
|
||||
|
||||
[mode=do-not-disturb]
|
||||
invisible=1
|
||||
|
|
@ -190,8 +190,8 @@ layout {
|
|||
// off
|
||||
|
||||
width 1
|
||||
active-color "#b4f9f8"
|
||||
inactive-color "#16161e"
|
||||
active-color "#9ccfd8"
|
||||
inactive-color "#191724"
|
||||
|
||||
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
||||
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
||||
|
|
@ -518,6 +518,6 @@ binds {
|
|||
}
|
||||
|
||||
cursor {
|
||||
xcursor-theme "Simp1e-Tokyo-Night"
|
||||
xcursor-theme "BreezeX-RosePine-Linux"
|
||||
xcursor-size 24
|
||||
}
|
||||
}
|
||||
|
|
@ -2,26 +2,26 @@ from theme import load_theme
|
|||
|
||||
config.load_autoconfig()
|
||||
|
||||
tokyo_night = {
|
||||
"base00": "#1a1b26",
|
||||
"base01": "#16161e",
|
||||
"base02": "#2f3549",
|
||||
"base03": "#444b6a",
|
||||
"base04": "#787c99",
|
||||
"base05": "#a9b1d6",
|
||||
"base06": "#cbccd1",
|
||||
"base07": "#d5d6db",
|
||||
"base08": "#c0caf5",
|
||||
"base09": "#a9b1d6",
|
||||
"base0A": "#0db9d7",
|
||||
"base0B": "#9ece6a",
|
||||
"base0C": "#b4f9f8",
|
||||
"base0D": "#2ac3de",
|
||||
"base0E": "#bb9af7",
|
||||
"base0F": "#f7768e",
|
||||
theme = {
|
||||
"base00": "#191724",
|
||||
"base01": "#1f1d2e",
|
||||
"base02": "#26233a",
|
||||
"base03": "#6e6a86",
|
||||
"base04": "#908caa",
|
||||
"base05": "#e0def4",
|
||||
"base06": "#e0def4",
|
||||
"base07": "#524f67",
|
||||
"base08": "#eb6f92",
|
||||
"base09": "#f6c177",
|
||||
"base0A": "#ebbcba",
|
||||
"base0B": "#31748f",
|
||||
"base0C": "#9ccfd8",
|
||||
"base0D": "#c4a7e7",
|
||||
"base0E": "#f6c177",
|
||||
"base0F": "#524f67",
|
||||
}
|
||||
|
||||
load_theme(c, tokyo_night)
|
||||
load_theme(c, theme)
|
||||
|
||||
c.colors.webpage.preferred_color_scheme = "dark"
|
||||
c.tabs.position = "top"
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
@define-color base00 #1A1B26;
|
||||
@define-color base01 #16161E;
|
||||
@define-color base02 #2F3549;
|
||||
@define-color base03 #444B6A;
|
||||
@define-color base04 #787C99;
|
||||
@define-color base05 #A9B1D6;
|
||||
@define-color base06 #CBCCD1;
|
||||
@define-color base07 #D5D6DB;
|
||||
@define-color base08 #C0CAF5;
|
||||
@define-color base09 #A9B1D6;
|
||||
@define-color base0A #0DB9D7;
|
||||
@define-color base0B #9ECE6A;
|
||||
@define-color base0C #B4F9F8;
|
||||
@define-color base0D #2AC3DE;
|
||||
@define-color base0E #BB9AF7;
|
||||
@define-color base0F #F7768E;
|
||||
@define-color base00 #191724;
|
||||
@define-color base01 #1f1d2e;
|
||||
@define-color base02 #26233a;
|
||||
@define-color base03 #6e6a86;
|
||||
@define-color base04 #908caa;
|
||||
@define-color base05 #e0def4;
|
||||
@define-color base06 #e0def4;
|
||||
@define-color base07 #524f67;
|
||||
@define-color base08 #eb6f92;
|
||||
@define-color base09 #f6c177;
|
||||
@define-color base0A #ebbcba;
|
||||
@define-color base0B #31748f;
|
||||
@define-color base0C #9ccfd8;
|
||||
@define-color base0D #c4a7e7;
|
||||
@define-color base0E #f6c177;
|
||||
@define-color base0F #524f67;
|
||||
|
||||
* {
|
||||
color: @base05;
|
||||
font-family: monospace;
|
||||
font-size: 17px;
|
||||
font-size: 15px;
|
||||
border-radius: 0px;
|
||||
border: none;
|
||||
}
|
||||
|
|
@ -36,3 +36,7 @@ window#waybar {
|
|||
color: @base0D;
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 8px 12px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
"L+ %h/.config/waybar - - - - ${./configs/waybar}"
|
||||
"L+ %h/.face.icon - - - - ${./.face.icon}"
|
||||
"L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}"
|
||||
"L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
|
||||
# "L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
|
||||
];
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
|
|
@ -31,16 +31,15 @@
|
|||
nautilus
|
||||
librewolf
|
||||
playerctl
|
||||
geary
|
||||
evolution
|
||||
qutebrowser
|
||||
mako
|
||||
gh
|
||||
fuzzel
|
||||
foot
|
||||
signal-desktop
|
||||
dino
|
||||
polari
|
||||
vesktop
|
||||
# vesktop
|
||||
;
|
||||
inherit (inputs.hetch.packages.${pkgs.system}) hetch;
|
||||
};
|
||||
|
|
|
|||
5
hosts/cityseventeen/users/default.nix
Normal file
5
hosts/cityseventeen/users/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
imports = [
|
||||
./arturm
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue