stupidcomputer
/
dot_testing
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.beepboop.systems/rndusr/dot_testing

This commit is contained in:
stupidcomputer 2024-06-15 21:58:37 -05:00
parent 0e5d3288f2 c1ff21e877
commit 6cfbe5e003
26 changed files with 223 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.config/khard/khard.conf Normal file
View File

@ -0,0 +1,19 @@
[addressbooks]
[[main]]
path = ~/vdir/people/main/20cda0dd-5922-4905-8956-859c989a6519
[general]
default_action = list
editor = nvim
merge_editor = nvim, -d
[contact table]
display = first_name
group_by_addressbook = no
reverse = no
show_nicknames = no
show_uids = yes
show_kinds = no
sort = last_name
localize_dates = yes
preferred_phone_number_type = pref, cell, home
preferred_email_address_type = pref, work, home

1
.config/nvim/init.lua
View File

@ -92,6 +92,7 @@ function setTabbing(lang, width)
end end
setTabbing("python", 4) setTabbing("python", 4)
setTabbing("htmldjango", 4)
setTabbing("javascript", 4) setTabbing("javascript", 4)
setTabbing("css", 4) setTabbing("css", 4)
setTabbing("html", 4) setTabbing("html", 4)

2
.config/sx/sxrc
View File

@ -1,3 +1,3 @@
# start the wm # start the wm
sxhkd & mode sxhkdrc
bspwm bspwm

4
.config/sxhkd/sxhkdrc
View File

@ -50,5 +50,9 @@ super + {_,shift + } {1-9,0}
super + {t,f,s} super + {t,f,s}
bspc node -t {tiled,floating,fullscreen} bspc node -t {tiled,floating,fullscreen}
# x230t specific -- activate the tablet menu
XF86RotateWindows XF86RotateWindows
tabletmenu tabletmenu
shift + Insert
special_ins

10
README.md
View File

@ -33,7 +33,9 @@ things to do
license license
------- -------
all materials, except for: all materials in this repository, except for:
a) `./home/wallpapers/pape.jpg`, which is of unknown licenses, and
b) ./builds/st, which is licensed under MIT, persuant to ./builds/st/LICENSE, * `./home/wallpapers/pape.jpg`, which is of unknown license, and
is licensed under the GPLv3. * `./builds/st`, which is licensed under MIT, persuant to `./builds/st/LICENSE`,
is (c) rndusr, randomuser, stupidcomputer, etc 2024 and licensed under the GPLv3 (see `./LICENSE`)

2
boxes/mlg/default.nix
View File

@ -10,7 +10,7 @@
../../modules/common.nix ../../modules/common.nix
../../modules/x11.nix ../../modules/x11.nix
../../modules/discord.nix ../../modules/discord.nix
../../modules/gaming.nix # ../../modules/gaming.nix
../../modules/rbw.nix ../../modules/rbw.nix
]; ];

8
boxes/netbox/default.nix
View File

@ -193,14 +193,6 @@
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
root = "/var/www/beepboop.systems"; root = "/var/www/beepboop.systems";
locations."/" = {
extraConfig = ''
if ($request_uri ~ ^/(.*)\.html(\?|$)) {
return 302 /$1;
}
try_files $uri $uri.html $uri/ =404;
'';
};
}; };
services.nginx.virtualHosts."git.beepboop.systems" = { services.nginx.virtualHosts."git.beepboop.systems" = {

4
builds/st.nix
View File

@ -7,6 +7,7 @@
, fontconfig , fontconfig
, freetype , freetype
, ncurses , ncurses
, lightMode ? false
, extraLibs ? [ ] , extraLibs ? [ ]
}: }:
@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ]; nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
buildInputs = [ libX11 libXft ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ extraLibs;
buildPhase = '' buildPhase = lib.optionalString (lightMode == true) "cp lightmode.h colors.h;" +
''
make make
''; '';

20
builds/st/lightmode.h Normal file
View File

@ -0,0 +1,20 @@
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
/* solarized light */
"#eee8d5", /* 0: black */
"#dc322f", /* 1: red */
"#859900", /* 2: green */
"#b58900", /* 3: yellow */
"#268bd2", /* 4: blue */
"#d33682", /* 5: magenta */
"#2aa198", /* 6: cyan */
"#073642", /* 7: white */
"#fdf6e3", /* 8: brblack */
"#cb4b16", /* 9: brred */
"#93a1a1", /* 10: brgreen */
"#839496", /* 11: bryellow */
"#657b83", /* 12: brblue */
"#6c71c4", /* 13: brmagenta*/
"#586e75", /* 14: brcyan */
"#002b36", /* 15: brwhite */
};

2
builds/statusbar/setup.py
View File

@ -7,7 +7,7 @@ setup(
author_email = 'ryan@beepboop.systems', author_email = 'ryan@beepboop.systems',
url = 'https://git.beepboop.systems/stupidcomputer/dot_testing', url = 'https://git.beepboop.systems/stupidcomputer/dot_testing',
description = 'simple statusbar content program', description = 'simple statusbar content program',
license = 'MIT', license = 'GPLv3',
entry_points = { entry_points = {
'console_scripts': [ 'console_scripts': [
'statusbar = statusbar.statusbar:main' 'statusbar = statusbar.statusbar:main'

41
builds/statusbar/statusbar/statusbar.py
View File

@ -38,6 +38,32 @@ def generate_desktop_string(monitor_array):
return ' '.join(output) return ' '.join(output)
def filemodfactory(filename: str, modname: str):
def filemod(queue, _):
orig = 0
while True:
new = os.path.getmtime(filename)
if(new > orig):
with open(filename, 'r') as f:
queue.put({
"module": modname,
"data": f.read().rstrip()
})
orig = new
time.sleep(0.1)
return filemod
def new_mail(queue, _):
while True:
dir_output = os.listdir("/home/usr/Mail/main/INBOX/new")
dir_output = len(dir_output)
queue.put({
"module": "newmail",
"data": str(dir_output)
})
time.sleep(20)
def bspwm(queue, monitor): def bspwm(queue, monitor):
client = socket.socket( client = socket.socket(
socket.AF_UNIX, socket.AF_UNIX,
@ -90,12 +116,13 @@ def filecheckerfactory(filename: str, modname: str, timeout=60):
battery = filecheckerfactory("/sys/class/power_supply/BAT0/capacity", "bat") battery = filecheckerfactory("/sys/class/power_supply/BAT0/capacity", "bat")
batterystatus = filecheckerfactory("/sys/class/power_supply/BAT0/status", "batstat") batterystatus = filecheckerfactory("/sys/class/power_supply/BAT0/status", "batstat")
sxhkdmode = filemodfactory("/home/usr/.cache/statusbar/sxhkd_mode", "sxhkdmode")
def render(modules) -> str: def render(modules) -> str:
columns, _ = os.get_terminal_size(0) columns, _ = os.get_terminal_size(0)
left = "{} | {}".format(modules["clock"], modules["bspwm"]) left = "{} | {}({})".format(modules["clock"], modules["bspwm"], modules["sxhkdmode"])
right = "{}({})".format(modules["bat"], modules["batstat"]) right = "{} {}({})".format(modules["newmail"], modules["bat"], modules["batstat"])
padding = " " * (columns - len(left) - len(right) - 0) padding = " " * (columns - len(left) - len(right) - 0)
output = left + padding + right output = left + padding + right
@ -117,10 +144,12 @@ def render(modules) -> str:
stdout.flush() stdout.flush()
def main(): def main():
try:
os.mkdir("/home/usr/.cache/statusbar")
except FileExistsError:
pass
if argv[1] == "start_statusbars": if argv[1] == "start_statusbars":
# signal.signal(signal.SIGINT, signal.SIG_IGN)
# os.system("pkill statusbar")
# signal.signal(signal.SIGINT, signal.SIG_DFL)
# get the monitors # get the monitors
xrandr = subprocess.Popen(['xrandr'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) xrandr = subprocess.Popen(['xrandr'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = list(xrandr.stdout) output = list(xrandr.stdout)
@ -146,7 +175,7 @@ def main():
)) ))
return return
queue = Queue() queue = Queue()
modules = [bspwm, clock, battery, batterystatus] modules = [bspwm, clock, battery, batterystatus, sxhkdmode, new_mail]
[Process(target=module, args=(queue, argv[1])).start() for module in modules] [Process(target=module, args=(queue, argv[1])).start() for module in modules]
module_outputs = defaultdict(lambda: "") module_outputs = defaultdict(lambda: "")

6
builds/utils.nix
View File

@ -13,7 +13,6 @@
, figlet , figlet
, curl , curl
, ytfzf , ytfzf
, herbe
, xrandr , xrandr
, xrectsel , xrectsel
, ffcast , ffcast
@ -21,7 +20,6 @@
, xkbset , xkbset
, rbw , rbw
, xclip , xclip
, libsForQt5
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
src = ./utils; src = ./utils;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash feh xrandr jq curl fzy ytfzf sshuttle svkbd scrcpy xkbset rbw xclip ffcast libsForQt5.kolourpaint ]; buildInputs = [ bash feh xrandr jq curl fzy ytfzf sshuttle svkbd scrcpy rbw xclip ffcast xkbset ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -39,7 +37,7 @@ stdenv.mkDerivation rec {
for i in $(ls $src/sh); do for i in $(ls $src/sh); do
cp $src/sh/$i $out/bin cp $src/sh/$i $out/bin
ln -sf $out/bin/tmenu_run $out/bin/regenerate ln -sf $out/bin/tmenu_run $out/bin/regenerate
wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf herbe sshuttle svkbd scrcpy libsForQt5.kolourpaint xrectsel ffcast ]} wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy xkbset ytfzf sshuttle svkbd scrcpy xrectsel ffcast ]}
done done
''; '';
} }

40
builds/utils/sh/disp
View File

@ -3,6 +3,8 @@
set -x set -x
[ "$1" = "-h" ] && echo "use DISP_ACCESS_IP to control sshfs conn ip" && exit 0
set_walls() { set_walls() {
for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do
xwallpaper --output $i --zoom ~/.local/share/pape.jpg xwallpaper --output $i --zoom ~/.local/share/pape.jpg
@ -56,49 +58,55 @@ case "$(hostname)" in
case "$1" in case "$1" in
"invert") "invert")
xrandr \ xrandr \
--output HDMI-0 --mode 1920x1080 --pos 3840x0 --rotate right --rate 60 \
--output DP-0 --off \
--output DP-1-2 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \
--output DP-1-1 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180
bspc monitor DP-1-2 -d 1 3 5 7
bspc monitor DP-1-1 -d 2 4 6 8
bspc monitor HDMI-0 -d 9
;;
*)
xrandr \
--output HDMI-0 --mode 1920x1080 --pos 3840x0 --rotate right --rate 60 \
--output DP-0 --off \ --output DP-0 --off \
--output DP-1-1 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \ --output DP-1-1 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \
--output DP-1-2 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180 --output DP-1-2 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180
bspc monitor DP-1-1 -d 1 3 5 7 bspc monitor DP-1-1 -d 1 3 5 7
bspc monitor DP-1-2 -d 2 4 6 8 bspc monitor DP-1-2 -d 2 4 6 8
bspc monitor HDMI-0 -d 9 ;;
"solo")
bspc monitor DP-0 -d 1 2 3 4 5 6 7 8 9
;;
*)
xrandr \
--output DP-0 --off \
--output DP-1-2 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \
--output DP-1-1 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180
bspc monitor DP-1-2 -d 1 3 5 7
bspc monitor DP-1-1 -d 2 4 6 8
;; ;;
esac esac
xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1 xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1
# setup synchronization # setup synchronization
# check if we have another IP defined
if [ ! -z "$DISP_ACCESS_IP" ]; then
target="$DISP_ACCESS_IP"
else
target=x230t
fi
pkill sshfs pkill sshfs
rm $HOME/doc # this is safe, as doc is a dir if it mattered, rm $HOME/doc # this is safe, as doc is a dir if it mattered,
# but it's just a link, so it's a regular file. # but it's just a link, so it's a regular file.
# in conclusion, good either way # in conclusion, good either way
mkdir -p $HOME/.cache/mount_point mkdir -p $HOME/.cache/mount_point
sshfs usr@x230t:/home/usr/doc $HOME/.cache/mount_point sshfs "usr@$target:/home/usr/doc" $HOME/.cache/mount_point -o ConnectTimeout=1
ln -sf $HOME/.cache/mount_point $HOME/doc ln -sf $HOME/.cache/mount_point $HOME/doc
rm $HOME/.thunderbird # see previous comment rm $HOME/.thunderbird # see previous comment
mkdir -p $HOME/.cache/mount_point3 mkdir -p $HOME/.cache/mount_point3
sshfs usr@x230t:/home/usr/.thunderbird $HOME/.cache/mount_point3 sshfs "usr@$target:/home/usr/.thunderbird" $HOME/.cache/mount_point3 -o ConnectTimeout=1
ln -sf $HOME/.cache/mount_point3 $HOME/.thunderbird ln -sf $HOME/.cache/mount_point3 $HOME/.thunderbird
rm $HOME/Mail rm $HOME/Mail
mkdir -p $HOME/.cache/mount_point4 mkdir -p $HOME/.cache/mount_point4
sshfs usr@x230t:/home/usr/Mail $HOME/.cache/mount_point4 sshfs "usr@$target:/home/usr/Mail" $HOME/.cache/mount_point4 -o ConnectTimeout=1
ln -sf $HOME/.cache/mount_point4 $HOME/Mail ln -sf $HOME/.cache/mount_point4 $HOME/Mail
rm $HOME/vdir rm $HOME/vdir
mkdir -p $HOME/.cache/mount_point5 mkdir -p $HOME/.cache/mount_point5
sshfs usr@x230t:/home/usr/vdir $HOME/.cache/mount_point5 sshfs "usr@$target:/home/usr/vdir" $HOME/.cache/mount_point5 -o ConnectTimeout=1
ln -sf $HOME/.cache/mount_point5 $HOME/vdir ln -sf $HOME/.cache/mount_point5 $HOME/vdir
;; ;;

1
builds/utils/sh/mode
View File

@ -4,6 +4,7 @@ if [ -n "$1" ]; then
pkill sxhkd pkill sxhkd
sxhkd -c ~/.config/sxhkd/$1 & disown sxhkd -c ~/.config/sxhkd/$1 & disown
[ -f "~/.config/sxhkd/$1.sh" ] && ~/.config/sxhkd/$1.sh [ -f "~/.config/sxhkd/$1.sh" ] && ~/.config/sxhkd/$1.sh
echo "$1" > ~/.cache/statusbar/sxhkd_mode
exit exit
fi fi

14
builds/utils/sh/special_ins Executable file
View File

@ -0,0 +1,14 @@
# insert special characters universally in xorg
(
tmenu <<DONE
í i-acute
Í I-acute
ó o-acute
Ó O-acute
á a-acute
Á a-acute
DONE
) | awk -F' ' '{print $1}' \
| tr -d '\n' \
| xclip -in -selection clipboard

102
flake.lock
View File

@ -41,11 +41,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1714043889, "lastModified": 1718165009,
"narHash": "sha256-f7aben2pbfL/CzphiAAwwe5CrmSYRZv3UF7zaGkD+Pc=", "narHash": "sha256-/N2ZesXMM5Fw9mpQhSCCieGxM/9jysbQQBLYHiSQppI=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "fee36e584de8c0034f311b76b5da1b81dad0b17b", "rev": "7e3ce9990c382947c33f0def2a1c33c420d8c710",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1696426674,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,16 +93,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714043624, "lastModified": 1717527182,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713166947, "lastModified": 1716729631,
"narHash": "sha256-Vk+eyK7EcvoXf6IxEuaKVmme2ui6W/mketcrZxfFmGg=", "narHash": "sha256-IerjU5GUeKc0eW9FPOdlPveSGJ2ZrO+lIfuHPUmUF2I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6779167a739240778d34024b89ecf6404fb28f9e", "rev": "fc4492181833eaaa7a26a8081c0615d95792d825",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,47 +199,32 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713995372, "lastModified": 1718086528,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-23_05": { "nixpkgs-24_05": {
"locked": { "locked": {
"lastModified": 1704290814, "lastModified": 1717144377,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-24.05",
"type": "indirect"
}
},
"nixpkgs-23_11": {
"locked": {
"lastModified": 1706098335,
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -276,11 +261,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1717602782,
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,32 +355,49 @@
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-24_05": "nixpkgs-24_05",
"nixpkgs-23_11": "nixpkgs-23_11",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1706219574, "lastModified": 1718084203,
"narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
}, },
"utils": { "systems": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1681028828,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5021eac20303a61fafe17224c087f5519baed54d", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -3,9 +3,9 @@
inputs = { inputs = {
# regular nixos stuff # regular nixos stuff
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
firefox-addons = { firefox-addons = {
@ -13,7 +13,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
}; };
nix-colors = { nix-colors = {
url = "github:misterio77/nix-colors"; url = "github:misterio77/nix-colors";

18
home/brave/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, inputs, config, pkgs, home, ... }:
let
plib = import ../../lib { inherit pkgs; };
in {
programs.chromium = {
enable = true;
package = lib.mkForce (plib.mkPackageWrapper
pkgs.brave
"export HOME=$HOME/.cache/brave"
""
"--args --disable-frame-rate-limit"
);
extensions = [
{ id = "ecnphlgnajanjnkcmbpancdjoidceilk"; }
];
};
}

2
home/elinks/default.nix
View File

@ -2,7 +2,7 @@
{ {
home.packages = [ home.packages = [
(pkgs.callPackage ./elinks.nix {}) pkgs.elinks
]; ];
home.file = { home.file = {

49
home/elinks/elinks.nix
View File

@ -1,49 +0,0 @@
{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib
, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev
, gpm, libidn, tre, expat, luajit
}:
stdenv.mkDerivation rec {
pname = "elinks";
version = "0.17.0";
src = fetchFromGitHub {
owner = "rkd77";
repo = "elinks";
rev = "v${version}";
hash = "sha256-JeUiMHAqSZxxBe8DplzmzHzsY6KqoBqba0y8GDwaR0Y=";
};
buildInputs = [
ncurses libX11 bzip2 zlib brotli zstd xz
openssl libidn tre expat libev luajit
]
++ lib.optional stdenv.isLinux gpm
;
nativeBuildInputs = [ autoreconfHook gettext pkg-config ];
configureFlags = [
"--enable-finger"
"--enable-html-highlight"
"--enable-gopher"
"--enable-gemini"
"--enable-cgi"
"--enable-bittorrent"
"--enable-nntp"
"--enable-256-colors"
"--enable-true-color"
"--with-brotli"
"--with-lzma"
"--with-libev"
"--with-terminfo"
];
meta = with lib; {
description = "Full-featured text-mode web browser";
homepage = "https://github.com/rkd77/elinks";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ iblech gebner ];
};
}

13
home/khard/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ lib, config, pkgs, home, ... }:
{
home.packages = with pkgs; [
khard
];
home.file = {
".config/khard/config" = {
source = ../../.config/khard/khard.conf;
};
};
}

2
home/rbw/default.nix
View File

@ -6,7 +6,7 @@
settings = { settings = {
base_url = "https://bitwarden.beepboop.systems"; base_url = "https://bitwarden.beepboop.systems";
email = "bit@beepboop.systems"; email = "bit@beepboop.systems";
# pinentry = "gtk"; pinentry = pkgs.pinentry-gnome3;
}; };
}; };
} }

7
home/x11-progs.nix
View File

@ -12,12 +12,5 @@ in {
pkgs.xwallpaper pkgs.xwallpaper
pkgs.xbrightness pkgs.xbrightness
pkgs.xdotool pkgs.xdotool
] ++ [
(plib.mkPackageWrapper
pkgs.brave
"export HOME=$HOME/.cache/brave"
""
"--args --disable-frame-rate-limit"
)
]; ];
} }

2
home/x11.nix
View File

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
./bspwm ./bspwm
./brave
./sx ./sx
./sxhkd ./sxhkd
./tridactyl ./tridactyl
@ -10,6 +11,7 @@
./wallpapers ./wallpapers
./vdirsyncer ./vdirsyncer
./khal ./khal
./khard
./isync ./isync
./todoman ./todoman
./neomutt ./neomutt

2
modules/common.nix
View File

@ -7,7 +7,7 @@
environment.systemPackages = [ environment.systemPackages = [
(pkgs.callPackage ../builds/rebuild.nix {}) (pkgs.callPackage ../builds/rebuild.nix {})
(pkgs.callPackage ../builds/st.nix {}) (pkgs.callPackage ../builds/st.nix { lightMode = false; })
(pkgs.callPackage ../builds/utils.nix {}) (pkgs.callPackage ../builds/utils.nix {})
(pkgs.callPackage ../builds/statusbar {}) (pkgs.callPackage ../builds/statusbar {})
pkgs.man-pages pkgs.man-pages

1
modules/gnupg.nix
View File

@ -3,7 +3,6 @@
{ {
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
pinentryFlavor = "gtk2";
enableSSHSupport = true; enableSSHSupport = true;
}; };
} }