dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dusk:b13eb72db026f55b0467a044c7ebd657bb8cf9e2
Branches Tags
dusk:terra
..
compare: dusk:fcc519b33a59884c0e29f4aec9e4ad621cd8296b
Branches Tags
dusk:terra

No commits in common. "b13eb72db026f55b0467a044c7ebd657bb8cf9e2" and "fcc519b33a59884c0e29f4aec9e4ad621cd8296b" have entirely different histories.
b13eb72db0 ... fcc519b33a

11 changed files with 72 additions and 91 deletions
Show Stats Expand all files Collapse all files

108
flake.lock
View File

@ -106,11 +106,11 @@
"crane_3": { "crane_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1661875961, "lastModified": 1654444508,
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", "rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +304,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1663678795, "lastModified": 1661948914,
"narHash": "sha256-SkROcpe7lb46fpBnwMYooExP6WqttsRPeao1d9ykHho=", "narHash": "sha256-596RJgybMFUOWKkoMehqT5a7XuR6JkJg5zyqX/t1LuY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "0f3b6c5dd1630d601ae6f456421b4dfed178f260", "rev": "dc3530785e7388398c40c2b4f5893a674b8bd557",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1664455278, "lastModified": 1663061357,
"narHash": "sha256-RxeLR9NQnWW2VsROMIrPhiqQ7qHXmDqyKlxNs23B45E=", "narHash": "sha256-zMJslerxTcSQ+A8fI4gFcJioRGs+T55343zOtsnEJ3k=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "91d55cb3051b007b480aa3cf1bc4ac63f09eff75", "rev": "52e9603dd8c79cbc267a4733389c1f7e7625b352",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -570,11 +570,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1664475105, "lastModified": 1663105802,
"narHash": "sha256-+Q7jyAMgXcCba6Z+2oA1ahXWKkmMqn0dPgz9t3DyEiQ=", "narHash": "sha256-u+944HxAnqNElRPRMPCCb12f35hXpQsmXsrdBp+De6s=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "8a7a6e4cff1db3ef65a2c20e0e90c60b44516e27", "rev": "b5be72bff79075ef4b5b51922da15e003c274b9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +591,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1664449551, "lastModified": 1663099612,
"narHash": "sha256-iTStJtZB1+MppkT+95Ckqy2NDaISb+QcUkOAa0DS0io=", "narHash": "sha256-ucokjFDRwCFWbcGiqxz0mfHv82UqwyW7RXY6ZgKSl80=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "864ff685fe6443101a0a8f3950d21bcb4330e56a", "rev": "60c6bfe322944d04bb38e76b64effcbd01258824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +613,11 @@
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1664477193, "lastModified": 1663104400,
"narHash": "sha256-W8pe+3wrAUjtexyd6ve4qZGLOWzfqqXKyieY3Q3ntsY=", "narHash": "sha256-tWz8UAPrxxR5fiRWIU8vHPHAGpY13dRiD2UgNWrFK1I=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "da40bf823f2f307e439f4bd85c405d9e612c2df5", "rev": "ae2173f703e8d61de953d48cc40565ba0bc9d5f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,11 +633,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664384946, "lastModified": 1662152524,
"narHash": "sha256-zqpXujNioqibBBkVT2BQSa/l3GQRGZRZbcY69vpRpVU=", "narHash": "sha256-C/uwnyqn/yd32Cmqhe/efS4dQt3q3jyt3ucoOm6wAwU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "63ebc34d0c2398e33bc97d065e3790abc5e1f070", "rev": "a1b59c724384b972f3fb7d9483492d723e2da075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -721,11 +721,11 @@
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1664360253, "lastModified": 1662951397,
"narHash": "sha256-QXXzd6SYgpuFGcr6D8gtALC2V23kPIT4IkSM0eU6MJI=", "narHash": "sha256-MFnhsQRba9RK81pFH/9Bg+7DhK5G4QreFPDeIeIL0Rk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "d2a22b8460279a001bf070bcd6da660bda9c8bd7", "rev": "bb186c9d14f3a82376b6717b9bc8da9fb775fcb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +741,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664206072, "lastModified": 1663005519,
"narHash": "sha256-VPKsLlfSfsJ4GsvtrcFdXiR5VUcsl1jFyKSxB4qvcf8=", "narHash": "sha256-n7TPePh357rq1Ur6d5jROf9qt37b673VZzqSiFKxX/s=",
"owner": "matthewcroughan", "owner": "matthewcroughan",
"repo": "nixinate", "repo": "nixinate",
"rev": "efa632418053bbbaf5b8cf8215c14b699830e3e1", "rev": "24c3869eedf6d07735a833cbf941d5113c5f1d7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -756,11 +756,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1664452918, "lastModified": 1663133271,
"narHash": "sha256-SfnQ2t5b9RTSIqO3PQBDlwrWn4l3t0F65sZtCKTl8eA=", "narHash": "sha256-juBxlETvfMetD/pUFLtdDLQ8BOayxROra8d5Hg6Zg1M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "12f905b731494bc59010f05a7467df8abdcf8d63", "rev": "93580fca1000c37e382d7e2c19c78c1c3852482d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -800,11 +800,11 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664477139, "lastModified": 1663143742,
"narHash": "sha256-YYb3KDl7JWrQNjGQX9rBlpLl7bsAvDxooKHMiim28YA=", "narHash": "sha256-jDwtbz+eFVnsveW6V2xshajwD5w5ZDV0jWJcMCYoMuE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "494999730de678ee83c3caadfee8e0b77719060d", "rev": "e03f1cb970b6eb180e72dc7982f702b5af404e4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -831,11 +831,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1664370076, "lastModified": 1662996720,
"narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "854fdc68881791812eddd33b2fed94b954979a8e", "rev": "5f326e2a403e1cebaec378e72ceaf5725983376d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -847,11 +847,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1664475443, "lastModified": 1663140352,
"narHash": "sha256-l3Re7eo0vOwTQTcJPrXQStG4i4of2eKkdDdDG96z1ZA=", "narHash": "sha256-l6zXiLm/nYezRORU3QEfgTg/cXs67UhEW83r64XPckU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "05e2f3d002a53eeb192d5e8521c6d38f24609681", "rev": "930c526eccdc1b32ada04b9014724e15247cacf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1012,11 +1012,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1663815552, "lastModified": 1662173844,
"narHash": "sha256-J4j/d69SGKx1qripBCINe7T3SUtMM1sdj5PoHRThV5Q=", "narHash": "sha256-+ZgW98Y8fZkgFSylE+Mzalumw+kw3SVivZznbJqQaj8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5", "rev": "8ac6d40380dc4ec86f1ff591d5c14c8ae1d77a18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1051,11 +1051,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1653893745,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1073,11 +1073,11 @@
"webcord": "webcord_2" "webcord": "webcord_2"
}, },
"locked": { "locked": {
"lastModified": 1663692072, "lastModified": 1662959566,
"narHash": "sha256-W9y2ow4tkjFhIsPHvUuaOvawxRgxvr9hb6IMwpMoFlM=", "narHash": "sha256-rajDG3utME/F6TdwIUPs44soARIx59+NOZPNCJzeUqA=",
"owner": "fufexan", "owner": "fufexan",
"repo": "webcord-flake", "repo": "webcord-flake",
"rev": "9578b63fe42746fdbf80a0364781946c8c35aca9", "rev": "f1f6a0a7278459bcbfe792ad8caf7e029eeb1c32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1089,11 +1089,11 @@
"webcord_2": { "webcord_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663533822, "lastModified": 1661854465,
"narHash": "sha256-TvlaaWu40La+CRD2+zXXRmyAF6LEU63eH/BuEQgUiQ4=", "narHash": "sha256-/2f+Jb/1MstWtzbnG/gNLG/ds8K7qultXWfb5nlth08=",
"owner": "SpacingBat3", "owner": "SpacingBat3",
"repo": "WebCord", "repo": "WebCord",
"rev": "2df618b4669eaca06b2f635145d1293a612fa24c", "rev": "83ad1578b2cbcb1c4e5470ca85a0a6e6f5f8c42e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1106,11 +1106,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1663507239, "lastModified": 1661882030,
"narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=", "narHash": "sha256-Kw0MG4rXdTnbndVLLCNwkXDmNszwdQZmm7pwI1R3Kds=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb", "rev": "fd0b0276c9ecc159549acff48b932b83ec3b4f12",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

3
hosts/tkaronto/modules/joycond.nix
View File

@ -1,3 +0,0 @@
{
services.joycond.enable = true;
}

2
modules/base/default.nix
View File

@ -39,7 +39,7 @@ in {
skim skim
tealdeer tealdeer
usbutils usbutils
util-linux utillinux
whois whois
bat bat
fzf fzf

2
modules/base/hm-system-defaults.nix
View File

@ -15,7 +15,7 @@
}; };
xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text; xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source; xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source;
# xdg.configFile."nix/netrc".source = config.environment.etc."nix/netrc".source; xdg.configFile."nix/netrc".source = config.environment.etc."nix/netrc".source;
} }
]; ];
home-manager.extraSpecialArgs = {inherit inputs tlib;}; home-manager.extraSpecialArgs = {inherit inputs tlib;};

22
modules/develop/nixbuild/default.nix
View File

@ -12,15 +12,15 @@
}; };
}; };
nix = { # nix = {
distributedBuilds = true; # distributedBuilds = true;
buildMachines = [ # buildMachines = [
{ # {
hostName = "eu.nixbuild.net"; # hostName = "eu.nixbuild.net";
system = "x86_64-linux"; # system = "x86_64-linux";
maxJobs = 100; # maxJobs = 100;
supportedFeatures = ["benchmark" "big-parallel"]; # supportedFeatures = ["benchmark" "big-parallel"];
} # }
]; # ];
}; # };
} }

9
modules/network/dns/cloudflare.nix
View File

@ -1,9 +0,0 @@
{
networking.resolvconf.useLocalResolver = true;
services.dnscrypt-proxy2 = {
enable = true;
settings = {
server_names = ["cloudflare" "cloudflare-ipv6"];
};
};
}

3
modules/network/dns/default.nix
View File

@ -1,3 +1,4 @@
{ {
imports = [./cloudflare.nix]; imports = [./nextdns.nix];
networking.resolvconf.useLocalResolver = true;
} }

3
modules/network/dns/nextdns.nix
View File

@ -1,5 +1,4 @@
{ {...}: {
networking.resolvconf.useLocalResolver = true;
services.nextdns = { services.nextdns = {
enable = true; enable = true;
arguments = ["-config" "75e43d"]; arguments = ["-config" "75e43d"];

BIN
secrets/default.nix
View File

Binary file not shown.

1
users/modules/hyprland/default.nix
View File

@ -20,7 +20,6 @@
light light
playerctl playerctl
wlogout wlogout
swaybg
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

10
users/patriot/default.nix
View File

@ -88,7 +88,6 @@ in {
config, config,
pkgs, pkgs,
inputs, inputs,
secrets,
... ...
}: let }: let
personal = import ../../personal.nix; personal = import ../../personal.nix;
@ -204,17 +203,12 @@ in {
mpv mpv
ffmpeg ffmpeg
mupdf mupdf
xdg-utils xdg_utils
rust-analyzer rust-analyzer
cloudflared cloudflared
lutris lutris
protontricks protontricks
# fractal-next fractal-next
(
writeShellScriptBin "gh" ''
GH_TOKEN=${secrets.githubToken} ${gh}/bin/gh $@
''
)
]; ];
}; };
programs = { programs = {