Compare commits
No commits in common. "1382e879dc51101776ac90abe277f46828ab1a3c" and "d8ab5eb3bb05d57c8bd84fdc4d251766f289a4c5" have entirely different histories.
1382e879dc
...
d8ab5eb3bb
9 changed files with 34 additions and 61 deletions
|
@ -65,9 +65,6 @@
|
||||||
# https://github.com/NixOS/nixpkgs/pull/369808
|
# https://github.com/NixOS/nixpkgs/pull/369808
|
||||||
freerdp3 = dcsunset.freerdp3;
|
freerdp3 = dcsunset.freerdp3;
|
||||||
|
|
||||||
# TODO: Remove when on stable
|
|
||||||
ghostty = unstable.ghostty;
|
|
||||||
|
|
||||||
### Development
|
### Development
|
||||||
#// ciscoPacketTracer8 = local.ciscoPacketTracer8;
|
#// ciscoPacketTracer8 = local.ciscoPacketTracer8;
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,6 @@ in {
|
||||||
# https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options
|
# https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options
|
||||||
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsdebug
|
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsdebug
|
||||||
settings.debug = {
|
settings.debug = {
|
||||||
disable-cursor-plane = []; # Software cursor
|
|
||||||
#// disable-direct-scanout = [];
|
#// disable-direct-scanout = [];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -30,9 +30,8 @@ in {
|
||||||
inherit size;
|
inherit size;
|
||||||
theme = name;
|
theme = name;
|
||||||
|
|
||||||
# BUG: Heavily increases CPU usage with cursor movement
|
|
||||||
#// hide-after-inactive-ms = 1000 * 15; # Milliseconds
|
#// hide-after-inactive-ms = 1000 * 15; # Milliseconds
|
||||||
#// hide-when-typing = true;
|
hide-when-typing = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# HACK: Inherit home-manager environment variables in lieu of upstream fix
|
# HACK: Inherit home-manager environment variables in lieu of upstream fix
|
||||||
|
|
|
@ -10,7 +10,6 @@ with lib; {
|
||||||
direnv.enable = true;
|
direnv.enable = true;
|
||||||
fastfetch.enable = true;
|
fastfetch.enable = true;
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
ghostty.enable = true;
|
|
||||||
git.enable = true;
|
git.enable = true;
|
||||||
htop.enable = true;
|
htop.enable = true;
|
||||||
man.enable = true;
|
man.enable = true;
|
||||||
|
@ -33,6 +32,7 @@ with lib; {
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
firefox.enable = true;
|
firefox.enable = true;
|
||||||
#// foot.enable = true;
|
#// foot.enable = true;
|
||||||
|
ghostty.enable = true;
|
||||||
#// gnome-terminal.enable = true;
|
#// gnome-terminal.enable = true;
|
||||||
#// kdeconnect.enable = true;
|
#// kdeconnect.enable = true;
|
||||||
kitty.enable = true;
|
kitty.enable = true;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
|
@ -9,13 +8,10 @@ with lib; let
|
||||||
in {
|
in {
|
||||||
options.custom.programs.ghostty = {
|
options.custom.programs.ghostty = {
|
||||||
enable = mkOption {default = false;};
|
enable = mkOption {default = false;};
|
||||||
minimal = mkOption {default = false;};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = mkIf cfg.minimal [pkgs.ghostty]; # Terminfo
|
home-manager.sharedModules = [
|
||||||
|
|
||||||
home-manager.sharedModules = mkIf (!cfg.minimal) [
|
|
||||||
{
|
{
|
||||||
# https://ghostty.org/
|
# https://ghostty.org/
|
||||||
programs.ghostty = {
|
programs.ghostty = {
|
||||||
|
|
|
@ -8,45 +8,35 @@ with lib; let
|
||||||
in {
|
in {
|
||||||
options.custom.services.pipewire.enable = mkOption {default = false;};
|
options.custom.services.pipewire.enable = mkOption {default = false;};
|
||||||
|
|
||||||
config = mkIf cfg.enable ({
|
config = mkIf cfg.enable {
|
||||||
#!! Realtime priority may cause desync
|
#!! Realtime priority may cause desync
|
||||||
#// security.rtkit.enable = true;
|
#// security.rtkit.enable = true;
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
# https://wiki.nixos.org/wiki/PipeWire
|
pulseaudio.enable = false;
|
||||||
# https://gitlab.freedesktop.org/pipewire/pipewire
|
|
||||||
pipewire = {
|
|
||||||
enable = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
|
|
||||||
alsa = {
|
# https://wiki.nixos.org/wiki/PipeWire
|
||||||
enable = true;
|
# https://gitlab.freedesktop.org/pipewire/pipewire
|
||||||
support32Bit = true;
|
pipewire = {
|
||||||
};
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
|
||||||
# Avoid resampling if possible
|
# Avoid resampling if possible
|
||||||
# https://wiki.archlinux.org/title/PipeWire#Changing_the_allowed_sample_rate(s)
|
# https://wiki.archlinux.org/title/PipeWire#Changing_the_allowed_sample_rate(s)
|
||||||
extraConfig.pipewire = {
|
extraConfig.pipewire = {
|
||||||
"10-sample-rate"."context.properties"."default.clock.allowed-rates" = [
|
"10-sample-rate"."context.properties"."default.clock.allowed-rates" = [
|
||||||
32000
|
32000
|
||||||
44100
|
44100
|
||||||
48000
|
48000
|
||||||
88200
|
88200
|
||||||
96000
|
96000
|
||||||
176400
|
176400
|
||||||
192000
|
192000
|
||||||
];
|
];
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
// (
|
};
|
||||||
if versionAtLeast version "25.05"
|
|
||||||
then {
|
|
||||||
services.pulseaudio.enable = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
}
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
{config, ...}: {
|
{config, ...}: {
|
||||||
custom = {
|
custom = {
|
||||||
profile = "sbc";
|
profile = "sbc";
|
||||||
|
programs.fastfetch.greet = true;
|
||||||
programs = {
|
|
||||||
fastfetch.greet = true;
|
|
||||||
ghostty.minimal = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
containers = {
|
containers = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
{config, ...}: {
|
{config, ...}: {
|
||||||
custom = {
|
custom = {
|
||||||
profile = "server";
|
profile = "server";
|
||||||
|
programs.fastfetch.greet = true;
|
||||||
programs = {
|
|
||||||
fastfetch.greet = true;
|
|
||||||
ghostty.minimal = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
containers = {
|
containers = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -18,10 +14,10 @@
|
||||||
#// headscale.enable = true;
|
#// headscale.enable = true;
|
||||||
mastodon.enable = true;
|
mastodon.enable = true;
|
||||||
netbox.enable = true;
|
netbox.enable = true;
|
||||||
#// nextcloud.enable = true;
|
nextcloud.enable = true;
|
||||||
owncast.enable = true;
|
owncast.enable = true;
|
||||||
#// redlib.enable = true;
|
redlib.enable = true;
|
||||||
#// searxng.enable = true;
|
searxng.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue