flake.nix: update
Some checks failed
ci/woodpecker/cron/flake-lock-update Pipeline failed

license: update

pkgs: remove scls

nix: update inputs and insecure pkgs

tsuki: init gaming file

blocky: update blocklist

pgres: add dbs

home: update themes

programs: init opencomposite

media: remove spotify-player

helix: update theme and scls

tsuki: remove stylix

overlays: set chatterino tag to null
This commit is contained in:
notohh 2025-01-12 20:45:55 -05:00
parent 68f4314412
commit 193f2480d7
Signed by: notohh
GPG key ID: BD47506D475EE86D
28 changed files with 953 additions and 771 deletions

26
LICENSE
View file

@ -1,21 +1,13 @@
MIT License
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (c) 2023 notohh
Copyright (C) 2004 notohh <contact@notohh.dev>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
0. You just DO WHAT THE FUCK YOU WANT TO.

1241
flake.lock

File diff suppressed because it is too large Load diff

View file

@ -60,7 +60,11 @@
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
hypridle.url = "github:hyprwm/hypridle";
hypridle = {
url = "github:hyprwm/hypridle";
inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils";
};
hyprlock = {
url = "github:hyprwm/hyprlock";
inputs.nixpkgs.follows = "nixpkgs";
@ -76,11 +80,11 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils";
};
# hyprsunset = {
# url = "github:hyprwm/hyprsunset";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.hyprutils.follows = "hyprutils";
# };
hyprsunset = {
url = "github:hyprwm/hyprsunset";
inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils";
};
hyprutils = {
url = "github:hyprwm/hyprutils";
inputs.nixpkgs.follows = "nixpkgs";
@ -94,6 +98,10 @@
url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland";
};
hyprwayland-scanner = {
url = "github:hyprwm/hyprwayland-scanner";
inputs.nixpkgs.follows = "nixpkgs";
};
### other stuff
nix-gaming.url = "github:fufexan/nix-gaming";
@ -104,13 +112,15 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
atuin.url = "github:atuinsh/atuin";
flake-parts.url = "github:hercules-ci/flake-parts";
stylix.url = "github:danth/stylix";
eww.url = "github:elkowar/eww";
anyrun.url = "github:Kirottu/anyrun";
botoh.url = "git+https://git.flake.sh/notohh/botoh";
conduwuit.url = "github:girlbossceo/conduwuit";
neptune = {
url = "github:uwu/neptune";
catppuccin.url = "github:catppuccin/nix";
nixpkgs-xr.url = "github:nix-community/nixpkgs-xr";
prismlauncher.url = "github:PrismLauncher/PrismLauncher";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = {
@ -121,8 +131,8 @@
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
scls = {
url = "github:estin/simple-completion-language-server";
inputs.nixpkgs.follows = "nixpkgs";
};
};

View file

@ -4,17 +4,19 @@
...
}: {
imports = [
./stylix.nix
inputs.catppuccin.homeManagerModules.catppuccin
../../services
../../programs/anyrun
../../programs/eww
../../programs/hyprpanel.nix
../../programs/browsers/firefox
../../programs/terminal/wezterm
../../programs/terminal/zellij
../../programs/editors/zed
../../programs/media/cava.nix
../../programs/gtk.nix
../../programs/mako.nix
#../../programs/media/spotify-player.nix
../../programs/opencomposite.nix
../../programs/media/zathura.nix
../../programs/media/easyeffects.nix
../../wayland/hyprland
@ -27,6 +29,7 @@
vesktop
technorino
obsidian
vscode-fhs
signal-desktop
obs-studio
pavucontrol
@ -44,7 +47,6 @@
ventoy-bin-full
wine
bottles
prismlauncher
lutris
r2modman
moonlight-qt
@ -54,18 +56,18 @@
wlx-overlay-s
losslesscut-bin
bolt-launcher
cinny-desktop
jetbrains.goland
distrobox
tidal-hifi
neptune
mangohud
uxplay
drawio
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
inputs.prismlauncher.packages.${pkgs.system}.prismlauncher
# inputs.hyprsunset.packages.${pkgs.system}.default
(callPackage ../../../pkgs/passgen {})
(callPackage ../../../pkgs/forex {})
(callPackage ../../../pkgs/cpm {})
];
catppuccin = {
enable = true;
flavor = "mocha";
accent = "pink";
};
programs.ssh = {
enable = true;
extraConfig = ''

View file

@ -1,53 +0,0 @@
{
inputs,
pkgs,
...
}: {
imports = [inputs.stylix.homeManagerModules.stylix];
stylix = {
enable = true;
autoEnable = false;
polarity = "dark";
base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
fonts = {
monospace = {
name = "JetBrainsMono NF Medium";
package = pkgs.nerd-fonts.jetbrains-mono;
};
serif = {
name = "Noto Serif";
package = pkgs.noto-fonts;
};
sansSerif = {
name = "Noto Sans";
package = pkgs.noto-fonts;
};
emoji = {
name = "Twitter Color Emoji";
package = pkgs.twitter-color-emoji;
};
sizes = {
applications = 10;
desktop = 10;
popups = 10;
terminal = 12;
};
};
cursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 24;
};
opacity = {
terminal = 0.6;
};
targets = {
mako.enable = true;
lazygit.enable = true;
nushell.enable = true;
yazi.enable = true;
bat.enable = true;
};
};
}

View file

@ -10,7 +10,6 @@ _: {
enable = true;
defaultEditor = true;
settings = {
theme = "onedark";
editor = {
auto-save = true;
true-color = true;

View file

@ -1,9 +1,10 @@
{
pkgs,
lib,
inputs,
...
}: {
home.packages = [(pkgs.callPackage ../../../../pkgs/scls {})];
home.packages = [inputs.scls.defaultPackage.${pkgs.system}];
programs.helix.languages = {
language = with pkgs; [
{

View file

@ -1,27 +1,29 @@
{pkgs, ...}: {
# home.pointerCursor = {
# package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Classic";
# size = 24;
# gtk.enable = true;
# x11.enable = true;
# };
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
};
catppuccin.gtk = {
enable = true;
icon = {
enable = true;
};
};
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
gtk.enable = true;
x11.enable = true;
};
gtk = {
enable = true;
theme = {
name = "Tokyonight-Dark-BL";
package = pkgs.tokyo-night-gtk;
};
iconTheme = {
name = "Papirus";
package = pkgs.papirus-icon-theme;
font = {
name = "Inter";
package = pkgs.google-fonts.override {fonts = ["Inter"];};
size = 12;
};
};
}

View file

@ -9,12 +9,6 @@ _: {
bar_width = 2;
bar_spacing = 3;
};
color = {
gradient = 1;
gradient_count = 2;
gradient_color_2 = "'#f7768e'";
gradient_color_1 = "'#7dcfff'";
};
smoothing = {
monstercat = 1;
waves = 1;

View file

@ -1,74 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.spotify-player];
xdg.configFile."spotify-player/app.toml" = {
text = ''
theme = "tokyonight"
client_id = "bc629e700c1740a28b3f594ef1942eac"
client_port = 8080
playack_format = "{track} {artists}\n{album}\n{metadata}"
notify_format = { summary = "{track} {artists}", body = "{album}" }
copy_command = { command = "wl-copy", args = [] }
app_refresh_duration_in_ms = 32
playback_refresh_duration_in_ms = 0
cover_image_refresh_duration_in_ms = 2000
page_size_in_rows = 20
track_table_item_max_len = 32
enable_media_control = true
enable_streaming = true
enable_cover_image_cache = true
default_device = "tsuki"
play_icon = ""
pause_icon = ""
liked_icon = ""
playback_window_position = "Top"
cover_img_width = 5
cover_img_length = 11
cover_img_scale = 1.6
playback_window_width = 6
[device]
name = "tsuki"
device_type = "computer"
volume = 100
bitrate = 320
audio_cache = true
normalization = false
'';
};
xdg.configFile."spotify-player/theme.toml" = {
text = ''
[[themes]]
name = "tokyonight"
[themes.palette]
foreground = "#c0caf5"
black = "#414868"
red = "#f7768e"
green = "#9ece6a"
yellow = "#e0af68"
blue = "#2ac3de"
magenta = "#bb9af7"
cyan = "#7dcfff"
white = "#eee8d5"
bright_black = "#24283b"
bright_red = "#ff4499"
bright_green = "#73daca"
bright_yellow = "#657b83"
bright_blue = "#839496"
bright_magenta = "#ff007c"
bright_cyan = "#93a1a1"
bright_white = "#fdf6e3"
[themes.component_style]
block_title = { fg = "Magenta" }
border = {}
playback_track = { fg = "Cyan", modifiers = ["Bold"] }
playback_artists = { fg = "Cyan", modifiers = ["Bold"] }
playback_album = { fg = "Yellow" }
playback_metadata = { fg = "White" }
playback_progress_bar = { bg = "BrightBlack", fg = "Green" }
current_playing = { fg = "Green", modifiers = ["Bold"] }
page_desc = { fg = "Cyan", modifiers = ["Bold"] }
table_header = { fg = "Blue" }
selection = { modifiers = ["Bold", "Reversed"] }
'';
};
}

View file

@ -0,0 +1,27 @@
{
pkgs,
config,
...
}: {
xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
xdg.configFile."openvr/openvrpaths.vrpath".text = ''
{
"config" :
[
"${config.xdg.dataHome}/Steam/config"
],
"external_drivers" : null,
"jsonid" : "vrpathreg",
"log" :
[
"${config.xdg.dataHome}/Steam/logs"
],
"runtime" :
[
"${pkgs.opencomposite}/lib/opencomposite"
],
"version" : 1
}
'';
}

View file

@ -2,7 +2,6 @@ _: {
programs.bat = {
enable = true;
config = {
theme = "base16-stylix";
pager = "--RAW-CONTROL-CHARS --quit-if-one-screen --mouse";
style = "plain";
};

View file

@ -38,6 +38,7 @@ alias ps = procs
alias tail = tspin
alias spotify = spotify_player
alias atac = atac --directory ~/.config/atac/
alias zed = zeditor .
nitch
$env.config = {

View file

@ -9,28 +9,7 @@
enable = true;
enableNushellIntegration = true;
settings = {
palette = "tokyonight";
add_newline = false;
palettes.tokyonight = {
red = "#f7768e";
orange = "#ff9e64";
yellow = "#e0af68";
light-green = "#9ece6a";
green = "#73daca";
turquoise = "#89ddff";
light-cyan = "#b4f9f8";
teal = "#2ac3de";
cyan = "#7dcfff";
blue = "#7aa2f7";
magenta = "#bb9af7";
white = "#c0caf5";
light-gray = "#9aa5ce";
parameters = "#cfc9c2";
comment = "#565f89";
black = "#414868";
foreground = "#a9b1d6";
background = "#1a1b26";
};
format = lib.concatStrings [
"$character"
"$hostname"

View file

@ -16,6 +16,7 @@ local config = {
window_background_opacity = 0.6,
text_background_opacity = 1.0,
enable_tab_bar = false,
max_fps = 144,
window_padding = { top = 20, bottom = 20, left = 20, right = 20 },
}

View file

@ -8,7 +8,6 @@ _: {
settings = {
on_force_close = "quit";
simplified_ui = false;
theme = "tokyo-night";
default_layout = "default";
copy_command = "wl-copy";
copy_clipboard = "primary";

View file

@ -56,6 +56,10 @@
name = "ec";
ensureDBOwnership = true;
}
{
name = "botoh";
ensureDBOwnership = true;
}
];
ensureDatabases = [
"forgejo"
@ -67,6 +71,7 @@
"miniflux"
"atuin"
"ec"
"botoh"
];
};
services.postgresqlBackup = {
@ -80,6 +85,7 @@
"attic"
"miniflux"
"atuin"
"botoh"
];
compression = "zstd";
compressionLevel = 4;

View file

@ -51,6 +51,10 @@
"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
"https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts"
"https://raw.githubusercontent.com/AdGoBye/AdGoBye-Blocklists/main/AGBBase.toml"
"https://raw.githubusercontent.com/AdGoBye/AdGoBye-Blocklists/main/AGBCommunity.toml"
"https://raw.githubusercontent.com/AdGoBye/AdGoBye-Blocklists/main/AGBUpsell.toml"
"https://raw.githubusercontent.com/AdGoBye/AdGoBye-Blocklists/main/AGBSupporters.toml"
];
tracking = [
"https://v.firebog.net/hosts/Easyprivacy.txt"

View file

@ -5,11 +5,11 @@
}: {
imports = [
inputs.nix-gaming.nixosModules.pipewireLowLatency
inputs.nix-gaming.nixosModules.platformOptimizations
inputs.hyprland.nixosModules.default
./hardware.nix
./services
./networking.nix
./gaming.nix
../common.nix
../../home/wayland
../../modules
@ -21,18 +21,18 @@
libvirtd.enable = true;
waydroid.enable = false;
};
programs.hyprland = {
enable = true;
# finalPackage = inputs.hyprland.packages.${pkgs.system}.default;
portalPackage = inputs.xdg-portal-hyprland.packages.${pkgs.system}.default;
};
services = {
pulseaudio.enable = false;
pcscd.enable = true;
flatpak.enable = true;
avahi = {
enable = true;
openFirewall = true;
nssmdns4 = true;
publish = {
enable = true;
userServices = true;
domain = true;
};
};
pipewire = {
enable = true;
@ -63,23 +63,19 @@
};
};
programs = {
hyprland = {
enable = true;
withUWSM = true;
portalPackage = inputs.xdg-portal-hyprland.packages.${pkgs.system}.default;
};
corectrl.enable = true;
dconf.enable = true;
gamemode.enable = true;
appimage = {
enable = true;
binfmt = true;
};
steam = {
enable = true;
platformOptimizations.enable = true;
extraCompatPackages = [
pkgs.proton-ge-bin
];
};
};
hardware = {
pulseaudio.enable = false;
graphics = {
enable = true;
enable32Bit = true;
@ -89,7 +85,6 @@
daemon.enable = true;
};
};
environment.systemPackages = with pkgs; [
nil
libvirt

53
hosts/tsuki/gaming.nix Normal file
View file

@ -0,0 +1,53 @@
{
pkgs,
inputs,
...
}: {
imports = [
inputs.nix-gaming.nixosModules.platformOptimizations
inputs.nixpkgs-xr.nixosModules.nixpkgs-xr
];
services = {
wivrn = {
enable = true;
defaultRuntime = true;
openFirewall = true;
autoStart = true;
monadoEnvironment = {
U_PACING_COMP_MIN_TIME_MS = "8";
};
};
monado = {
enable = true;
highPriority = true;
};
sunshine = {
enable = true;
autoStart = false;
openFirewall = true;
capSysAdmin = true;
};
};
programs = {
gamemode = {
enable = true;
enableRenice = true;
};
gamescope = {
enable = true;
capSysNice = true;
args = [
"--expose-wayland"
"--framerate-limit 144"
];
};
steam = {
enable = true;
platformOptimizations.enable = true;
extraCompatPackages = [
pkgs.proton-ge-bin
pkgs.proton-ge-rtsp-bin
];
};
};
}

View file

@ -10,6 +10,11 @@
boot = {
kernelModules = ["kvm-amd"];
kernelParams = [
"preempt=full"
"threadirqs"
"mitigations=off"
];
extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback.out
];
@ -29,6 +34,11 @@
};
};
services.scx = {
enable = true;
scheduler = "scx_lavd";
};
hardware.wooting.enable = true;
fileSystems = {

View file

@ -4,6 +4,16 @@ _: {
hostName = "tsuki";
firewall = {
enable = true;
allowedTCPPorts = [
7000 # uxplay
7100 # uxplay
7001 # uxplay
];
allowedUDPPorts = [
7011 # uxplay
6001 # uxplay
6000 # uxplay
];
};
};
environment.etc = {

View file

@ -3,8 +3,6 @@
./restic.nix
./atticd.nix
./hydroxide.nix
./sunshine.nix
./wivrn.nix
./rnnoise.nix
];
}

View file

@ -1,8 +0,0 @@
_: {
services.sunshine = {
enable = true;
autoStart = false;
openFirewall = true;
capSysAdmin = true;
};
}

View file

@ -1,10 +0,0 @@
_: {
networking.firewall.allowedTCPPorts = [9757];
networking.firewall.allowedUDPPorts = [9757 5353];
services.wivrn = {
enable = false;
openFirewall = true;
autoStart = false;
defaultRuntime = true;
};
}

View file

@ -8,21 +8,13 @@
inputs.hyprlock.overlays.default
inputs.hyprpaper.overlays.default
inputs.hyprpicker.overlays.default
inputs.hyprwayland-scanner.overlays.default
inputs.atuin.overlays.default
inputs.eww.overlays.default
inputs.neptune.overlays.default
inputs.hyprpanel.overlay
];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"dotnet-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428"
"aspnetcore-runtime-wrapped-6.0.36"
"aspnetcore-runtime-6.0.36"
"cinny-4.2.3"
"cinny-unwrapped-4.2.3"
];
};
};
@ -47,6 +39,7 @@
"https://viperml.cachix.org"
"https://nix-community.cachix.org"
"https://attic.kennel.juneis.dog/conduwuit"
"https://prismlauncher.cachix.org"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@ -57,6 +50,7 @@
"viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE="
"prismlauncher.cachix.org-1:9/n/FGyABA2jLUVfY+DEp4hKds/rwO+SCOtbOkDzd+c="
];
};
};

View file

@ -4,7 +4,7 @@
(self: super: {
technorino =
super.chatterino2.overrideAttrs
(oldAttrs: {
(old: {
nativeBuildInputs = with super; [cmake pkg-config];
buildInputs = with super; [qt6.wrapQtAppsHook qt6.qtbase qt6.qtsvg qt6.qtimageformats qt6.qttools qt6.qt5compat qt6.qtwayland boost openssl];
cmakeFlags = ["-DBUILD_WITH_QT6=ON" "-DBUILD_WITH_QTKEYCHAIN=OFF"];
@ -12,6 +12,7 @@
owner = "2547techno";
repo = "technorino";
rev = "f6d0bd19caddb9f8f433877020e64e18923bbc7a";
tag = null;
hash = "sha256-JTz/w8qtR59LVpuWbmiZDpwF+hepe78iCZ/3gi4O/Vc=";
};
});

View file

@ -1,25 +0,0 @@
{
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage {
pname = "simple-completion-language-server";
version = "0.1.0";
src = fetchFromGitHub {
owner = "estin";
repo = "simple-completion-language-server";
rev = "232aab4775c35a5d79ce38aa81a6724007aa0b59";
hash = "sha256-gwBQu1xf4rmDbOzvxXzQsHJr4faOECmRwyT7MR+pPyI=";
};
cargoHash = "sha256-hwF3qSlv/wZhJh1kIxm/U0ZpnAZpiMzUe0OncGBlclk=";
doCheck = false;
meta = {
description = "Language server to enable word completion and snippets for Helix editor";
homepage = "https://github.com/estin/simple-completion-language-server";
mainProgram = "simple-completion-language-server";
};
}