push
This commit is contained in:
@@ -1,9 +1,22 @@
|
||||
{ inputs, ...}: {
|
||||
den.aspects.noctalia = {
|
||||
nixos = { ... }: {
|
||||
nixos = { pkgs, ... }: {
|
||||
imports = [ inputs.noctalia.nixosModules.default ];
|
||||
|
||||
programs.noctalia.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
slurp
|
||||
grim
|
||||
hyprpicker
|
||||
tesseract
|
||||
imagemagick
|
||||
zbar
|
||||
curl
|
||||
jq
|
||||
ffmpeg
|
||||
mpv
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,6 +34,24 @@
|
||||
|
||||
keybinds = {
|
||||
"Mod+T" = "spawn:cosmic-term";
|
||||
"Mod+E" = "spawn:cosmic-files";
|
||||
"Mod+B" = "spawn:librewolf";
|
||||
|
||||
"Mod+Q" = "window-close";
|
||||
"Mod+A" = "spawn:noctalia msg panel-toggle launcher";
|
||||
|
||||
"Mod+Left" = "window-focus-left";
|
||||
"Mod+Right" = "window-focus-right";
|
||||
"Mod+Up" = "window-focus-up";
|
||||
"Mod+Down" = "window-focus-down";
|
||||
|
||||
"Mod+Shift+Left" = "column-move-left";
|
||||
"Mod+Shift+Right" = "column-move-right";
|
||||
"Mod+Shift+Up" = "window-move-up";
|
||||
"Mod+Shift+Down" = "window-move-down";
|
||||
|
||||
"Mod+Comma"= "spawn:noctalia msg settings-toggle";
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
den.aspects.openvpn = {
|
||||
nixos = { pkgs, ... }: {
|
||||
networking.networkmanager = {
|
||||
plugins = with pkgs; [
|
||||
networkmanager-openvpn
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -3,6 +3,8 @@
|
||||
nixos = { pkgs, ... }: {
|
||||
nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
#boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
|
||||
|
||||
#nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
base0F = "F2CDCD";
|
||||
};
|
||||
in {
|
||||
homeManager = { pkgs, ... }: {
|
||||
nixos = { pkgs, ... }: {
|
||||
imports = [
|
||||
inputs.stylix.homeModules.stylix
|
||||
inputs.stylix.nixosModules.stylix
|
||||
];
|
||||
|
||||
stylix = {
|
||||
@@ -36,16 +36,13 @@
|
||||
name = "Twitter Color Emoji";
|
||||
package = pkgs.twitter-color-emoji;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
homeManager = { config, pkgs, ... }: {
|
||||
config.stylix = {
|
||||
targets = {
|
||||
vesktop.enable = true;
|
||||
gnome.enable = true;
|
||||
gtk.enable = true;
|
||||
gtk.flatpakSupport.enable = true;
|
||||
firefox.enable = true;
|
||||
fish.enable = true;
|
||||
opencode.enable = false;
|
||||
librewolf.enable = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
mailserver
|
||||
# matrix
|
||||
redlib
|
||||
bugtv
|
||||
# bugtv
|
||||
# sish
|
||||
vscode-server
|
||||
gitea
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
openssh
|
||||
syncthing
|
||||
tailscale
|
||||
openvpn
|
||||
|
||||
fish
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
niri
|
||||
noctalia
|
||||
umbriel
|
||||
|
||||
autocpufreq
|
||||
];
|
||||
|
||||
@@ -51,6 +51,8 @@
|
||||
"vortex@bug.tools"
|
||||
"codex@bug.tools"
|
||||
"tailscale@bug.tools"
|
||||
"firefox@bug.tools"
|
||||
"keldurn@bug.tools"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -144,13 +144,13 @@
|
||||
settings = {
|
||||
"{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" = {
|
||||
force = true;
|
||||
settings = inputs.catppuccin-userstyles-nix.stylusSettings.${pkgs.stdenv.hostPlatform.system} {
|
||||
/*settings = inputs.catppuccin-userstyles-nix.stylusSettings.${pkgs.stdenv.hostPlatform.system} {
|
||||
global = {
|
||||
lightFlavor = "mocha";
|
||||
darkFlavor = "mocha";
|
||||
accentColor = "mauve";
|
||||
};
|
||||
};
|
||||
};*/
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -6,139 +6,136 @@
|
||||
let
|
||||
inherit (pkgs) fetchurl symlinkJoin makeWrapper;
|
||||
|
||||
base =
|
||||
(
|
||||
inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig
|
||||
[
|
||||
{
|
||||
mods = [
|
||||
(fetchurl {
|
||||
name = "fabric-api.jar";
|
||||
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/i5tSkVBH/fabric-api-0.141.3+1.21.11.jar";
|
||||
sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46";
|
||||
})
|
||||
base = (inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig [{
|
||||
jvmArgs = [
|
||||
"-Dorg.lwjgl.opengl.Window.undecorated=true"
|
||||
];
|
||||
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "meteor-client.jar";
|
||||
url = "https://meteorclient.com/api/download";
|
||||
sha256 = "sha256:190vghnfg3invfy7qpizppxf29qyf5zz1iv5c8bfcq2q5r9mljqq";
|
||||
})
|
||||
mods = [
|
||||
(fetchurl {
|
||||
name = "fabric-api.jar";
|
||||
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/i5tSkVBH/fabric-api-0.141.3+1.21.11.jar";
|
||||
sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "baritone.jar";
|
||||
url = "https://www.meteorclient.com/api/downloadBaritone";
|
||||
sha256 = "sha256:0izys47kvqzhnds63kbxiifn8fsd8i9slzkhv91whwxp0183pf80";
|
||||
})
|
||||
*/
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "meteor-client.jar";
|
||||
url = "https://meteorclient.com/api/download";
|
||||
sha256 = "sha256:190vghnfg3invfy7qpizppxf29qyf5zz1iv5c8bfcq2q5r9mljqq";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "modmenu.jar";
|
||||
url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/Tyk71iSw/modmenu-17.0.0.jar";
|
||||
sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "baritone.jar";
|
||||
url = "https://www.meteorclient.com/api/downloadBaritone";
|
||||
sha256 = "sha256:0izys47kvqzhnds63kbxiifn8fsd8i9slzkhv91whwxp0183pf80";
|
||||
})
|
||||
*/
|
||||
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "distant-horizons.jar";
|
||||
url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar";
|
||||
sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n";
|
||||
})
|
||||
*/
|
||||
(fetchurl {
|
||||
name = "modmenu.jar";
|
||||
url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/Tyk71iSw/modmenu-17.0.0.jar";
|
||||
sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "voxy.jar";
|
||||
url = "https://cdn.modrinth.com/data/fxxUqruK/versions/H3w2nVdU/voxy-0.2.16-beta%2B1.21.11.jar";
|
||||
sha256 = "sha256:02z1cr7ccdss2ckgha7v89gsq65p2ibrcx8h9q3drxd4ck7jd0kz";
|
||||
})
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "distant-horizons.jar";
|
||||
url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar";
|
||||
sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n";
|
||||
})
|
||||
*/
|
||||
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "nvidium.jar";
|
||||
url = "https://cdn.modrinth.com/data/SfMw2IZN/versions/4x9ci9sF/nvidium-0.4.3-beta13-1.21.11.jar";
|
||||
sha256 = "sha256:0kdhz92lms2ghmcpzn1gj9rblh958bhic641jpvpkgn0rs70w54r";
|
||||
})
|
||||
*/
|
||||
(fetchurl {
|
||||
name = "voxy.jar";
|
||||
url = "https://cdn.modrinth.com/data/fxxUqruK/versions/H3w2nVdU/voxy-0.2.16-beta%2B1.21.11.jar";
|
||||
sha256 = "sha256:02z1cr7ccdss2ckgha7v89gsq65p2ibrcx8h9q3drxd4ck7jd0kz";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "iris.jar";
|
||||
url = "https://cdn.modrinth.com/data/YL57xq9U/versions/fDpuVzVr/iris-fabric-1.10.7+mc1.21.11.jar";
|
||||
sha256 = "sha256:06fb6r22gnsxnv2w0sgvfnsj6fk3a7jcxls7z14imjc9h6hmviaq";
|
||||
})
|
||||
/*
|
||||
(fetchurl {
|
||||
name = "nvidium.jar";
|
||||
url = "https://cdn.modrinth.com/data/SfMw2IZN/versions/4x9ci9sF/nvidium-0.4.3-beta13-1.21.11.jar";
|
||||
sha256 = "sha256:0kdhz92lms2ghmcpzn1gj9rblh958bhic641jpvpkgn0rs70w54r";
|
||||
})
|
||||
*/
|
||||
|
||||
(fetchurl {
|
||||
name = "sodium.jar";
|
||||
url = "https://cdn.modrinth.com/data/AANobbMI/versions/UddlN6L4/sodium-fabric-0.8.7+mc1.21.11.jar";
|
||||
sha256 = "sha256:10rrqnyn8mb14b1k3ks84g6033zkkn94fwvyyflaiajhnf3ax3y0";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "iris.jar";
|
||||
url = "https://cdn.modrinth.com/data/YL57xq9U/versions/fDpuVzVr/iris-fabric-1.10.7+mc1.21.11.jar";
|
||||
sha256 = "sha256:06fb6r22gnsxnv2w0sgvfnsj6fk3a7jcxls7z14imjc9h6hmviaq";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "lithium.jar";
|
||||
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/Ow7wA0kG/lithium-fabric-0.21.4+mc1.21.11.jar";
|
||||
sha256 = "sha256:12y704i98rf0xb438f72hi0aqhsi35jxwjs2575vsg5lllfw8dai";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "sodium.jar";
|
||||
url = "https://cdn.modrinth.com/data/AANobbMI/versions/UddlN6L4/sodium-fabric-0.8.7+mc1.21.11.jar";
|
||||
sha256 = "sha256:10rrqnyn8mb14b1k3ks84g6033zkkn94fwvyyflaiajhnf3ax3y0";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "immediatelyfast.jar";
|
||||
url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/QwkfUKSj/ImmediatelyFast-Fabric-1.14.2+1.21.11.jar";
|
||||
sha256 = "sha256:1248yg69f5d232qn138xlcsdmbs2yj3gdjx9zl53v19c1j326pgb";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "lithium.jar";
|
||||
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/Ow7wA0kG/lithium-fabric-0.21.4+mc1.21.11.jar";
|
||||
sha256 = "sha256:12y704i98rf0xb438f72hi0aqhsi35jxwjs2575vsg5lllfw8dai";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "entity-culling.jar";
|
||||
url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/SK12FGQf/entityculling-fabric-1.10.0-mc1.21.11.jar";
|
||||
sha256 = "sha256:0iws5ql4k542lr4psrcw9hj5z4zz81218ywnpsl77zj8wnwm4l1d";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "immediatelyfast.jar";
|
||||
url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/QwkfUKSj/ImmediatelyFast-Fabric-1.14.2+1.21.11.jar";
|
||||
sha256 = "sha256:1248yg69f5d232qn138xlcsdmbs2yj3gdjx9zl53v19c1j326pgb";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "ferrite-core.jar";
|
||||
url = "https://cdn.modrinth.com/data/uXXizFIs/versions/Ii0gP3D8/ferritecore-8.2.0-fabric.jar";
|
||||
sha256 = "sha256:05f7q9jac16syfnahd6r4kx3aqm4i580y623gk6810plrdhdfszp";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "entity-culling.jar";
|
||||
url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/SK12FGQf/entityculling-fabric-1.10.0-mc1.21.11.jar";
|
||||
sha256 = "sha256:0iws5ql4k542lr4psrcw9hj5z4zz81218ywnpsl77zj8wnwm4l1d";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "dynamic-fps.jar";
|
||||
url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/PUe5Asxs/dynamic-fps-3.11.4+minecraft-1.21.11-fabric.jar";
|
||||
sha256 = "sha256:13dh0226f6j70ak752fj8s00hmrx175v9607plf4rhia9plqy3kx";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "ferrite-core.jar";
|
||||
url = "https://cdn.modrinth.com/data/uXXizFIs/versions/Ii0gP3D8/ferritecore-8.2.0-fabric.jar";
|
||||
sha256 = "sha256:05f7q9jac16syfnahd6r4kx3aqm4i580y623gk6810plrdhdfszp";
|
||||
})
|
||||
|
||||
# (fetchurl {
|
||||
# name = "removing-loading-screens.jar";
|
||||
# url = "https://cdn.modrinth.com/data/ZP7xHXtw/versions/TCSbq6jC/rrlsFabric-5.1.15+mc.1.21.11.jar";
|
||||
# sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57";
|
||||
# })
|
||||
];
|
||||
}
|
||||
]
|
||||
).withConfig
|
||||
{
|
||||
resourcePacks = [
|
||||
(fetchurl {
|
||||
name = "unique-dark.zip";
|
||||
url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip";
|
||||
sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "dynamic-fps.jar";
|
||||
url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/PUe5Asxs/dynamic-fps-3.11.4+minecraft-1.21.11-fabric.jar";
|
||||
sha256 = "sha256:13dh0226f6j70ak752fj8s00hmrx175v9607plf4rhia9plqy3kx";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "catppuccin.zip";
|
||||
url = "https://cdn.modrinth.com/data/S3nUv9ws/versions/znzS3kCV/Catppuccin%20Mocha%20Blue.zip";
|
||||
sha256 = "sha256:0w56gkyavz0gpffxs1gbp9676bwgvl845h56wc1x3qjba1nm8a5n";
|
||||
})
|
||||
];
|
||||
# (fetchurl {
|
||||
# name = "removing-loading-screens.jar";
|
||||
# url = "https://cdn.modrinth.com/data/ZP7xHXtw/versions/TCSbq6jC/rrlsFabric-5.1.15+mc.1.21.11.jar";
|
||||
# sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57";
|
||||
# })
|
||||
];
|
||||
|
||||
shaderPacks = [
|
||||
(fetchurl {
|
||||
name = "complementary-shaders.zip";
|
||||
url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/836bPNGo/ComplementaryReimagined_r5.7.1.zip";
|
||||
sha256 = "sha256:1w33kyknwc0qsi6l0saww906iwi9d3hkn0nm7hnl4bc3lws0d8i4";
|
||||
})
|
||||
];
|
||||
resourcePacks = [
|
||||
(fetchurl {
|
||||
name = "unique-dark.zip";
|
||||
url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip";
|
||||
sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621";
|
||||
})
|
||||
|
||||
appArgs = [
|
||||
"--gameDir"
|
||||
"/home/bug/.local/share/minecraft"
|
||||
];
|
||||
};
|
||||
(fetchurl {
|
||||
name = "catppuccin.zip";
|
||||
url = "https://cdn.modrinth.com/data/S3nUv9ws/versions/znzS3kCV/Catppuccin%20Mocha%20Blue.zip";
|
||||
sha256 = "sha256:0w56gkyavz0gpffxs1gbp9676bwgvl845h56wc1x3qjba1nm8a5n";
|
||||
})
|
||||
];
|
||||
|
||||
shaderPacks = [
|
||||
(fetchurl {
|
||||
name = "complementary-shaders.zip";
|
||||
url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/836bPNGo/ComplementaryReimagined_r5.7.1.zip";
|
||||
sha256 = "sha256:1w33kyknwc0qsi6l0saww906iwi9d3hkn0nm7hnl4bc3lws0d8i4";
|
||||
})
|
||||
];
|
||||
|
||||
appArgs = [
|
||||
"--gameDir"
|
||||
"/home/bug/.local/share/minecraft"
|
||||
];
|
||||
}]);
|
||||
|
||||
minecraft = symlinkJoin {
|
||||
name = "minecraft-wrapped";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
plugin = [ "opencode-plugin-llama.cpp@latest" "opencode-goal-plugin" ];
|
||||
plugin = [ "opencode-plugin-llama.cpp@latest" "opencode-goal-plugin" "@dietrichgebert/ponytail" ];
|
||||
|
||||
provider = {
|
||||
"llama.cpp" = {
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
users.users.bug.packages = with pkgs; [
|
||||
euphonica
|
||||
rhythmbox
|
||||
dopamine
|
||||
];
|
||||
|
||||
services.flatpak.packages = [
|
||||
|
||||
Reference in New Issue
Block a user