updated
This commit is contained in:
parent
8107890427
commit
a2a41f3d80
10 changed files with 110 additions and 83 deletions
87
flake.lock
generated
87
flake.lock
generated
|
|
@ -55,29 +55,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dankMaterialShell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"quickshell": [
|
||||
"quickshell"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772853183,
|
||||
"narHash": "sha256-X45DUAKLxyHKZCGHRko2nDmEYBUyA+OY3WefRbFcOh8=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "DankMaterialShell",
|
||||
"rev": "754bf8fa3cf98e96e62e6493e8900716737465ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "DankMaterialShell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -85,11 +62,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772699110,
|
||||
"narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=",
|
||||
"lastModified": 1772867152,
|
||||
"narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee",
|
||||
"rev": "eaafb89b56e948661d618eefd4757d9ea8d77514",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -98,6 +75,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dms-plugins-registry": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772893410,
|
||||
"narHash": "sha256-S8+Q/LGH9QL5vq8Tfa50OL1gPvIctdF0mcPuZ7uZ39c=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "dms-plugin-registry",
|
||||
"rev": "740861847b193c099a2a7aff7300293c99528410",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "dms-plugin-registry",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dw-proton": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
|
|
@ -277,11 +274,11 @@
|
|||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772769796,
|
||||
"narHash": "sha256-t6AO07NhiseIeHE3gzr2jXC4BcA5UEVUa89MLAOUzag=",
|
||||
"lastModified": 1772901710,
|
||||
"narHash": "sha256-iHVOdllj/cLEV7SdcvSjPem2pP6K7ISPL+HKnENoWjA=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "055ed28580e140f2a21b752946349750b963a7aa",
|
||||
"rev": "472b926a4d7abbacad4deea17aa0a0c69ffc12d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -492,11 +489,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772833450,
|
||||
"narHash": "sha256-XuuvhTD/72mH8MBncTeOyN0JzLCtwav7lkwBQlIofd4=",
|
||||
"lastModified": 1772907683,
|
||||
"narHash": "sha256-BD6e/J2oclB0dDyvPJ9hVLNByiXaXn4jQ+CUZu5g4Kk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433",
|
||||
"rev": "02f30ea15b349d1ed98b608ed06ec88c834592dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -778,11 +775,11 @@
|
|||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772764431,
|
||||
"narHash": "sha256-Lkj9b2Lajgdnfj42Uhkui5gRYPRnq8DEuCrZH+CRiDI=",
|
||||
"lastModified": 1772906589,
|
||||
"narHash": "sha256-RF6tdst0P1es2yY0w1BjptAzBPYNVUIRbjJ6cKOvefI=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "758f449e9c0b4e8b6f3e8720537fa8d958e1c103",
|
||||
"rev": "a2456108efbdb96c0a5c2d5f733bdf8704da8254",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -833,11 +830,11 @@
|
|||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772844206,
|
||||
"narHash": "sha256-b59yfzMwxTyILA3SFDOid2cERUloDaqly++pUb37O1U=",
|
||||
"lastModified": 1772891434,
|
||||
"narHash": "sha256-+MUN+5lOvWS6T4pvIZBGL4AKJkflLXGgVRYTlNeZEiE=",
|
||||
"owner": "kaylorben",
|
||||
"repo": "nixcord",
|
||||
"rev": "31c7f6333e7049209bc719870c8a4a7d1e2fa32e",
|
||||
"rev": "fc63af2dbc92cdcfeb6c650d986280057b0f135c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -894,11 +891,11 @@
|
|||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1772856837,
|
||||
"narHash": "sha256-OFAU7+9yXGJc9pUQ/Y9Xp3vpv+EiYdXRIkF1pN6YeiU=",
|
||||
"lastModified": 1772906963,
|
||||
"narHash": "sha256-jT3m0eiRH9TLqMsMVblze5/DPupInp8Qc8Gop8Zxfho=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1d784f7a68c694194ae3adf60db0d39c963d0d31",
|
||||
"rev": "5a60c0dff24e7109c0e87fd53e5bbc0032fa0cbd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -941,11 +938,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1772598333,
|
||||
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
||||
"lastModified": 1772822230,
|
||||
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
||||
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1128,8 +1125,8 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"aagl": "aagl",
|
||||
"dankMaterialShell": "dankMaterialShell",
|
||||
"disko": "disko",
|
||||
"dms-plugins-registry": "dms-plugins-registry",
|
||||
"dw-proton": "dw-proton",
|
||||
"furina-cursor": "furina-cursor",
|
||||
"ghostty": "ghostty",
|
||||
|
|
|
|||
30
flake.nix
30
flake.nix
|
|
@ -35,12 +35,17 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
dankMaterialShell = {
|
||||
url = "github:AvengeMedia/DankMaterialShell";
|
||||
dms-plugins-registry = {
|
||||
url = "github:AvengeMedia/dms-plugin-registry";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.quickshell.follows = "quickshell";
|
||||
};
|
||||
|
||||
# dankMaterialShell = {
|
||||
# url = "github:AvengeMedia/DankMaterialShell";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# inputs.quickshell.follows = "quickshell";
|
||||
# };
|
||||
|
||||
nvim-dots = {
|
||||
url = "github:alsaiduq-lab/nvim-dotfiles";
|
||||
flake = false;
|
||||
|
|
@ -102,13 +107,6 @@
|
|||
home-manager,
|
||||
nix-gaming,
|
||||
unstable,
|
||||
ghostty,
|
||||
furina-cursor,
|
||||
dankMaterialShell,
|
||||
disko,
|
||||
nix-index-database,
|
||||
aagl,
|
||||
dw-proton,
|
||||
sops-nix,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
|
@ -133,7 +131,6 @@
|
|||
rpcs3
|
||||
clear-sans
|
||||
binary-font
|
||||
dms-plugins
|
||||
;
|
||||
};
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -143,7 +140,7 @@
|
|||
};
|
||||
|
||||
modules = [
|
||||
aagl.nixosModules.default
|
||||
inputs.aagl.nixosModules.default
|
||||
{
|
||||
nixpkgs = {
|
||||
config = {
|
||||
|
|
@ -157,7 +154,7 @@
|
|||
ghostty = inputs.ghostty.packages.${system}.default;
|
||||
furina-cursor = inputs.furina-cursor.packages.${system}.default;
|
||||
grim-hyprland = inputs.grim-hyprland.packages.${system}.default;
|
||||
dms-shell = inputs.dankMaterialShell.packages.${system}.default;
|
||||
#dms-shell = inputs.dankMaterialShell.packages.${system}.default;
|
||||
proton-cachyos = inputs.proton-cachyos.packages.${system}.proton-cachyos;
|
||||
desktop-gremlin = inputs.linux-desktop-gremlin.packages.${system}.default;
|
||||
dgop = unstablePkgs.dgop;
|
||||
|
|
@ -173,7 +170,6 @@
|
|||
minijinja-cli
|
||||
thorium
|
||||
rpcs3
|
||||
dms-plugins
|
||||
;
|
||||
})
|
||||
];
|
||||
|
|
@ -189,7 +185,7 @@
|
|||
inherit inputs;
|
||||
hyprlanddots = inputs.hyprland-dots;
|
||||
nvimDots = inputs.nvim-dots;
|
||||
dankMaterialShell = inputs.dankMaterialShell.packages.${system}.default;
|
||||
#dankMaterialShell = inputs.dankMaterialShell.packages.${system}.default;
|
||||
};
|
||||
sharedModules = [
|
||||
inputs.nixcord.homeModules.nixcord
|
||||
|
|
@ -207,8 +203,8 @@
|
|||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
disko.nixosModules.disko
|
||||
nix-index-database.nixosModules.nix-index
|
||||
inputs.disko.nixosModules.disko
|
||||
inputs.nix-index-database.nixosModules.nix-index
|
||||
{
|
||||
nixpkgs = {
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
@ -21,10 +20,10 @@
|
|||
./modules/obs.nix
|
||||
./modules/mpv.nix
|
||||
./modules/ani-cli.nix
|
||||
./modules/quickshell.nix
|
||||
#./modules/quickshell.nix
|
||||
./modules/cava.nix
|
||||
./modules/imagemagick.nix
|
||||
inputs.dankMaterialShell.homeModules.dank-material-shell
|
||||
# inputs.dankMaterialShell.homeModules.dank-material-shell
|
||||
./modules/viv.nix
|
||||
./modules/godot.nix
|
||||
./modules/gremlin.nix
|
||||
|
|
@ -39,5 +38,6 @@
|
|||
# TODO: move these somewhere else; undecided
|
||||
home.packages = with pkgs; [
|
||||
nvtopPackages.full
|
||||
kdePackages.dolphin
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
pkgs,
|
||||
hyprlanddots,
|
||||
nvimDots,
|
||||
dankMaterialShell,
|
||||
...
|
||||
}: {
|
||||
home.activation.HyprlandDots = lib.hm.dag.entryAfter ["linkGeneration"] ''
|
||||
|
|
@ -12,7 +11,7 @@
|
|||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/hypr/" "${config.xdg.configHome}/hypr/"
|
||||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/cava/" "${config.xdg.configHome}/cava/"
|
||||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${nvimDots}/" "${config.xdg.configHome}/nvim/"
|
||||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${dankMaterialShell}/etc/xdg/quickshell/dms/" "${config.xdg.configHome}/quickshell/"
|
||||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${pkgs.dms-shell}/etc/xdg/quickshell/dms/" "${config.xdg.configHome}/quickshell/"
|
||||
${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/starship.toml" "${config.xdg.configHome}/starship.toml"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@
|
|||
#50 series nvidia drivers are kinda a mess; use 6.12 if there's any issues
|
||||
#kernelPackages = pkgs.linuxPackages_6_12;
|
||||
consoleLogLevel = 3;
|
||||
initrd.verbose = false;
|
||||
initrd = {
|
||||
verbose = false;
|
||||
kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
|
||||
};
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
|
|
|
|||
34
hosts/modules/dms.nix
Normal file
34
hosts/modules/dms.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [inputs.dms-plugins-registry.nixosModules.default];
|
||||
programs.dms-shell = {
|
||||
enable = true;
|
||||
quickshell.package = pkgs.quickshell;
|
||||
|
||||
systemd = {
|
||||
enable = true;
|
||||
restartIfChanged = true;
|
||||
};
|
||||
|
||||
enableSystemMonitoring = true;
|
||||
enableVPN = false;
|
||||
enableDynamicTheming = true;
|
||||
enableAudioWavelength = true;
|
||||
enableCalendarEvents = false;
|
||||
enableClipboardPaste = true;
|
||||
|
||||
plugins = {
|
||||
dankKDEConnect.enable = true;
|
||||
dankGifSearch.enable = true;
|
||||
calculator.enable = true;
|
||||
dockerManager.enable = true;
|
||||
developerUtilities.enable = true;
|
||||
emojiLauncher.enable = true;
|
||||
webSearch.enable = true;
|
||||
nixMonitor.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.dankMaterialShell.nixosModules.greeter
|
||||
];
|
||||
|
||||
programs.dank-material-shell.greeter = {
|
||||
services.displayManager.dms-greeter = {
|
||||
enable = true;
|
||||
compositor.name = "hyprland";
|
||||
configHome = "/home/${config.theme.user}";
|
||||
configFiles = ["/home/${config.theme.user}/.config/DankMaterialShell/settings.json"];
|
||||
quickshell.package = pkgs.quickshell;
|
||||
logs = {
|
||||
save = true;
|
||||
path = "/tmp/greeter.log";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
../settings.nix
|
||||
./cachix.nix
|
||||
|
|
@ -40,5 +36,6 @@
|
|||
./modules/ssh.nix
|
||||
./modules/sops.nix
|
||||
./modules/udisk.nix
|
||||
./modules/dms.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
git-credentials: ENC[AES256_GCM,data:kOVVBurPBwgihwgGr1HJAtYkq4lwAasxua0/D82KDjlAF4aiZdV/CBOZ9maJLGqdmj+lQE6DzkoErilcT/U7dAOpvpczIjnQqPSCkpuvqoEmdgmdjb8XqqVKomZT1n4/Tf4UGYdmyNq3zdgPvoPXVL3i,iv:lOXRkICBw+IUprfHsa97ecYfRcGpK9vsmNZvEPtHx5M=,tag:omWSF6ibBh3GZwvNmzsaLg==,type:str]
|
||||
git-credentials: ENC[AES256_GCM,data:M8RG0dGzBbnIV2Dg3Rz3jf8rcCIqyasuTLOL4Wbvd2lspVv10fboN4DgdaEs925ckY0wFiKGNpZAtgp46cPR6WxiEPmtQwFz+Yl67OqU0OVHl4o6NIKe9uOgiew5fpIxu66NMmsLiA==,iv:D4YL+2YH+o5EE0lXkYHcuInXBnMrhymDGC5lVrjQZYU=,tag:Ez1FR1Gr9FgCB3wEqJrLbw==,type:str]
|
||||
api:
|
||||
openai: ENC[AES256_GCM,data:N1gxGwwxkWZi0Zyh3j3ERvB46KB53pZbxYn1CAAN7xxI8H1F6xet/o0A964K/fw+0A52pKLUlUp6g6qN8E8rfdI8lRAk584w1vEeP3xORf8/zLg9xd17Zk221I1LDX4GPyF5mQV9LqJHnXMKyL4BAiWemCxbwg5URThcvUY6mdno6imeGLiGfgBH1UQKeapch7a+58iejkWrmPcystzT7Q9wigY=,iv:aXYTdRH5ZXQ3rGsNkRNQm/6NRfT3CN/VAuJZi/LH5ZE=,tag:p1jI/htGTmUzElSeo0f6aw==,type:str]
|
||||
deepseek: ENC[AES256_GCM,data:KYBtSBghIY2vsVRQGoKMJ87tLNtupjzeeEFa0vusl2pBvkI=,iv:gNtWrOd02svLHz38gQDGbAYzXW/tX42qaRjkyiObLLw=,tag:x+5FDRB8m0A9192pQ/5D9g==,type:str]
|
||||
|
|
@ -36,7 +36,7 @@ sops:
|
|||
MWloN252SnJPYitMYUN5eTZtbUtTbHMK1wBkjyg/dHbm6Pf9mDh91Ve0m9ZyRvcR
|
||||
LgEeeWTq6bs8LeslSlv6KNzvEPdNPbhUC0UX1AwYw1Re3/VuXxPHnA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-03-07T04:26:18Z"
|
||||
mac: ENC[AES256_GCM,data:9BYKLvJ6uljcym3CUMjg0/A4a6RxGs1KvZbpcsKKpsDNcJG3td7FEai01q7PBE6DxaendIjXc/bvFqUDIHxWPChXC+cQK7RbxMl5w5Sj+OlWYvtgGkMC0EU+EBVWk+EkC+bdqqru6EYXaDfwuDqAmvLbcUmHut4He0XgIYBOgKE=,iv:2huPeoF5LvCYB+sXFVKLsEZNRySLQ9igdhyvDXvnlB8=,tag:K9vRQGrlEo7jNaAEQSoUSw==,type:str]
|
||||
lastmodified: "2026-03-07T04:53:38Z"
|
||||
mac: ENC[AES256_GCM,data:hz7qNqFvgB//6OEJb0S5nxE8htYlNihYCHSFaaFSw8vltuvofZ7kJSDgO5WfTGcj+B312wBhPn+TYINmmL2+KSYHsPW1erQsLqS8/hI5buU1ixYKEfnuXdt8/EtWT9zjTYFer8U871e5fYmFnpvlelAweT2x1psOEGI5ERy7/VM=,iv:ktrO/uakTz5o6vR41bDBXMSU//hwfXmurtrXeBz65UU=,tag:itOQIy2m8L9c6qiytyRT7w==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.12.1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue