mirror of
https://github.com/kittywitch/nixfiles.git
synced 2026-02-09 20:39:18 -08:00
project-wide: nixdirfmt
This commit is contained in:
parent
24b44264d2
commit
e9f7ec570d
10 changed files with 77 additions and 58 deletions
|
|
@ -1,7 +1,10 @@
|
|||
rec {
|
||||
sources = import ./nix/sources.nix;
|
||||
pkgs = import ./pkgs { inherit sources; };
|
||||
witch = import ./lib/witch.nix { inherit pkgs; lib = pkgs.lib; };
|
||||
witch = import ./lib/witch.nix {
|
||||
inherit pkgs;
|
||||
lib = pkgs.lib;
|
||||
};
|
||||
profiles = witch.modList {
|
||||
modulesDir = ./profiles;
|
||||
defaultFile = "nixos.nix";
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@ let
|
|||
overlay = self: super:
|
||||
rec {
|
||||
|
||||
dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
|
||||
inherit (super) dino;
|
||||
};
|
||||
|
||||
dino =
|
||||
super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
|
||||
inherit (super) dino;
|
||||
};
|
||||
|
||||
discord = super.discord.override { nss = self.nss; };
|
||||
|
||||
ncmpcpp = super.ncmpcpp.override {
|
||||
|
|
@ -50,7 +51,8 @@ let
|
|||
|
||||
obs-studio = super.obs-studio.override { pipewireSupport = true; };
|
||||
|
||||
hextorgba = (import ../lib/colorhelpers.nix { inherit (super) lib; }).hextorgba;
|
||||
hextorgba =
|
||||
(import ../lib/colorhelpers.nix { inherit (super) lib; }).hextorgba;
|
||||
|
||||
ff-sponsorblock = self.callPackage ./ff-sponsorblock { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ profile }:
|
||||
|
||||
''
|
||||
#main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar > .toolbar-items {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
#main-window:not([tabsintitlebar="true"]) #TabsToolbar {
|
||||
visibility: collapse !important;
|
||||
}
|
||||
#main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar > .toolbar-items {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
#main-window:not([tabsintitlebar="true"]) #TabsToolbar {
|
||||
visibility: collapse !important;
|
||||
}
|
||||
|
||||
#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
|
||||
display: none;
|
||||
}
|
||||
#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
|
||||
display: none;
|
||||
}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, lib, pkgs, witch, ... }:
|
||||
|
||||
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
witch.style.font = {
|
||||
name = "FantasqueSansMono Nerd Font";
|
||||
size = "10";
|
||||
size_css = "14px";
|
||||
}; in {
|
||||
};
|
||||
in {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
font.name = witch.style.font.name;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,5 @@
|
|||
plugins = [ pkgs.obs-wlrobs ];
|
||||
};
|
||||
|
||||
programs.zsh.shellAliases = {
|
||||
obs="env QT_QPA_PLATFORM=xcb obs";
|
||||
};
|
||||
programs.zsh.shellAliases = { obs = "env QT_QPA_PLATFORM=xcb obs"; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
||||
programs.syncplay = {
|
||||
enable = true;
|
||||
username = "kat";
|
||||
defaultRoom = "lounge";
|
||||
server = { host = "sync.kittywit.ch"; };
|
||||
playerArgs = [ "--ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080]/bestvideo+bestaudio/best" ];
|
||||
playerArgs = [
|
||||
"--ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080]/bestvideo+bestaudio/best"
|
||||
];
|
||||
# gui = false;
|
||||
config = {
|
||||
client_settings = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, pkgs, lib, witch, ... }:
|
||||
|
||||
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
witch.style.font = {
|
||||
name = "FantasqueSansMono Nerd Font";
|
||||
size = "10";
|
||||
size_css = "14px";
|
||||
}; in {
|
||||
};
|
||||
in {
|
||||
systemd.user.services = {
|
||||
mako = {
|
||||
Unit = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, pkgs, lib, witch, ... }:
|
||||
|
||||
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
witch.style.font = {
|
||||
name = "FantasqueSansMono Nerd Font";
|
||||
size = "10";
|
||||
size_css = "14px";
|
||||
}; in {
|
||||
};
|
||||
in {
|
||||
home.sessionVariables = {
|
||||
MOZ_ENABLE_WAYLAND = 1;
|
||||
XDG_CURRENT_DESKTOP = "sway";
|
||||
|
|
@ -12,21 +16,21 @@ let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}
|
|||
};
|
||||
|
||||
home.packages = with pkgs; [ grim slurp wl-clipboard jq ];
|
||||
|
||||
systemd.user.services.i3gopher = {
|
||||
Unit = {
|
||||
Description = "i3 focus history";
|
||||
After = ["sway-session.target"];
|
||||
PartOf = ["graphical-session.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "exec";
|
||||
Restart = "on-failure";
|
||||
StandardOutput = "null";
|
||||
ExecStart = "${pkgs.i3gopher}/bin/i3gopher";
|
||||
};
|
||||
Install.WantedBy = ["sway-session.target"];
|
||||
|
||||
systemd.user.services.i3gopher = {
|
||||
Unit = {
|
||||
Description = "i3 focus history";
|
||||
After = [ "sway-session.target" ];
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
Type = "exec";
|
||||
Restart = "on-failure";
|
||||
StandardOutput = "null";
|
||||
ExecStart = "${pkgs.i3gopher}/bin/i3gopher";
|
||||
};
|
||||
Install.WantedBy = [ "sway-session.target" ];
|
||||
};
|
||||
|
||||
programs.zsh.profileExtra = ''
|
||||
# If running from tty1 start sway
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, lib, pkgs, witch, ... }:
|
||||
|
||||
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
witch.style.font = {
|
||||
name = "FantasqueSansMono Nerd Font";
|
||||
size = "10";
|
||||
size_css = "14px";
|
||||
}; in {
|
||||
};
|
||||
in {
|
||||
config = lib.mkIf config.deploy.profile.sway {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@ with lib;
|
|||
let
|
||||
mailAccounts = config.mailserver.loginAccounts;
|
||||
htpasswd = pkgs.writeText "radicale.users" (concatStrings
|
||||
(flip mapAttrsToList mailAccounts (mail: user:
|
||||
mail + ":" + user.hashedPassword + "\n"
|
||||
))
|
||||
);
|
||||
(flip mapAttrsToList mailAccounts
|
||||
(mail: user: mail + ":" + user.hashedPassword + "\n")));
|
||||
|
||||
in {
|
||||
services.radicale = {
|
||||
|
|
@ -22,19 +20,19 @@ in {
|
|||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"cal.kittywit.ch" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:5232/";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Script-Name /;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_pass_header Authorization;
|
||||
'';
|
||||
};
|
||||
"cal.kittywit.ch" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:5232/";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Script-Name /;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_pass_header Authorization;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
deploy.tf.dns.records.kittywitch_cal = {
|
||||
tld = "kittywit.ch.";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue