treewide: read commit description
What changed here was: - I updated the lock file - I added ZNC to my services - I moved my services to a new directory - I renamed my user to arturm - I renamed my system to cityseventeen - I moved to en_US.UTF-8 - I switched to using Rose Pine - I added a Mako option - Some refactoring where it was needed These are all changes I forgot to commit, I had intentions of commiting them but I didn't until now. Oops!
This commit is contained in:
parent
0d7aa6843b
commit
cddcce6db9
SSH key fingerprint:
SHA256:ubvwT66gNUKSsgSzEb2UQnX8pzTq5N+r8eRVYGJJm4Q
20 changed files with 380 additions and 226 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
**/*~
|
**/*~
|
||||||
**/#*.*#
|
**/\#*\#
|
||||||
**/.#*.*
|
**/.\#*
|
||||||
|
|
||||||
**/.pre-commit-config.yaml
|
**/.pre-commit-config.yaml
|
||||||
**/result
|
**/result
|
||||||
|
|
|
||||||
56
flake.lock
generated
56
flake.lock
generated
|
|
@ -47,11 +47,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743630992,
|
"lastModified": 1744300958,
|
||||||
"narHash": "sha256-4QKnn7sHskureX2DvKcvxR4tbjauSoCPVQJ+I8PAAUg=",
|
"narHash": "sha256-ijCSbAFTvMkjHKivrhCVxti3lPELwFKvV4Gv4BPSRrg=",
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "421cce2410fe9f0a71c717e1e28d37eb4ddd0283",
|
"rev": "72d8607e498dc1fe463ae5bfec8b590a138fd1db",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -66,11 +66,11 @@
|
||||||
"nixpkgs": ["nixpkgs"]
|
"nixpkgs": ["nixpkgs"]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743598667,
|
"lastModified": 1744145203,
|
||||||
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
|
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
|
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -85,11 +85,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741485571,
|
"lastModified": 1743991507,
|
||||||
"narHash": "sha256-fpm1ZTfGfMG36c4G3HSwmbd09zU3egmM0dfgDxkT3h4=",
|
"narHash": "sha256-sRyA1LOsRSeF8W2drXEuGU2U+actcYEKdk1f+2kDKb8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "db37ae9cd947031ad83288dec514233ffd262ffd",
|
"rev": "ac8af15c5f586879c08cd257b69749f791d94e68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -314,11 +314,11 @@
|
||||||
"nixpkgs": ["chaotic", "nixpkgs"]
|
"nixpkgs": ["chaotic", "nixpkgs"]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743527271,
|
"lastModified": 1744172174,
|
||||||
"narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=",
|
"narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9",
|
"rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -333,11 +333,11 @@
|
||||||
"nixpkgs": ["chaotic", "nixpkgs"]
|
"nixpkgs": ["chaotic", "nixpkgs"]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743144043,
|
"lastModified": 1744117730,
|
||||||
"narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
|
"narHash": "sha256-kcxkKeBYyhy3BT5wfGmMo6kNo3XM5R7h/bu5fLdbnG4=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
|
"rev": "92a01193c13d5ef9085899e22715c6e5f2590af8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -402,11 +402,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743448293,
|
"lastModified": 1744098102,
|
||||||
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
|
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
|
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -442,11 +442,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741332913,
|
"lastModified": 1743813633,
|
||||||
"narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
|
"narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "20755fa05115c84be00b04690630cb38f0a203ad",
|
"rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -474,11 +474,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743583204,
|
"lastModified": 1744098102,
|
||||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -587,11 +587,11 @@
|
||||||
"nixpkgs": ["nixpkgs"]
|
"nixpkgs": ["nixpkgs"]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743532009,
|
"lastModified": 1744309196,
|
||||||
"narHash": "sha256-yRZifkvaNiPuDguFRubAeUqVsfsEAaT1201Ck1P0p2w=",
|
"narHash": "sha256-GFRGL+EohGlGdsWNSBpNFm2rsfNt9vwmK7Y7ppV88og=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "cd8e902b57b31dd78aa8fda1b40cde3862184aa1",
|
"rev": "4306f9c70d30a385975b60e75e4b001ebebb07e8",
|
||||||
"revCount": 108,
|
"revCount": 117,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://copeberg.org/amadaluzia/pankomacs.git"
|
"url": "https://copeberg.org/amadaluzia/pankomacs.git"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,10 @@
|
||||||
programs = {
|
programs = {
|
||||||
swaybg = {
|
swaybg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wallpaper = inputs.wallpkgs.wallpapers.tokyo-night.tokyo_night-05.path;
|
wallpaper = inputs.wallpkgs.wallpapers.rose-pine.rose_pine-02.path;
|
||||||
};
|
|
||||||
waybar = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.waybar;
|
|
||||||
};
|
};
|
||||||
|
waybar.enable = true;
|
||||||
|
mako.enable = true;
|
||||||
direnv.enable = true;
|
direnv.enable = true;
|
||||||
openssh.enable = true;
|
openssh.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,12 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./users/arturm
|
./users
|
||||||
|
./services
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./theme.nix
|
./theme.nix
|
||||||
./apps.nix
|
./apps.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./forgejo.nix
|
|
||||||
./jellyfin.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
|
@ -41,6 +40,7 @@
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
xserver = {
|
xserver = {
|
||||||
|
enable = true;
|
||||||
xkb = {
|
xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
options = "eurosign:e,ctrl:nocaps";
|
options = "eurosign:e,ctrl:nocaps";
|
||||||
|
|
@ -49,6 +49,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
};
|
};
|
||||||
|
windowManager.windowmaker.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
udev.packages = [
|
udev.packages = [
|
||||||
|
|
|
||||||
7
hosts/cityseventeen/services/default.nix
Normal file
7
hosts/cityseventeen/services/default.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./znc.nix
|
||||||
|
./forgejo.nix
|
||||||
|
./jellyfin.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
114
hosts/cityseventeen/services/znc.nix
Normal file
114
hosts/cityseventeen/services/znc.nix
Normal file
|
|
@ -0,0 +1,114 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
{
|
||||||
|
services.znc = {
|
||||||
|
enable = true;
|
||||||
|
useLegacyConfig = false;
|
||||||
|
mutable = true;
|
||||||
|
config = {
|
||||||
|
Listener.l = {
|
||||||
|
AllowIRC = true;
|
||||||
|
AllowWeb = true;
|
||||||
|
IPv4 = true;
|
||||||
|
IPv6 = true;
|
||||||
|
Port = 5000;
|
||||||
|
SSL = false;
|
||||||
|
URIPrefix = "/";
|
||||||
|
};
|
||||||
|
User.amadaluzia = {
|
||||||
|
Admin = true;
|
||||||
|
Allow = "*";
|
||||||
|
AltNick = "amadaluzia_";
|
||||||
|
AppendTimestamp = false;
|
||||||
|
AuthOnlyViaModule = false;
|
||||||
|
AutoClearChanBuffer = true;
|
||||||
|
AutoClearQueryBuffer = true;
|
||||||
|
ChanBufferSize = 50;
|
||||||
|
DenyLoadMod = false;
|
||||||
|
DenySetBindHost = false;
|
||||||
|
Ident = "amadaluzia";
|
||||||
|
JoinTries = 10;
|
||||||
|
LoadModule = [
|
||||||
|
"chansaver"
|
||||||
|
"controlpanel"
|
||||||
|
];
|
||||||
|
MaxJoins = 0;
|
||||||
|
MaxNetworks = 1;
|
||||||
|
MaxQueryBuffers = 50;
|
||||||
|
MultiClients = true;
|
||||||
|
Nick = "amadaluzia";
|
||||||
|
NoTrafficTimeout = 180;
|
||||||
|
PrependTimestamp = true;
|
||||||
|
QueryBufferSize = 50;
|
||||||
|
QuitMsg = "Hi, this is Paul Allen. I'm being called away to London for a few days. Meredith, I'll call you when I get back. Hasta la vista, baby.";
|
||||||
|
RealName = "Artur Manuel";
|
||||||
|
StatusPrefix = "*";
|
||||||
|
TimestampFormat = "[%H:%M:%S]";
|
||||||
|
|
||||||
|
Network = {
|
||||||
|
ATL = {
|
||||||
|
FloodBurst = 9;
|
||||||
|
FloodRate = "2.00";
|
||||||
|
IRCConnectEnabled = true;
|
||||||
|
JoinDelay = 0;
|
||||||
|
LoadModule = [ "simple_away" ];
|
||||||
|
Server = "irc.atl.chat +6697";
|
||||||
|
TrustAllCerts = false;
|
||||||
|
TrustPKI = true;
|
||||||
|
|
||||||
|
Chan = {
|
||||||
|
"#general" = { };
|
||||||
|
"#linux" = { };
|
||||||
|
"#support" = { };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
libera = {
|
||||||
|
FloodBurst = 9;
|
||||||
|
FloodRate = "2.00";
|
||||||
|
IRCConnectEnabled = true;
|
||||||
|
JoinDelay = 0;
|
||||||
|
LoadModule = "simple_away";
|
||||||
|
Server = "irc.libera.chat +6697";
|
||||||
|
TrustAllCerts = false;
|
||||||
|
TrustPKI = true;
|
||||||
|
Chan = lib.genAttrs [
|
||||||
|
"##programming"
|
||||||
|
"##rust"
|
||||||
|
"#linux"
|
||||||
|
"#kernel"
|
||||||
|
"#osdev"
|
||||||
|
"#nixos"
|
||||||
|
"#gentoo"
|
||||||
|
"#gentoo-chat"
|
||||||
|
"#archlinux"
|
||||||
|
"#archlinux-offtopic"
|
||||||
|
"#debian"
|
||||||
|
"#voidlinux"
|
||||||
|
"#opensuse"
|
||||||
|
"#opensuse-factory"
|
||||||
|
"#openbsd"
|
||||||
|
"#openbsd-social"
|
||||||
|
"#freebsd"
|
||||||
|
"#go-nuts"
|
||||||
|
"#zig"
|
||||||
|
"#C++"
|
||||||
|
"#C++-general"
|
||||||
|
"#haskell"
|
||||||
|
"#nim"
|
||||||
|
"#lisp"
|
||||||
|
"#esolangs"
|
||||||
|
"#emacs"
|
||||||
|
"#emacs-social"
|
||||||
|
"#nicotine+"
|
||||||
|
] (_: { });
|
||||||
|
};
|
||||||
|
};
|
||||||
|
Pass.password = {
|
||||||
|
Hash = "15767453f2fa83a2ed1c7a1870ea8f154aa2e8b1910fd221471b4e548cd2bede";
|
||||||
|
Method = "SHA256";
|
||||||
|
Salt = "16*z9hcv07WI,m))lZD0";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -5,16 +5,16 @@
|
||||||
let
|
let
|
||||||
themes = {
|
themes = {
|
||||||
gtk = {
|
gtk = {
|
||||||
name = "Tokyonight-Dark";
|
name = "rose-pine";
|
||||||
package = pkgs.tokyonight-gtk-theme;
|
package = pkgs.rose-pine-gtk-theme;
|
||||||
};
|
};
|
||||||
icons = {
|
icons = {
|
||||||
name = "Adwaita";
|
name = "Adwaita";
|
||||||
package = pkgs.adwaita-icon-theme;
|
package = pkgs.adwaita-icon-theme;
|
||||||
};
|
};
|
||||||
cursor = {
|
cursor = {
|
||||||
name = "Simp1e-Tokyo-Night";
|
name = "BreezeX-RosePine-Linux";
|
||||||
package = pkgs.simp1e-cursors;
|
package = pkgs.rose-pine-cursor;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,29 @@
|
||||||
[main]
|
[main]
|
||||||
pad=12x12
|
pad=12x12
|
||||||
font=monospace:size=16.5
|
font=monospace:size=13
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
foreground=a9b1d6
|
foreground=e0def4
|
||||||
background=1a1b26
|
background=191724
|
||||||
regular0=16161e # black
|
regular0=1f1d2e # black
|
||||||
regular1=c0caf5 # red
|
regular1=eb6f92 # red
|
||||||
regular2=9ece6a # green
|
regular2=31748f # green
|
||||||
regular3=0db9d7 # yellow
|
regular3=ebbcba # yellow
|
||||||
regular4=2ac3de # blue
|
regular4=c4a7e7 # blue
|
||||||
regular5=bb9af7 # magenta
|
regular5=f6c177 # magenta
|
||||||
regular6=b4f9f8 # cyan
|
regular6=9ccfd8 # cyan
|
||||||
regular7=cbccd1 # white
|
regular7=e0def4 # white
|
||||||
bright0=2f3549 # bright black
|
bright0=26233a # bright black
|
||||||
bright1=c0caf5 # bright red
|
bright1=eb6f92 # bright red
|
||||||
bright2=9ece6a # bright green
|
bright2=31748f # bright green
|
||||||
bright3=0db9d7 # bright yellow
|
bright3=ebbcba # bright yellow
|
||||||
bright4=2ac3de # bright blue
|
bright4=c4a7e7 # bright blue
|
||||||
bright5=bb9af7 # bright magenta
|
bright5=f6c177 # bright magenta
|
||||||
bright6=b4f9f8 # bright cyan
|
bright6=9ccfd8 # bright cyan
|
||||||
bright7=d5d6db # bright white
|
bright7=524f67 # bright white
|
||||||
16=a9b1d6
|
16=f6c177
|
||||||
17=f7768e
|
17=524f67
|
||||||
18=16161e
|
18=1f1d2e
|
||||||
19=2f3549
|
19=26233a
|
||||||
20=787c99
|
20=908caa
|
||||||
21=cbccd1
|
21=e0def4
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
# output=<not set>
|
# output=<not set>
|
||||||
font=Monospace:size=16
|
font=Monospace:size=13
|
||||||
# dpi-aware=auto
|
# dpi-aware=auto
|
||||||
# use-bold=no
|
# use-bold=no
|
||||||
# prompt="> "
|
prompt=" "
|
||||||
# placeholder=
|
# placeholder=
|
||||||
# icon-theme=hicolor
|
# icon-theme=hicolor
|
||||||
# icons-enabled=yes
|
icons-enabled=no
|
||||||
# hide-before-typing=no
|
# hide-before-typing=no
|
||||||
# fields=filename,name,generic
|
# fields=filename,name,generic
|
||||||
# password-character=*
|
# password-character=*
|
||||||
|
|
@ -16,14 +16,14 @@ font=Monospace:size=16
|
||||||
# delayed-filter-ms=300
|
# delayed-filter-ms=300
|
||||||
# delayed-filter-limit=20000
|
# delayed-filter-limit=20000
|
||||||
# show-actions=no
|
# show-actions=no
|
||||||
# terminal=$TERMINAL -e # Note: you cannot actually use environment variables here
|
terminal=foot -e # Note: you cannot actually use environment variables here
|
||||||
# launch-prefix=<not set>
|
# launch-prefix=<not set>
|
||||||
# list-executables-in-path=no
|
# list-executables-in-path=no
|
||||||
|
|
||||||
# anchor=center
|
# anchor=center
|
||||||
# x-margin=0
|
# x-margin=0
|
||||||
# y-margin=0
|
# y-margin=0
|
||||||
# lines=15
|
lines=10
|
||||||
# width=30
|
# width=30
|
||||||
# tabs=8
|
# tabs=8
|
||||||
# horizontal-pad=40
|
# horizontal-pad=40
|
||||||
|
|
@ -45,13 +45,13 @@ font=Monospace:size=16
|
||||||
# match-workers=<number of logical CPUs>
|
# match-workers=<number of logical CPUs>
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
background=1A1B26ff
|
background=191724ff
|
||||||
text=A9B1D6ff
|
text=e0def4ff
|
||||||
match=2AC3DEff
|
match=9ccfd8ff
|
||||||
selection=444B6Aff
|
selection=26233aff
|
||||||
selection-text=CBCCD1ff
|
selection-text=908caaff
|
||||||
selection-match=2AC3DEff
|
selection-match=ebbcbaff
|
||||||
border=A9B1D6ff
|
border=9ccfd8ff
|
||||||
|
|
||||||
[border]
|
[border]
|
||||||
width=1
|
width=1
|
||||||
|
|
|
||||||
|
|
@ -1,110 +1,110 @@
|
||||||
[alias]
|
[alias]
|
||||||
a=add
|
a = "add"
|
||||||
aa=add .
|
aa = "add ."
|
||||||
aliases=! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM=$(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^ ||'
|
aliases = "! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM= $(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^ ||'"
|
||||||
ap=add -p
|
ap = "add -p"
|
||||||
b=! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'
|
b = "! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'"
|
||||||
bD=branch -D
|
bD = "branch -D"
|
||||||
ba=branch -a
|
ba = "branch -a"
|
||||||
bc=branch -c
|
bc = "branch -c"
|
||||||
bd=branch -d
|
bd = "branch -d"
|
||||||
br=branch -r
|
br = "branch -r"
|
||||||
c=! git commit --verbose; git push
|
c = "! git commit --verbose; git push"
|
||||||
ca=! git c --amend
|
ca = "! git c --amend"
|
||||||
cf=! git commit --verbose; git push --force
|
cf = "! git commit --verbose; git push --force"
|
||||||
ch=switch -C
|
ch = "switch -C"
|
||||||
change=switch -C
|
change = "switch -C"
|
||||||
cl=clone
|
cl = "clone"
|
||||||
cm=commit -m
|
cm = "commit -m"
|
||||||
co=checkout
|
co = "checkout "
|
||||||
cp=cherry-pick ; usually abusive; sometimes necessary
|
cp = "cherry-pick ; usually abusive; sometimes necessary"
|
||||||
create=! git bc
|
create = "! git bc"
|
||||||
d=diff
|
d = "diff"
|
||||||
dc=diff --cached
|
dc = "diff --cached"
|
||||||
ds=diff --stat
|
ds = "diff --stat"
|
||||||
expire=! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now
|
expire = "! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now"
|
||||||
f=fetch
|
f = "fetch"
|
||||||
fe=fetch
|
fe = "fetch"
|
||||||
filelog=log --patch
|
filelog = "log --patch"
|
||||||
find=! git ls-files | grep -i
|
find = "! git ls-files | grep -i"
|
||||||
fl=log --patch
|
fl = "log --patch"
|
||||||
fp=fetch --prune ; removes branches not in upstream
|
fp = "fetch --prune ; removes branches not in upstream"
|
||||||
gr=grep -Ii
|
gr = "grep -Ii"
|
||||||
grep=grep -Ii
|
grep = "grep -Ii"
|
||||||
greproot=! git grr
|
greproot = "! git grr"
|
||||||
grr=! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f
|
grr = "! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f"
|
||||||
invert=revert
|
invert = "revert"
|
||||||
l=log --oneline --graph --decorate --parents
|
l = "log --oneline --graph --decorate --parents"
|
||||||
lasttag=describe --tags --abbrev=0
|
lasttag = "describe --tags --abbrev=0"
|
||||||
ll=log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
ll = "log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat"
|
||||||
lref=log --oneline --graph --decorate --parents --reflog
|
lref = "log --oneline --graph --decorate --parents --reflog"
|
||||||
ls=log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
|
ls = "log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short"
|
||||||
lt=describe --tags --abbrev=0
|
lt = "describe --tags --abbrev=0"
|
||||||
mailmap=! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f
|
mailmap = "! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f"
|
||||||
one=log -1 ; no input displays HEAD
|
one = "log -1 ; no input displays HEAD"
|
||||||
pd=push -d
|
pd = "push -d"
|
||||||
pf=push --force
|
pf = "push --force"
|
||||||
pl=pull
|
pl = "pull"
|
||||||
pp=pull --prune ; removes branches not in upstream
|
pp = "pull --prune ; removes branches not in upstream"
|
||||||
pr=pull --rebase ; rebases commits onto upstream
|
pr = "pull --rebase ; rebases commits onto upstream"
|
||||||
ps=push
|
ps = "push"
|
||||||
pt=! f(){ git push $1 tag $2; }; f
|
pt = "! f(){ git push $1 tag $2; }; f"
|
||||||
r=rebase
|
r = "rebase"
|
||||||
ra=rebase --skip
|
ra = "rebase --skip"
|
||||||
rc=rebase --continue
|
rc = "rebase --continue"
|
||||||
re=restore
|
re = "restore"
|
||||||
ref=reflog
|
ref = "reflog"
|
||||||
ri=rebase --interactive
|
ri = "rebase --interactive"
|
||||||
rm=rm -r
|
rm = "rm -r"
|
||||||
rmf=! git rm --force
|
rmf = "! git rm --force"
|
||||||
rq=rebase --quit
|
rq = "rebase --quit"
|
||||||
rs=rebase --abort
|
rs = "rebase --abort"
|
||||||
sh=show
|
sh = "show"
|
||||||
st=status
|
st = "status"
|
||||||
sw=switch ; new checkout - only switching branch w/o restoring worktree
|
sw = "switch ; new checkout - only switching branch w/o restoring worktree"
|
||||||
sync=! git fe upstream; git rebase upstream/main; git push
|
sync = "! git fe upstream; git rebase upstream/main; git push"
|
||||||
t=tag
|
t = "tag"
|
||||||
td=tag --delete
|
td = "tag --delete"
|
||||||
un=restore --staged --worktree
|
un = "restore --staged --worktree"
|
||||||
uncommit=switch -C
|
uncommit = "switch -C"
|
||||||
undo=restore --staged --worktree
|
undo = "restore --staged --worktree"
|
||||||
undo-specific=! f(){ git restore --source=\"$1\" $2; }; f
|
undo-specific = "! f(){ git restore --source=\"$1\" $2; }; f"
|
||||||
undo-stage=restore
|
undo-stage = "restore"
|
||||||
undo-unstaged=restore
|
undo-unstaged = "restore"
|
||||||
undo-work=restore --staged --worktree
|
undo-work = "restore --staged --worktree"
|
||||||
undo-wt=restore --staged --worktree
|
undo-wt = "restore --staged --worktree"
|
||||||
unstage=restore --staged
|
unstage = "restore --staged"
|
||||||
wa=! f(){ git worktree add ../$1 $1; }; f
|
wa = "! f(){ git worktree add ../$1 $1; }; f"
|
||||||
wc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f
|
wc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f"
|
||||||
wcreate=! git wc
|
wcreate = "! git wc"
|
||||||
wmv=worktree move
|
wmv = "worktree move"
|
||||||
wnew=! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f
|
wnew = "! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f"
|
||||||
wr=worktree remove
|
wr = "worktree remove"
|
||||||
wrm=! git wr
|
wrm = "! git wr"
|
||||||
wsc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f
|
wsc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f"
|
||||||
wshallow=! git wsc
|
wshallow = "! git wsc"
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetuprebase=always
|
autosetuprebase = "always"
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
branch=auto
|
branch = "auto"
|
||||||
diff=auto
|
diff = "auto"
|
||||||
status=auto
|
status = "auto"
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign=true
|
gpgsign = "true"
|
||||||
|
|
||||||
[gpg]
|
[gpg]
|
||||||
format=ssh
|
format = "ssh"
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
email=amad@atl.tools
|
email = "amad@atl.tools"
|
||||||
name=Artur Manuel
|
name = "Artur Manuel"
|
||||||
signingKey=~/.ssh/id_ed25519.pub
|
signingKey = "~/.ssh/id_ed25519.pub"
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = "main"
|
defaultBranch = "main"
|
||||||
|
|
||||||
[credential]
|
[credential]
|
||||||
helper = "git-credential-libsecret"
|
helper ="git-credential-libsecret"
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
font=monospace 15
|
font=monospace 13
|
||||||
width=450
|
width=450
|
||||||
height=220
|
height=220
|
||||||
text-color=#A9B1D6ff
|
text-color=#e0def4ff
|
||||||
background-color=#16161Eff
|
background-color=#191724ff
|
||||||
border-color=#0DB9D7ff
|
border-color=#9ccfd8ff
|
||||||
border-size=1
|
border-size=1
|
||||||
|
|
||||||
|
[mode=do-not-disturb]
|
||||||
|
invisible=1
|
||||||
|
|
@ -190,8 +190,8 @@ layout {
|
||||||
// off
|
// off
|
||||||
|
|
||||||
width 1
|
width 1
|
||||||
active-color "#b4f9f8"
|
active-color "#9ccfd8"
|
||||||
inactive-color "#16161e"
|
inactive-color "#191724"
|
||||||
|
|
||||||
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
||||||
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
||||||
|
|
@ -518,6 +518,6 @@ binds {
|
||||||
}
|
}
|
||||||
|
|
||||||
cursor {
|
cursor {
|
||||||
xcursor-theme "Simp1e-Tokyo-Night"
|
xcursor-theme "BreezeX-RosePine-Linux"
|
||||||
xcursor-size 24
|
xcursor-size 24
|
||||||
}
|
}
|
||||||
|
|
@ -2,26 +2,26 @@ from theme import load_theme
|
||||||
|
|
||||||
config.load_autoconfig()
|
config.load_autoconfig()
|
||||||
|
|
||||||
tokyo_night = {
|
theme = {
|
||||||
"base00": "#1a1b26",
|
"base00": "#191724",
|
||||||
"base01": "#16161e",
|
"base01": "#1f1d2e",
|
||||||
"base02": "#2f3549",
|
"base02": "#26233a",
|
||||||
"base03": "#444b6a",
|
"base03": "#6e6a86",
|
||||||
"base04": "#787c99",
|
"base04": "#908caa",
|
||||||
"base05": "#a9b1d6",
|
"base05": "#e0def4",
|
||||||
"base06": "#cbccd1",
|
"base06": "#e0def4",
|
||||||
"base07": "#d5d6db",
|
"base07": "#524f67",
|
||||||
"base08": "#c0caf5",
|
"base08": "#eb6f92",
|
||||||
"base09": "#a9b1d6",
|
"base09": "#f6c177",
|
||||||
"base0A": "#0db9d7",
|
"base0A": "#ebbcba",
|
||||||
"base0B": "#9ece6a",
|
"base0B": "#31748f",
|
||||||
"base0C": "#b4f9f8",
|
"base0C": "#9ccfd8",
|
||||||
"base0D": "#2ac3de",
|
"base0D": "#c4a7e7",
|
||||||
"base0E": "#bb9af7",
|
"base0E": "#f6c177",
|
||||||
"base0F": "#f7768e",
|
"base0F": "#524f67",
|
||||||
}
|
}
|
||||||
|
|
||||||
load_theme(c, tokyo_night)
|
load_theme(c, theme)
|
||||||
|
|
||||||
c.colors.webpage.preferred_color_scheme = "dark"
|
c.colors.webpage.preferred_color_scheme = "dark"
|
||||||
c.tabs.position = "top"
|
c.tabs.position = "top"
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
@define-color base00 #1A1B26;
|
@define-color base00 #191724;
|
||||||
@define-color base01 #16161E;
|
@define-color base01 #1f1d2e;
|
||||||
@define-color base02 #2F3549;
|
@define-color base02 #26233a;
|
||||||
@define-color base03 #444B6A;
|
@define-color base03 #6e6a86;
|
||||||
@define-color base04 #787C99;
|
@define-color base04 #908caa;
|
||||||
@define-color base05 #A9B1D6;
|
@define-color base05 #e0def4;
|
||||||
@define-color base06 #CBCCD1;
|
@define-color base06 #e0def4;
|
||||||
@define-color base07 #D5D6DB;
|
@define-color base07 #524f67;
|
||||||
@define-color base08 #C0CAF5;
|
@define-color base08 #eb6f92;
|
||||||
@define-color base09 #A9B1D6;
|
@define-color base09 #f6c177;
|
||||||
@define-color base0A #0DB9D7;
|
@define-color base0A #ebbcba;
|
||||||
@define-color base0B #9ECE6A;
|
@define-color base0B #31748f;
|
||||||
@define-color base0C #B4F9F8;
|
@define-color base0C #9ccfd8;
|
||||||
@define-color base0D #2AC3DE;
|
@define-color base0D #c4a7e7;
|
||||||
@define-color base0E #BB9AF7;
|
@define-color base0E #f6c177;
|
||||||
@define-color base0F #F7768E;
|
@define-color base0F #524f67;
|
||||||
|
|
||||||
* {
|
* {
|
||||||
color: @base05;
|
color: @base05;
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
font-size: 17px;
|
font-size: 15px;
|
||||||
border-radius: 0px;
|
border-radius: 0px;
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
@ -36,3 +36,7 @@ window#waybar {
|
||||||
color: @base0D;
|
color: @base0D;
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
padding: 8px 12px;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
"L+ %h/.config/waybar - - - - ${./configs/waybar}"
|
"L+ %h/.config/waybar - - - - ${./configs/waybar}"
|
||||||
"L+ %h/.face.icon - - - - ${./.face.icon}"
|
"L+ %h/.face.icon - - - - ${./.face.icon}"
|
||||||
"L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}"
|
"L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}"
|
||||||
"L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
|
# "L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
|
||||||
];
|
];
|
||||||
packages = builtins.attrValues {
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
|
|
@ -31,16 +31,15 @@
|
||||||
nautilus
|
nautilus
|
||||||
librewolf
|
librewolf
|
||||||
playerctl
|
playerctl
|
||||||
geary
|
evolution
|
||||||
qutebrowser
|
qutebrowser
|
||||||
mako
|
|
||||||
gh
|
gh
|
||||||
fuzzel
|
fuzzel
|
||||||
foot
|
foot
|
||||||
signal-desktop
|
signal-desktop
|
||||||
dino
|
dino
|
||||||
polari
|
polari
|
||||||
vesktop
|
# vesktop
|
||||||
;
|
;
|
||||||
inherit (inputs.hetch.packages.${pkgs.system}) hetch;
|
inherit (inputs.hetch.packages.${pkgs.system}) hetch;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
5
hosts/cityseventeen/users/default.nix
Normal file
5
hosts/cityseventeen/users/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./arturm
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, ... }:
|
{ ... }:
|
||||||
|
let
|
||||||
|
listFiles = dir: builtins.attrNames (builtins.readDir dir);
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = lib.pipe (builtins.readDir ./.) [
|
imports = map (n: ./${n}) (builtins.filter (n: n != "default.nix") (listFiles ./.));
|
||||||
(lib.filterAttrs (n: _v: n != "default.nix" && lib.last (lib.stringToCharacters n) != "~"))
|
|
||||||
(lib.mapAttrsToList (n: _v: ./${n}))
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
23
hosts/shared/mako.nix
Normal file
23
hosts/shared/mako.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.alqueva.programs.mako;
|
||||||
|
|
||||||
|
inherit (lib.options) mkEnableOption mkPackageOption;
|
||||||
|
inherit (lib.modules) mkIf;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.alqueva.programs.mako = {
|
||||||
|
enable = mkEnableOption "mako";
|
||||||
|
package = mkPackageOption pkgs "mako" { };
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
systemd.packages = [ cfg.package ];
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue