This commit is contained in:
Daniel Flanagan 2023-11-07 21:30:26 -06:00
parent b4d101349a
commit 30c300f3b7
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
13 changed files with 49 additions and 77 deletions

View file

@ -115,7 +115,6 @@
in { in {
dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [ dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [
dragon dragon
hyprland
]); ]);
thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [ thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [
thinker thinker
@ -129,7 +128,6 @@
./nixos/beefcake ./nixos/beefcake
] (with outputs.homeManagerModules; [ ] (with outputs.homeManagerModules; [
linux linux
weechat-in-tmux-service
]); ]);
rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [ rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [
linux linux

View file

@ -12,12 +12,14 @@
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
# nix-colors.homeManagerModules.default # nix-colors.homeManagerModules.default
fish fish
bat
helix helix
git git
iex iex
zellij zellij
broot broot
cargo cargo
senpai
tmux tmux
]; ];

View file

@ -28,9 +28,7 @@
ewwbar = import ./ewwbar.nix; ewwbar = import ./ewwbar.nix;
sway-laptop = import ./sway-laptop.nix; sway-laptop = import ./sway-laptop.nix;
tmux = import ./tmux.nix; tmux = import ./tmux.nix;
senpai = import ./senpai.nix;
tmux-master-service = import ./tmux-master-service.nix;
weechat-in-tmux-service = import ./weechat-in-tmux-service.nix;
dragon = import ./dragon.nix; dragon = import ./dragon.nix;
thinker = import ./thinker.nix; thinker = import ./thinker.nix;

View file

@ -1,5 +1,6 @@
{outputs, ...}: { {outputs, ...}: {
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
kitty kitty
wezterm
]; ];
} }

View file

@ -7,6 +7,7 @@
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
melee melee
sway sway
hyprland
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

View file

@ -5,7 +5,7 @@
(music))) (music)))
(defwindow bar (defwindow bar
:monitor 1 :monitor 0
:stacking "fg" :stacking "fg"
:exclusive true :exclusive true
:geometry :geometry
@ -33,7 +33,7 @@
{" " + round(EWW_CPU["avg"], 0) + "%"} {" " + round(EWW_CPU["avg"], 0) + "%"}
{" " + round(EWW_RAM["used_mem_perc"], 0) + "%"} {" " + round(EWW_RAM["used_mem_perc"], 0) + "%"}
{isDesktop == "true" ? "" : " " + brightness + "%"} {isDesktop == "true" ? "" : " " + brightness + "%"}
{isDesktop == "true" ? "" : "󱊣 " + EWW_BATTERY["BAT0"]["capacity"] + "%/" + EWW_BATTERY["BAT1"]["capacity"] + "%"} {isDesktop == "true" ? "" : "󱊣 " + EWW_BATTERY["BAT1"]["capacity"] + "%"}
)) ))
(defwidget music [] (defwidget music []

View file

@ -2,8 +2,18 @@
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
sway sway
sway-laptop sway-laptop
hyprland
]; ];
wayland.windowManager.hyprland = {
settings = {
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
monitor = [
"eDP-1,2256x1504@60,0x0,1.5"
];
};
};
wayland.windowManager.sway = { wayland.windowManager.sway = {
config = { config = {
output = { output = {

View file

@ -130,7 +130,7 @@
# color-modes = false; # color-modes = false;
bufferline = "multiple"; bufferline = "multiple";
# scrolloff = 8; # scrolloff = 8;
rulers = [80 120]; rulers = [81 121];
cursorline = true; cursorline = true;
cursor-shape = { cursor-shape = {

View file

@ -27,7 +27,11 @@
]; ];
exec-once = [ exec-once = [
"firefox & kitty --single-instance & hyprpaper & mako & /usr/lib/polkit-kde-authentication-agent-1" "hyprpaper"
"mako"
"/usr/lib/polkit-kde-authentication-agent-1"
"eww daemon && eww open bar"
"firefox & kitty --single-instance &"
''swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'"'' ''swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'"''
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
]; ];
@ -53,9 +57,6 @@
tap-to-click = true; tap-to-click = true;
middle_button_emulation = true; middle_button_emulation = true;
}; };
force_no_accel = true;
sensitivity = 1; # -1.0 - 1.0, 0 means no modification.
}; };
misc = { misc = {
@ -83,7 +84,7 @@
decoration = { decoration = {
rounding = 3; rounding = 3;
blur = "no"; # blur = "no";
# blur_size = 3 # blur_size = 3
# blur_passes = 1 # blur_passes = 1
# blur_new_optimizations = on # blur_new_optimizations = on

View file

@ -0,0 +1,18 @@
{config, ...}: {
programs.senpai = {
enable = true;
config = {
addr = "a";
nick = "a";
};
};
home.file."${config.xdg.configHome}/senpai/senpai.scfg" = {
enable = true;
text = ''
address irc+insecure://beefcake:6667
nickname lytedev
password-cmd pass soju
'';
};
}

View file

@ -1,35 +0,0 @@
{
pkgs,
lib,
config,
...
}:
with lib; let
cfg = config.services.tmux-master-service;
in {
options.services.tmux-master-service = {
enable = mkEnableOption "tmux master service";
socket = mkOption {
type = types.path;
default = "/run/user/%U/tmux-%U/default";
};
};
config = {
# https://superuser.com/a/1582196
systemd.user.services.tmux-master = {
Unit = {
Description = "tmux master service";
};
Service = {
Type = "forking";
RemainAfterExit = "yes";
ExecStart = "${pkgs.tmux}/bin/tmux -S ${cfg.socket} new-session -d -s default";
ExecStop = "${pkgs.tmux}/bin/tmux -S ${cfg.socket} kill-session -t weechat";
};
Install = {
WantedBy = ["default.target"];
};
};
};
}

View file

@ -1,28 +0,0 @@
{
pkgs,
outputs,
config,
...
}: let
socket = config.services.tmux-master-service.socket;
in {
imports = with outputs.homeManagerModules; [
tmux-master-service
];
systemd.user.services.weechat-in-tmux = {
Unit = {
Description = "weechat in tmux";
PartOf = "tmux-master.service";
After = ["tmux-master.service"];
};
Service = {
Type = "oneshot";
RemainAfterExit = "yes";
ExecStart = "${pkgs.tmux}/bin/tmux -S ${socket} new-session -d -s weechat ${pkgs.weechat}/bin/weechat";
ExecStop = "${pkgs.tmux}/bin/tmux -S ${socket} kill-session -t weechat";
};
Install = {
WantedBy = ["default.target"];
};
};
}

View file

@ -566,7 +566,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
#use sendfile = yes #use sendfile = yes
#max protocol = smb2 #max protocol = smb2
# note: localhost is the ipv6 localhost ::1 # note: localhost is the ipv6 localhost ::1
hosts allow = 10. 192.168.0. 127.0.0.1 localhost hosts allow = 192.168.0.0/16 127.0.0.1 localhost
hosts deny = 0.0.0.0/0 hosts deny = 0.0.0.0/0
guest account = nobody guest account = nobody
map to guest = bad user map to guest = bad user
@ -742,6 +742,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
443 # https (caddy) 443 # https (caddy)
# 5357 # ??? # 5357 # ???
22 # ssh 22 # ssh
6667 # soju irc bouncer
64022 # ssh (for ben?) 64022 # ssh (for ben?)
]; ];
networking.firewall.allowedUDPPorts = [ networking.firewall.allowedUDPPorts = [
@ -762,5 +763,10 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
allowPing = true; allowPing = true;
}; };
services.soju = {
enable = true;
listen = ["irc+insecure://:6667"];
};
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }