Compare commits
5 Commits
fcc519b33a
...
b13eb72db0
Author | SHA1 | Date | |
---|---|---|---|
b13eb72db0 | |||
986b25c7cf | |||
e38d0155b4 | |||
300deede95 | |||
79f170a76e |
108
flake.lock
108
flake.lock
@ -106,11 +106,11 @@
|
|||||||
"crane_3": {
|
"crane_3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654444508,
|
"lastModified": 1661875961,
|
||||||
"narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
|
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
|
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
|
||||||
"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": 1661948914,
|
"lastModified": 1663678795,
|
||||||
"narHash": "sha256-596RJgybMFUOWKkoMehqT5a7XuR6JkJg5zyqX/t1LuY=",
|
"narHash": "sha256-SkROcpe7lb46fpBnwMYooExP6WqttsRPeao1d9ykHho=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "dream2nix",
|
"repo": "dream2nix",
|
||||||
"rev": "dc3530785e7388398c40c2b4f5893a674b8bd557",
|
"rev": "0f3b6c5dd1630d601ae6f456421b4dfed178f260",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -365,11 +365,11 @@
|
|||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663061357,
|
"lastModified": 1664455278,
|
||||||
"narHash": "sha256-zMJslerxTcSQ+A8fI4gFcJioRGs+T55343zOtsnEJ3k=",
|
"narHash": "sha256-RxeLR9NQnWW2VsROMIrPhiqQ7qHXmDqyKlxNs23B45E=",
|
||||||
"owner": "elkowar",
|
"owner": "elkowar",
|
||||||
"repo": "eww",
|
"repo": "eww",
|
||||||
"rev": "52e9603dd8c79cbc267a4733389c1f7e7625b352",
|
"rev": "91d55cb3051b007b480aa3cf1bc4ac63f09eff75",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -570,11 +570,11 @@
|
|||||||
"rust-overlay": "rust-overlay_3"
|
"rust-overlay": "rust-overlay_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663105802,
|
"lastModified": 1664475105,
|
||||||
"narHash": "sha256-u+944HxAnqNElRPRMPCCb12f35hXpQsmXsrdBp+De6s=",
|
"narHash": "sha256-+Q7jyAMgXcCba6Z+2oA1ahXWKkmMqn0dPgz9t3DyEiQ=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "b5be72bff79075ef4b5b51922da15e003c274b9b",
|
"rev": "8a7a6e4cff1db3ef65a2c20e0e90c60b44516e27",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -591,11 +591,11 @@
|
|||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663099612,
|
"lastModified": 1664449551,
|
||||||
"narHash": "sha256-ucokjFDRwCFWbcGiqxz0mfHv82UqwyW7RXY6ZgKSl80=",
|
"narHash": "sha256-iTStJtZB1+MppkT+95Ckqy2NDaISb+QcUkOAa0DS0io=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "60c6bfe322944d04bb38e76b64effcbd01258824",
|
"rev": "864ff685fe6443101a0a8f3950d21bcb4330e56a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -613,11 +613,11 @@
|
|||||||
"wlroots": "wlroots"
|
"wlroots": "wlroots"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663104400,
|
"lastModified": 1664477193,
|
||||||
"narHash": "sha256-tWz8UAPrxxR5fiRWIU8vHPHAGpY13dRiD2UgNWrFK1I=",
|
"narHash": "sha256-W8pe+3wrAUjtexyd6ve4qZGLOWzfqqXKyieY3Q3ntsY=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "ae2173f703e8d61de953d48cc40565ba0bc9d5f7",
|
"rev": "da40bf823f2f307e439f4bd85c405d9e612c2df5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -633,11 +633,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662152524,
|
"lastModified": 1664384946,
|
||||||
"narHash": "sha256-C/uwnyqn/yd32Cmqhe/efS4dQt3q3jyt3ucoOm6wAwU=",
|
"narHash": "sha256-zqpXujNioqibBBkVT2BQSa/l3GQRGZRZbcY69vpRpVU=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "a1b59c724384b972f3fb7d9483492d723e2da075",
|
"rev": "63ebc34d0c2398e33bc97d065e3790abc5e1f070",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -721,11 +721,11 @@
|
|||||||
"rust-overlay": "rust-overlay_4"
|
"rust-overlay": "rust-overlay_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662951397,
|
"lastModified": 1664360253,
|
||||||
"narHash": "sha256-MFnhsQRba9RK81pFH/9Bg+7DhK5G4QreFPDeIeIL0Rk=",
|
"narHash": "sha256-QXXzd6SYgpuFGcr6D8gtALC2V23kPIT4IkSM0eU6MJI=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "nil",
|
"repo": "nil",
|
||||||
"rev": "bb186c9d14f3a82376b6717b9bc8da9fb775fcb7",
|
"rev": "d2a22b8460279a001bf070bcd6da660bda9c8bd7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -741,11 +741,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663005519,
|
"lastModified": 1664206072,
|
||||||
"narHash": "sha256-n7TPePh357rq1Ur6d5jROf9qt37b673VZzqSiFKxX/s=",
|
"narHash": "sha256-VPKsLlfSfsJ4GsvtrcFdXiR5VUcsl1jFyKSxB4qvcf8=",
|
||||||
"owner": "matthewcroughan",
|
"owner": "matthewcroughan",
|
||||||
"repo": "nixinate",
|
"repo": "nixinate",
|
||||||
"rev": "24c3869eedf6d07735a833cbf941d5113c5f1d7b",
|
"rev": "efa632418053bbbaf5b8cf8215c14b699830e3e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -756,11 +756,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663133271,
|
"lastModified": 1664452918,
|
||||||
"narHash": "sha256-juBxlETvfMetD/pUFLtdDLQ8BOayxROra8d5Hg6Zg1M=",
|
"narHash": "sha256-SfnQ2t5b9RTSIqO3PQBDlwrWn4l3t0F65sZtCKTl8eA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "93580fca1000c37e382d7e2c19c78c1c3852482d",
|
"rev": "12f905b731494bc59010f05a7467df8abdcf8d63",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -800,11 +800,11 @@
|
|||||||
"nixpkgs-wayland": {
|
"nixpkgs-wayland": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663143742,
|
"lastModified": 1664477139,
|
||||||
"narHash": "sha256-jDwtbz+eFVnsveW6V2xshajwD5w5ZDV0jWJcMCYoMuE=",
|
"narHash": "sha256-YYb3KDl7JWrQNjGQX9rBlpLl7bsAvDxooKHMiim28YA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "e03f1cb970b6eb180e72dc7982f702b5af404e4b",
|
"rev": "494999730de678ee83c3caadfee8e0b77719060d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -831,11 +831,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662996720,
|
"lastModified": 1664370076,
|
||||||
"narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=",
|
"narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5f326e2a403e1cebaec378e72ceaf5725983376d",
|
"rev": "854fdc68881791812eddd33b2fed94b954979a8e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -847,11 +847,11 @@
|
|||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663140352,
|
"lastModified": 1664475443,
|
||||||
"narHash": "sha256-l6zXiLm/nYezRORU3QEfgTg/cXs67UhEW83r64XPckU=",
|
"narHash": "sha256-l3Re7eo0vOwTQTcJPrXQStG4i4of2eKkdDdDG96z1ZA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "930c526eccdc1b32ada04b9014724e15247cacf6",
|
"rev": "05e2f3d002a53eeb192d5e8521c6d38f24609681",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1012,11 +1012,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662173844,
|
"lastModified": 1663815552,
|
||||||
"narHash": "sha256-+ZgW98Y8fZkgFSylE+Mzalumw+kw3SVivZznbJqQaj8=",
|
"narHash": "sha256-J4j/d69SGKx1qripBCINe7T3SUtMM1sdj5PoHRThV5Q=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "8ac6d40380dc4ec86f1ff591d5c14c8ae1d77a18",
|
"rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1051,11 +1051,11 @@
|
|||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653893745,
|
"lastModified": 1659877975,
|
||||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1073,11 +1073,11 @@
|
|||||||
"webcord": "webcord_2"
|
"webcord": "webcord_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662959566,
|
"lastModified": 1663692072,
|
||||||
"narHash": "sha256-rajDG3utME/F6TdwIUPs44soARIx59+NOZPNCJzeUqA=",
|
"narHash": "sha256-W9y2ow4tkjFhIsPHvUuaOvawxRgxvr9hb6IMwpMoFlM=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "webcord-flake",
|
"repo": "webcord-flake",
|
||||||
"rev": "f1f6a0a7278459bcbfe792ad8caf7e029eeb1c32",
|
"rev": "9578b63fe42746fdbf80a0364781946c8c35aca9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1089,11 +1089,11 @@
|
|||||||
"webcord_2": {
|
"webcord_2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1661854465,
|
"lastModified": 1663533822,
|
||||||
"narHash": "sha256-/2f+Jb/1MstWtzbnG/gNLG/ds8K7qultXWfb5nlth08=",
|
"narHash": "sha256-TvlaaWu40La+CRD2+zXXRmyAF6LEU63eH/BuEQgUiQ4=",
|
||||||
"owner": "SpacingBat3",
|
"owner": "SpacingBat3",
|
||||||
"repo": "WebCord",
|
"repo": "WebCord",
|
||||||
"rev": "83ad1578b2cbcb1c4e5470ca85a0a6e6f5f8c42e",
|
"rev": "2df618b4669eaca06b2f635145d1293a612fa24c",
|
||||||
"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": 1661882030,
|
"lastModified": 1663507239,
|
||||||
"narHash": "sha256-Kw0MG4rXdTnbndVLLCNwkXDmNszwdQZmm7pwI1R3Kds=",
|
"narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=",
|
||||||
"owner": "wlroots",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"rev": "fd0b0276c9ecc159549acff48b932b83ec3b4f12",
|
"rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
3
hosts/tkaronto/modules/joycond.nix
Normal file
3
hosts/tkaronto/modules/joycond.nix
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
services.joycond.enable = true;
|
||||||
|
}
|
@ -39,7 +39,7 @@ in {
|
|||||||
skim
|
skim
|
||||||
tealdeer
|
tealdeer
|
||||||
usbutils
|
usbutils
|
||||||
utillinux
|
util-linux
|
||||||
whois
|
whois
|
||||||
bat
|
bat
|
||||||
fzf
|
fzf
|
||||||
|
@ -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;};
|
||||||
|
@ -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
Normal file
9
modules/network/dns/cloudflare.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
networking.resolvconf.useLocalResolver = true;
|
||||||
|
services.dnscrypt-proxy2 = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
server_names = ["cloudflare" "cloudflare-ipv6"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,4 +1,3 @@
|
|||||||
{
|
{
|
||||||
imports = [./nextdns.nix];
|
imports = [./cloudflare.nix];
|
||||||
networking.resolvconf.useLocalResolver = true;
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{...}: {
|
{
|
||||||
|
networking.resolvconf.useLocalResolver = true;
|
||||||
services.nextdns = {
|
services.nextdns = {
|
||||||
enable = true;
|
enable = true;
|
||||||
arguments = ["-config" "75e43d"];
|
arguments = ["-config" "75e43d"];
|
||||||
|
Binary file not shown.
@ -20,6 +20,7 @@
|
|||||||
light
|
light
|
||||||
playerctl
|
playerctl
|
||||||
wlogout
|
wlogout
|
||||||
|
swaybg
|
||||||
];
|
];
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
|
@ -88,6 +88,7 @@ in {
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
|
secrets,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
personal = import ../../personal.nix;
|
personal = import ../../personal.nix;
|
||||||
@ -203,12 +204,17 @@ 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 = {
|
||||||
|
Loading…
Reference in New Issue
Block a user