xmozoid/ultima
xmozoid/ultima
1
0
Fork 0
mirror of https://git.sr.ht/~neverness/ultima synced 2025-05-13 06:15:15 +00:00
Code Activity

very big changes? uh?

Browse source
This commit is contained in:
nixzoid 2025-02-13 22:05:59 +09:00
parent af478a0493
commit 96b4795261
53 changed files with 283 additions and 233 deletions

67
libx/default.nix
View file

@ -1,51 +1,43 @@
{
inputs,
lib,
# lol
pass ? "~/passwords.kdbx",
# variables
hostName ? "sus",
userName ? "amogus",
flakeDir ? "/etc/nixos",
is ? null,
# customize
theme ? "horizon-dark",
image ? "train",
# sys info
plfrm ? "x86_64-linux",
ver ? "24.05",
path ? {
pass = null;
flakeDir = "/etc/nixos";
},
sys ? {
hostName = "starship";
userName = "amogus";
is = null;
platform = "x86_64-linux";
ver = "24.05";
},
styl ? {
theme = "horizon-dark";
image = "train";
},
...
}:
let
# OTHER
pkgs = inputs.nixpkgs.legacyPackages.${plfrm};
pkgs = nixpkgs.legacyPackages.${sys.platform};
inherit (inputs) home-manager nixpkgs;
inherit (nixpkgs.lib) nixosSystem;
inherit (nixpkgs) lib;
# NEEDS
args = { inherit x inputs; };
x =
import ./options.nix { inherit inputs pkgs lib; }
// import ./mkOpt.nix { inherit lib; }
// {
inherit
pass
# variables
hostName
userName
flakeDir
is
# customize
theme
image
# sys info
plfrm
ver
;
inherit path sys styl;
};
mk =
n:
let
mod = ../modules/${n};
modEx = builtins.pathExists mod;
mac = ../machines/${sys.hostName}/${type};
macEx = builtins.pathExists mac;
type =
if n == "nixos" then
"host"
@ -54,15 +46,12 @@ let
else
"";
in
[
../modules/${n}
../machines/${hostName}/${type}
];
[ ] ++ lib.optional modEx mod ++ lib.optional macEx mac;
in
# configurations
{
formatter = pkgs.nixfmt-rfc-style;
nixosConfigurations.${hostName} = nixosSystem {
nixosConfigurations.${sys.hostName} = lib.nixosSystem {
specialArgs = args;
modules = [
home-manager.nixosModules.home-manager
@ -72,12 +61,12 @@ in
extraSpecialArgs = args;
useGlobalPkgs = true;
useUserPackages = true;
users.${userName} = {
users.${sys.userName} = {
imports = mk "home";
home = {
username = userName;
stateVersion = ver;
homeDirectory = "/home/${userName}";
username = sys.userName;
stateVersion = sys.ver;
homeDirectory = "/home/${sys.userName}";
};
};
};

46
libx/nixpkgs/default.nix
View file

@ -1,35 +1,17 @@
{
# overlays, nix subsitutters and keys
substituters = [
"https://nix-gaming.cachix.org" # NIX GAMING
"https://hyprland.cachix.org" # HYPRLAND
"https://cache.garnix.io" # AYUGRAM
"https://helix.cachix.org" # HELIX
];
keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" # NIX GAMING
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" # HYPRLAND
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" # AYUGRAM
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" # HELIX
];
overlays = [
(self: super: {
steam-run =
(super.steam.override {
extraLibraries =
pkgs: with pkgs; [
libxkbcommon
mesa
wayland
(sndio.overrideAttrs (old: {
postFixup =
old.postFixup
+ ''
ln -s $out/lib/libsndio.so $out/lib/libsndio.so.6.1
'';
}))
];
}).run;
})
];
nix = {
substituters = [
"https://nix-gaming.cachix.org" # NIX GAMING
"https://hyprland.cachix.org" # HYPRLAND
"https://cache.garnix.io" # AYUGRAM
"https://helix.cachix.org" # HELIX
];
keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" # NIX GAMING
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" # HYPRLAND
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" # AYUGRAM
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" # HELIX
];
};
}

4
libx/options.nix
View file

@ -17,8 +17,8 @@ import ./nixpkgs
on.enable = true;
off.enable = false;
gen = type: text: lib.generators.${type} { } text;
workspaces =
gen = type: text: lib.generators.${toString type} { } text;
wm.workspaces =
with builtins;
(concatLists (
genList (

2
libx/umport.nix
View file

@ -3,13 +3,13 @@
...
}:
let
recursive = true;
umport =
{
path ? null,
paths ? [ ],
include ? [ ],
exclude ? [ ],
recursive ? true,
}:
with lib;
with fileset;

1
machines/default.nix
View file

@ -2,5 +2,6 @@
imports = [
./embrace
./jetpure
./nixtended
];
}

29
machines/embrace/default.nix
View file

@ -1,16 +1,21 @@
{ inputs, lib, ... }:
{ inputs, ... }:
{
flake = import ../../libx {
inherit inputs lib;
flakeDir = "/persist/flake";
# variables
hostName = "embrace";
userName = "huggyer";
is = "laptop";
# customize
theme = "neo-gen";
image = "town";
# sys info
ver = "24.05";
inherit inputs;
path = {
flakeDir = "/persist/flake";
pass = "/persist/vault/passwords.kdbx";
};
sys = {
hostName = "embrace";
userName = "huggyer";
is = "laptop";
platform = "x86_64-linux";
ver = "24.05";
};
styl = {
theme = "neo-gen";
image = "town";
};
};
}

1
machines/embrace/home/hyprland.nix
View file

@ -19,7 +19,6 @@
(m "$tb" "tofi-drun | xargs hyprctl dispatch exec -- ")
(s "$tb" "tofi-drun -c ~/.config/tofi/horizontal | xargs hyprctl dispatch exec -- ")
(s "$sp" "killall -SIGUSR1 .waybar-wrapped")
(s "$sp" "killall -SIGUSR1 .waybar-wrapped")
# programs
(m "$rt" "kitty")

2
machines/embrace/host/default.nix
View file

@ -50,11 +50,9 @@ in
misc = {
console = off;
locales.zone = "Asia/Chita";
minimal = on;
protonmail = off;
security = on;
terraria = off;
users = on;
variables = on;
};
};

30
machines/jetpure/default.nix
View file

@ -1,17 +1,21 @@
{ inputs, lib, ... }:
{ inputs, ... }:
{
flake = import ../../libx {
inherit inputs lib;
flakeDir = "/persist/flake";
pass = "/persist/vault/passwords.kdbx";
# variables
hostName = "jetpure";
userName = "nixzoid";
is = "desktop";
# customize
theme = "paradise";
image = "lampa";
# sys info
ver = "24.05";
inherit inputs;
path = {
flakeDir = "/persist/flake";
pass = "/persist/vault/passwords.kdbx";
};
sys = {
hostName = "jetpure";
userName = "nixzoid";
is = "desktop";
platform = "x86_64-linux";
ver = "24.05";
};
styl = {
theme = "paradise";
image = "lampa";
};
};
}

2
machines/jetpure/home/default.nix
View file

@ -1,4 +1,4 @@
{ x, config, ... }:
{ x, ... }:
let
inherit (x) on off umport;
in

1
machines/jetpure/home/pkgs.nix
View file

@ -9,6 +9,7 @@ in
{
module.programs = {
gui.pkgs = with pkgs; [
portablemc
vesktop
qbittorrent-enhanced
filezilla

2
machines/jetpure/host/default.nix
View file

@ -49,11 +49,9 @@ in
misc = {
console = off;
locales.zone = "Asia/Chita";
minimal = on;
protonmail = off;
security = on;
terraria = off;
users = on;
variables = on;
};
};

17
machines/nixtended/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ inputs, ... }:
{
flake = import ../../libx {
inherit inputs;
sys = {
hostName = "starship";
userName = "amogus";
is = "iso";
platform = "x86_64-linux";
ver = "24.05";
};
styl = {
theme = "horizon-dark";
image = "clouds";
};
};
}

11
machines/nixtended/home/default.nix Normal file
View file

@ -0,0 +1,11 @@
{ x, ... }:
let
inherit (x) on umport;
in
{
imports = umport {
path = ./.;
exclude = [ ./default.nix ];
};
module.themes.stylix = on;
}

18
machines/nixtended/host/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ x, ... }:
let
inherit (x) on umport;
in
{
imports = umport {
path = ./.;
exclude = [ ./default.nix ];
};
module = {
base = on;
themes.stylix = on;
services = {
amneziawg = on;
zram.algo = "zstd";
};
};
}

14
machines/nixtended/host/settings.nix Normal file
View file

@ -0,0 +1,14 @@
{
pkgs,
modulesPath,
...
}:
{
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
environment.systemPackages = with pkgs; [
fff
helix
disko
gitMinimal
];
}

2
modules/home/misc/dconf/default.nix
View file

@ -44,7 +44,7 @@ in
background-color = "gray";
};
"${gn}/World/Secrets/last-opened-database" = {
last-opened-database = "file://${x.pass}";
last-opened-database = "file://${x.path.pass}";
generator-length = 24;
generator-use-numbers = true;
};

6
modules/home/misc/nix/default.nix
View file

@ -12,11 +12,11 @@ with x;
"flakes"
];
trusted-users = [
"${userName}"
"${sys.userName}"
"@wheel"
];
extra-substituters = x.substituters;
extra-trusted-public-keys = x.keys;
extra-substituters = x.nix.substituters;
extra-trusted-public-keys = x.nix.keys;
builders-use-substitutes = true;
auto-optimise-store = true;
};

2
modules/home/programs/cli/common/default.nix
View file

@ -21,8 +21,6 @@ in
bat = on;
eza = on;
fd = on;
fzf = on;
git = on;
ripgrep = on;
zoxide = on;
};

6
modules/home/programs/cli/git/default.nix
View file

@ -20,12 +20,12 @@ in
config = mkIf cfg.enable {
programs.git = on // {
package = pkgs.gitMinimal;
userName = userName;
userEmail = "${userName}@${hostName}.org";
userName = sys.userName;
userEmail = "${sys.userName}@${sys.hostName}.org";
extraConfig = {
color.ui = true;
init.defaultBranch = "main";
safe.directory = flakeDir;
safe.directory = path.flakeDir;
};
};
};

6
modules/home/programs/cli/yazi/binds.nix
View file

@ -205,7 +205,7 @@ with x;
"f"
"f"
];
run = "cd ${flakeDir}";
run = "cd ${path.flakeDir}";
desc = "Go to flake main dir";
}
{
@ -214,7 +214,7 @@ with x;
"f"
"h"
];
run = "cd ${flakeDir}/modules/home";
run = "cd ${path.flakeDir}/modules/home";
desc = "Go to home modules";
}
{
@ -223,7 +223,7 @@ with x;
"f"
"H"
];
run = "cd ${flakeDir}/modules/host";
run = "cd ${path.flakeDir}/modules/host";
desc = "Go to nixos modules";
}
{

22
modules/home/programs/cli/yazi/sets.nix
View file

@ -23,9 +23,7 @@
max_width = 5000;
};
opener = {
open = [
{ run = "xdg-open $@"; }
];
open = [ { run = "xdg-open $@"; } ];
edit = [
{
run = ''hx "$@"'';
@ -52,11 +50,25 @@
run = "onlyoffice-desktopeditors";
}
];
extract = [
{ run = ''ouch d -y "$@"''; }
extract = [ { run = ''ouch d -y "$@"''; } ];
kdbx = [
{
run = ''keepassxc $@'';
orphan = true;
}
];
};
open = {
prepend_rules = [
# kdbx
{
name = "*.kdbx";
use = [
"kdbx"
"reveal"
];
}
];
rules = [
# Folder
{

8
modules/home/programs/gui/mpv/default.nix
View file

@ -48,9 +48,9 @@ in
glsl-shaders =
let
mk =
if x.is == "laptop" then
if x.sys.is == "laptop" then
"${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
else if x.is == "desktop" then
else if x.sys.is == "desktop" then
"${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_Restore_CNN_M.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
else
null;
@ -60,9 +60,9 @@ in
extraInput =
let
mk =
if x.is == "laptop" then
if x.sys.is == "laptop" then
(import ./anime4k/laptop.nix { inherit pkgs; })
else if x.is == "desktop" then
else if x.sys.is == "desktop" then
(import ./anime4k/desktop.nix { inherit pkgs; })
else
null;

2
modules/home/programs/gui/qbittorrent/default.nix
View file

@ -19,6 +19,7 @@ in
config = mkIf cfg.enable {
xdg.configFile = {
"qBittorrent/themes/default/config.json".text = x.gen "toJSON" {
"version" = 2;
"colors.dark" = {
"Log.BannedPeer" = "#b66467";
"Log.Critical" = "#b66467";
@ -44,7 +45,6 @@ in
"TransferList.StalledUploading" = "#bbb6b6";
"TransferList.Uploading" = "#bbb6b6";
};
"version" = 2;
};
};
};

2
modules/home/programs/gui/qutebrowser/binds.nix
View file

@ -17,7 +17,7 @@ in
",m" = "spawn mpv {url}";
",M" = "hint links spawn mpv {hint-url}";
# keepassxc
",p" = "spawn --userscript qute-keepass -p ${x.pass}";
",p" = "spawn --userscript qute-keepass -p ${x.path.pass}";
# transPopup
",t" = "spawn --userscript ${translate}/exe -s en -t ru";
",T" = "spawn --userscript ${tranPopup}/exe --target_lang ru";

6
modules/home/shells/fish/default.nix
View file

@ -26,9 +26,9 @@ in
shellInitLast =
let
winman =
if x.is == "desktop" then
if x.sys.is == "desktop" then
"Hyprland"
else if x.is == "laptop" then
else if x.sys.is == "laptop" then
"Hyprland"
else
"fastfetch";
@ -48,7 +48,7 @@ in
set -g tide_right_prompt_items cmd_duration
set -g tide_cmd_duration_icon
set -g tide_cmd_duration_threshold 1000
set -g tide_pwd_icon_home "home of user ${userName}"
set -g tide_pwd_icon_home "home of user ${sys.userName}"
set -g tide_pwd_icon 󰋜
set -g tide_pwd_icon_unwritable 󰌾

2
modules/home/shells/starship/default.nix
View file

@ -71,7 +71,7 @@ in
vimcmd_replace_symbol = "[R](bold purple)";
vimcmd_visual_symbol = "[V](bold yellow)";
};
battery = mkIf (is == "laptop") {
battery = mkIf (x.sys.is == "laptop") {
format = "[$symbol $percentage]($style)";
full_symbol = "󰁹";
charging_symbol = "󰂄";

3
modules/home/shells/zsh/plugins.nix
View file

@ -3,10 +3,9 @@
pkgs,
...
}:
with x;
with pkgs;
{
ohMyZsh = on // {
ohMyZsh = x.on // {
plugins = [
"git"
"eza"

10
modules/home/themes/stylix/default.nix
View file

@ -40,20 +40,24 @@ in
let
mode =
with config.lib.stylix.colors.withHashtag;
if x.is == "laptop" then
if x.sys.is == "laptop" then
{
background_color = "${base08}";
outline_color = "${base00}";
accent_color = "${base08}";
}
else if x.is == "desktop" then
else if x.sys.is == "desktop" then
{
background_color = "${base0E}";
outline_color = "${base00}";
accent_color = "${base0E}";
}
else
{ };
{
background_color = "${base00}";
outline_color = "${base05}";
accent_color = "${base05}";
};
in
google-cursor.override mode;
};

2
modules/home/wm/hyprland/binds.nix
View file

@ -77,7 +77,7 @@ in
(mk null "$s" "$PR, exec, ${getExe grimblast} copysave output ${pic}")
] # modules
++ cfg.binds
++ x.workspaces;
++ x.wm.workspaces;
# HOLDING BUTTONS
binde =

2
modules/home/wm/hyprland/default.nix
View file

@ -32,7 +32,7 @@ in
config
;
}
// import ./rules.nix { inherit x lib config; }
// import ./rules.nix { inherit config; }
// import ./sets.nix {
inherit
x

4
modules/home/wm/hyprland/sets.nix
View file

@ -23,9 +23,9 @@ with config.lib.stylix.colors;
]
++ cfg.autostart;
monitor =
if x.is == "desktop" then
if x.sys.is == "desktop" then
"eDP-1, 1920x1080@60, 0x0, 1.2, transform, 0"
else if x.is == "laptop" then
else if x.sys.is == "laptop" then
"eDP-1, 1920x1080@60, 0x0, 1, transform, 0"
else
"eDP-1, 1920x1080@60, 0x0, 1, transform, 0";

6
modules/home/wm/misc/tofi/default.nix
View file

@ -7,7 +7,7 @@
with lib;
with x;
let
styl = config.lib.stylix.colors.withHashtag;
stylex = config.lib.stylix.colors.withHashtag;
cfg = config.module.wm.misc.tofi;
font = config.stylix.fonts;
in
@ -20,7 +20,7 @@ in
config = mkIf cfg.enable {
programs.tofi = on // {
settings = with styl; {
settings = with stylex; {
history = false;
hide-cursor = true;
text-cursor = true;
@ -46,7 +46,7 @@ in
};
};
xdg.configFile."tofi/horizontal".text =
with styl;
with stylex;
# conf
''
history = false

4
modules/nixos/base/default.nix
View file

@ -18,7 +18,7 @@ in
};
config = mkIf cfg.enable {
services.getty.autologinUser = userName; # AUTOLOGIN
services.getty.autologinUser = sys.userName; # AUTOLOGIN
boot = {
kernelPackages = with pkgs; linuxPackages_zen;
loader = {
@ -29,7 +29,7 @@ in
};
};
networking = {
hostName = hostName;
hostName = sys.hostName;
useDHCP = mkDefault true;
nameservers = [
"::1"

2
modules/nixos/default.nix
View file

@ -4,10 +4,12 @@
path = ./.;
# include & exclude files/directories
include = [
./themes/stylix/default.nix
./misc/users/default.nix
];
exclude = [
./default.nix
./themes/stylix
./misc/users
];
};

2
modules/nixos/hardware/boot/default.nix
View file

@ -22,7 +22,6 @@ in
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
config = mkIf cfg.enable {
boot = {
# ITSELF LOL
tmp.cleanOnBoot = true;
kernelModules = [ "kvm-amd" ];
consoleLogLevel = 0;
@ -43,7 +42,6 @@ in
"psmouse.synaptics_intertouch=0"
];
initrd = {
# IDK
compressor = "zstd";
compressorArgs = [ "-9" ];
verbose = false;

6
modules/nixos/misc/locales/default.nix
View file

@ -18,11 +18,11 @@ in
config =
let
ON = if cfg.zone != null then on else off;
time = if x.sys.is == "iso" then null else cfg.zone;
in
{
time.timeZone = cfg.zone; # TIME
services.chrony = ON; # SYNC TIME
time.timeZone = time; # TIME
services.chrony = on; # SYNC TIME
i18n.defaultLocale = "en_US.UTF-8";
};
}

29
modules/nixos/misc/minimal/default.nix
View file

@ -1,31 +1,18 @@
{
x,
lib,
config,
...
}:
with lib;
with x;
let
cfg = config.module.misc.minimal;
nahuy = mkDefault off;
nahuy = lib.mkDefault x.off;
in
{
options = {
module.misc.minimal = {
enable = mkBool false;
};
};
config = mkIf cfg.enable {
programs.command-not-found = nahuy;
documentation = off // {
# DISABLE MAN AND GUIDES
dev = nahuy;
doc = nahuy;
info = nahuy;
man = nahuy;
nixos = nahuy;
};
programs.command-not-found = nahuy;
documentation = x.off // {
dev = nahuy;
doc = nahuy;
info = nahuy;
man = nahuy;
nixos = nahuy;
};
}

11
modules/nixos/misc/nix/default.nix
View file

@ -20,20 +20,19 @@ in
"flakes"
];
trusted-users = [
"${userName}"
"${sys.userName}"
"@wheel"
];
substituters = x.substituters;
trusted-public-keys = x.keys;
substituters = x.nix.substituters;
trusted-public-keys = x.nix.keys;
};
};
nixpkgs = {
overlays = x.overlays;
hostPlatform = mkDefault plfrm;
hostPlatform = mkDefault sys.platform;
config = {
allowBroken = true;
allowUnfree = true;
};
};
system.stateVersion = ver;
system.stateVersion = sys.ver;
}

2
modules/nixos/misc/security/default.nix
View file

@ -23,7 +23,7 @@ in
wheelNeedsPassword = true;
extraRules = [
{
users = [ userName ];
users = [ sys.userName ];
groups = [ "wheel" ];
commands = with pkgs; [
{

30
modules/nixos/misc/users/default.nix
View file

@ -14,12 +14,12 @@ in
{
options = {
module.misc.users = {
enable = mkBool false;
passwd = mkStr "$6$T4HzrtblHxoBy.OJ$lHfkK82NM333C93PfFvuZZF0OfxY4.9V74.pKpYMRQiTDxkBYQn/H9Xmo40llzLkJiOauSm6hafGpDoc6AtLw.";
};
};
imports = with inputs; [ home-manager.nixosModules.home-manager ];
config = mkIf cfg.enable {
config = {
programs.fish = on;
users =
let
@ -38,22 +38,18 @@ in
in
{
defaultUserShell = pkgs.fish;
groups.${userName} = { };
users =
let
pass = "$6$i9pgNdhMRKSaq6l8$LN6X8d5315SSKUGuVEQDtmFYq2Gqal5RiAeXPfCFUERAsp1Ncq4cdN3nBO3TnmdvIUBS46fhU3Py0wi0v36R81";
in
{
${userName} = {
uid = 1000;
home = "/home/${userName}";
createHome = true;
isNormalUser = true;
extraGroups = grp;
initialHashedPassword = pass;
};
root.initialHashedPassword = pass;
groups.${sys.userName} = { };
users = {
${sys.userName} = {
uid = 1000;
home = "/home/${sys.userName}";
createHome = true;
isNormalUser = true;
extraGroups = grp;
initialHashedPassword = cfg.passwd;
};
root.initialHashedPassword = cfg.passwd;
};
};
};
}

6
modules/nixos/programs/common/default.nix
View file

@ -26,13 +26,13 @@ in
adb = on;
nano = off;
fuse.userAllowOther = true;
light = if x.is == "laptop" then on else off;
light = if x.sys.is == "laptop" then on else off;
git = on // {
package = mkDefault pkgs.gitMinimal;
};
ryzen-monitor-ng = if x.is == "desktop" then on else off;
ryzen-monitor-ng = if x.sys.is == "desktop" then on else off;
nh = on // {
flake = flakeDir;
flake = path.flakeDir;
};
};
};

2
modules/nixos/services/deluge/default.nix
View file

@ -20,7 +20,7 @@ in
config = mkIf cfg.enable {
services.deluge = on // {
package = pkgs.deluged;
dataDir = "/home/${userName}/Torrents";
dataDir = "/home/${sys.userName}/Torrents";
web = on // {
openFirewall = true;
};

2
modules/nixos/services/getty/default.nix
View file

@ -18,7 +18,7 @@ in
config = mkIf cfg.enable {
services.getty = {
greetingLine = "Good day my lord ahhhh ${userName}";
greetingLine = "Good day my lord ahhhh ${sys.userName}";
helpLine = "";
autologinOnce = true;
};

14
modules/nixos/themes/stylix/default.nix
View file

@ -1,8 +1,9 @@
{
x,
inputs,
pkgs,
lib,
config,
inputs,
...
}:
with lib;
@ -23,7 +24,16 @@ in
stylix = on // {
# COLORIZE !!!
autoEnable = false;
base16Scheme = "${base16}/${x.theme}.yaml";
image = import ./image.nix {
inherit
x
inputs
pkgs
lib
config
;
};
base16Scheme = "${base16}/${x.styl.theme}.yaml";
targets = {
console = on; # TTY
chromium = on; # TTY

54
modules/nixos/themes/stylix/image.nix
View file

@ -10,32 +10,30 @@ let
inherit (inputs) wallpapers;
inherit (pkgs) lutgen runCommand;
inherit (lib) getExe;
img = "${wallpapers}/${x.image}.jpg";
img = "${wallpapers}/${x.styl.image}.jpg";
in
{
stylix.image = runCommand "output.png" { } ''
${getExe lutgen} apply ${img} -o $out -- ${
builtins.concatStringsSep " " (
with config.lib.stylix.colors;
[
base00
base01
base02
base03
base04
base05
base06
base07
base08
base09
base0A
base0B
base0C
base0D
base0E
base0F
]
)
}
'';
}
runCommand "output.png" { } ''
${getExe lutgen} apply ${img} -o $out -- ${
builtins.concatStringsSep " " (
with config.lib.stylix.colors;
[
base00
base01
base02
base03
base04
base05
base06
base07
base08
base09
base0A
base0B
base0C
base0D
base0E
base0F
]
)
}
''

1
pkgs/anicli/api.nix
View file

@ -4,6 +4,7 @@
python3Packages,
verApi ? null,
}:
python3Packages.buildPythonApplication rec {
pname = "anicli_api";
version = verApi;

2
pkgs/anicli/chompjs.nix
View file

@ -2,9 +2,11 @@
fetchPypi,
python3Packages,
}:
let
setup = with python3Packages; [ setuptools ];
in
python3Packages.buildPythonApplication rec {
pname = "chompjs";
version = "1.3.0";

1
pkgs/anicli/default.nix
View file

@ -6,6 +6,7 @@
fetchPypi,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "anicli_ru";
version = verCli;

1
pkgs/anicli/eggella.nix
View file

@ -2,6 +2,7 @@
fetchPypi,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "eggella";
version = "0.1.7";

1
pkgs/qute/tranPopup.nix
View file

@ -3,6 +3,7 @@
fetchFromGitHub,
python313Packages,
}:
stdenv.mkDerivation {
name = "tranPopup";

2
pkgs/qute/translate.nix
View file

@ -1,8 +1,8 @@
{
stdenv,
fetchFromGitHub,
python313Packages,
}:
stdenv.mkDerivation {
name = "translate";

6
pkgs/torque/default.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl }:
{
stdenv,
fetchurl,
}:
stdenv.mkDerivation {
name = "torque";
dontUnpack = true;