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

Compare commits

base: dusk:f1677351f0c158333943a4149e71fa146cb92f0c
Branches Tags
dusk:terra
..
compare: dusk:2d014546bd82083e5ee9820edc9625328be2a420
Branches Tags
dusk:terra

No commits in common. "f1677351f0c158333943a4149e71fa146cb92f0c" and "2d014546bd82083e5ee9820edc9625328be2a420" have entirely different histories.
f1677351f0 ... 2d014546bd

8 changed files with 138 additions and 219 deletions
Show Stats Expand all files Collapse all files

279
flake.lock
View File

@ -24,23 +24,6 @@
"type": "github" "type": "github"
} }
}, },
"all-cabal-json": {
"flake": false,
"locked": {
"lastModified": 1665552503,
"narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
"owner": "nix-community",
"repo": "all-cabal-json",
"rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "hackage",
"repo": "all-cabal-json",
"type": "github"
}
},
"base16-schemes": { "base16-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -65,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667003080, "lastModified": 1659166662,
"narHash": "sha256-TO9XNsDBINTvi8p1zvFnKH4G0BjxXqCETOQYqc6eZrA=", "narHash": "sha256-k0tQyUnvRhp1znEe9Kbc40hv3MEKtPczZn62MAH/bQ0=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "bernbot", "repo": "bernbot",
"rev": "9acec0c01c821fc38cc7985a31bf28912baf835c", "rev": "21784b31c90001ad2ff480f148ad4bd487862648",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667005626, "lastModified": 1662134337,
"narHash": "sha256-CMRHufOL5/Cum85ZzvIUjiL0OwfwbezoRuY71TlsrqE=", "narHash": "sha256-ecaYXvHcu90ETH96tOs5UlTADvYK2RKCeTUIZdxYy3w=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "06c837f139a4bb30c71d9460256fc5a25b99170f", "rev": "b4f74ec0243ebdec180bdacf0eb54d72617fe671",
"revCount": 72, "revCount": 70,
"type": "git", "type": "git",
"url": "https://git.gaze.systems/dusk/website.git" "url": "https://git.gaze.systems/dusk/website.git"
}, },
@ -107,11 +90,11 @@
"crane": { "crane": {
"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": {
@ -155,11 +138,11 @@
"devshell": { "devshell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1666548262, "lastModified": 1658746384,
"narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=", "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2", "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,7 +190,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"all-cabal-json": "all-cabal-json",
"crane": "crane", "crane": "crane",
"devshell": [ "devshell": [
"bernbot", "bernbot",
@ -219,7 +201,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"ghc-utils": "ghc-utils",
"gomod2nix": [ "gomod2nix": [
"bernbot", "bernbot",
"nci", "nci",
@ -235,6 +216,11 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"node2nix": [
"bernbot",
"nci",
"nixpkgs"
],
"poetry2nix": [ "poetry2nix": [
"bernbot", "bernbot",
"nci", "nci",
@ -247,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1666729255, "lastModified": 1659134520,
"narHash": "sha256-0bN0ndY6zua1IqtEkgy3HtII0bSlFPAcPx6B9PRqCyo=", "narHash": "sha256-qg94ijLoS+jbb4w/ww8AqXqjGKN3V0loLzQM+0ry/IE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "8e230e08fc54a15e6512e7283f02d7d447316c1e", "rev": "26dce978b1b60800910e874e92be01f7a1fd5839",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +336,11 @@
"ema": { "ema": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1661699475, "lastModified": 1660941244,
"narHash": "sha256-2324LDzNNZGItJ4hI8SGUyZ8PZK0xHtRWnAFXlCX8UQ=", "narHash": "sha256-gGhvmSjjr07u8uWaBIv6F5WE+VCGngSVXN9mhb4BmQo=",
"owner": "srid", "owner": "srid",
"repo": "ema", "repo": "ema",
"rev": "be89ffe306a15ab4a16494c8593d989fabcc4486", "rev": "d74daa4d0d1f7a14cebd415787166fe7909fc33b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,16 +355,15 @@
"ema": "ema", "ema": "ema",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"haskell-flake": "haskell-flake", "haskell-flake": "haskell-flake",
"heist-extra": "heist-extra", "nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2", "tailwind-haskell": "tailwind-haskell"
"tailwind": "tailwind"
}, },
"locked": { "locked": {
"lastModified": 1666637280, "lastModified": 1661197663,
"narHash": "sha256-cgSfsSPyxz2fSeQfOjHDhbn9nQ23wDV2SW31A4VnMVU=", "narHash": "sha256-AlSogiUwTn5h0K0uEO3/4Ku39m055GmhoP/Hywo0Q6E=",
"owner": "srid", "owner": "srid",
"repo": "emanote", "repo": "emanote",
"rev": "1d3f9f7572626b52e1fea723cf0a5fb634858d85", "rev": "f00c2af837b014c0454dc233749a8c9f8ea490d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +381,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1666638728, "lastModified": 1664638652,
"narHash": "sha256-WOoIJpRZwqpsE0jCiASk9Dcl7WT+VCkbWA/iA66wzWU=", "narHash": "sha256-3mPHAFecDyP1Rgjshjyn1u5EsdjZun9DofnVbtlfRJk=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "964cafce741f16cd039bf95b302a71b9cdd2c3e0", "rev": "0cccd9d74f0bda19f8409549588db274eba0d393",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,14 +436,18 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"blog",
"emanote",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1661009076, "lastModified": 1657102481,
"narHash": "sha256-phAE40gctVygRq3G3B6LhvD7u2qdQT21xsz8DdRDYFo=", "narHash": "sha256-62Fuw8JgPub38OdgNefkIKOodM9nC3M0AG6lS+7smf4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "850d8a76026127ef02f040fb0dcfdb8b749dd9d9", "rev": "608ed3502263d6f4f886d75c48fc2b444a4ab8d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -469,15 +458,16 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656928814, "lastModified": 1652776076,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "v1.0.0",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
@ -513,6 +503,21 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -543,22 +548,6 @@
"type": "github" "type": "github"
} }
}, },
"ghc-utils": {
"flake": false,
"locked": {
"lastModified": 1662774800,
"narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
"ref": "refs/heads/master",
"rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
"revCount": 1072,
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
}
},
"gomod2nix": { "gomod2nix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -577,11 +566,11 @@
}, },
"haskell-flake": { "haskell-flake": {
"locked": { "locked": {
"lastModified": 1661726764, "lastModified": 1660319056,
"narHash": "sha256-YzzOoff6m3W4g4B0E8xd3omvOhEVuRu/Rdvnmy2H6Jc=", "narHash": "sha256-MX6PLEtXVyXXUEk3t1e0c20XRL4m4u9TFET2X0TpTdE=",
"owner": "srid", "owner": "srid",
"repo": "haskell-flake", "repo": "haskell-flake",
"rev": "3c27b5ba2eafc52f4bed232a8ff74cf0a5a99375", "rev": "1ca2be3c354ef2a3296cac7e54ae21e1d6ead6d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,34 +579,18 @@
"type": "github" "type": "github"
} }
}, },
"heist-extra": {
"flake": false,
"locked": {
"lastModified": 1663962912,
"narHash": "sha256-AxzbGM1/l4Sm6zI5aunMA3cbdlDNHBecROKTaAEawxU=",
"owner": "srid",
"repo": "heist-extra",
"rev": "29c719ded6606da19c21b182cf465b9620cda0b2",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "heist-extra",
"type": "github"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"nci": "nci_2", "nci": "nci_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1666753213, "lastModified": 1666357885,
"narHash": "sha256-Q84taWnAYFGQOg+lQy1bP0pYWl6KKtbe5q1/eUIZBWA=", "narHash": "sha256-DemaXcgFATQmft2PsoY6SewraST/Y5V8CuGjDD8vs9g=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "c4d7cde6c8d7f5ca3a9cabd50bdfbda9c3f7bb15", "rev": "79ef39ab3a41c32fcdcb660df6ee60aeb1eb80e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +607,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1666649150, "lastModified": 1666253070,
"narHash": "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I=", "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7dc4e4ebd71280842b4d30975439980baaac9db8", "rev": "c485669ca529e01c1505429fa9017c9a93f15559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,11 +629,11 @@
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1666784066, "lastModified": 1666345512,
"narHash": "sha256-reVh/wZMFvi/4DSCqt02r/x9Oi7t5mbGVMKfdrzmrNI=", "narHash": "sha256-/45v91bYl9hbEJSgYu51ep9ZyoEHlZDE44gotGZfO4M=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "83ad59fae7d3d3afa6d827d918d32b7077a6b400", "rev": "b71d7c9007d77f78a403075b99adf8e9d43bf125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -715,11 +688,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1666937647, "lastModified": 1659161498,
"narHash": "sha256-lU2o1KlC6UHfSzya+aQfcw+8PuCQv8Ffoa0D0+CpFNw=", "narHash": "sha256-q6fFrdt/SfbaOQMCJtI5Q7wKP79DJTM6Isfx62Vn/vk=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "4af92958747f48d1db02e6c813ef5baf7eec1b42", "rev": "790ec04bc74ad051ca6971bdff01e1c2be18aa01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,18 +730,18 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1666573264, "lastModified": 1664831215,
"narHash": "sha256-0pNGQaU8DSqVgg2susfzUID+fHw6l6oQxve6eB8EZU8=", "narHash": "sha256-Oo0y/333YyeW9zeYQyiUUay7q7GK/Uu/FdEa6+5c4Pk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "68d9663f8eb556df8f5b4629614004f595e6af4e", "rev": "756be130c8cda1d02c3681299ce372c97cc7d0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -848,18 +821,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665848363, "lastModified": 1659077768,
"narHash": "sha256-3Jow1YxzPtQnck1bAAvbVxgRH4gNnkIdw871Vm6UtAU=", "narHash": "sha256-P0XIHBVty6WIuIrk2DZNvLcYev9956y1prT4zL212H8=",
"owner": "NixOS", "path": "/nix/store/1ha33ma070pyxw5kkcx61qi7ypzzxzah-source",
"repo": "nixpkgs", "rev": "2a93ea177c3d7700b934bf95adfe00c435f696b8",
"rev": "83b198a2083774844962c854f811538323f9f7b1", "type": "path"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -880,11 +850,11 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1666739256, "lastModified": 1665858291,
"narHash": "sha256-0NxAzDs4qzhT23Wj5lWGhx0I+bpYgQwTHNfOhT6/whU=", "narHash": "sha256-aqazSjyKXnHu0PF7K1Y4i6E4UK/w+BTC5NTu+FvPg/c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5d580a44a127b7ca3aefd895ecca0a757dc1d79d", "rev": "1e4635a232db95976217590c77f5d76a91a87f61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -894,22 +864,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1662096612,
"narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1662019588, "lastModified": 1662019588,
"narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
@ -925,13 +879,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1666703756, "lastModified": 1666282307,
"narHash": "sha256-GwpMJ1hT+z1fMAUkaGtvbvofJQwdVFDEGVhfE82+AUk=", "narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f994293d1eb8812f032e8919e10a594567cf6ef7", "rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +897,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1666778547, "lastModified": 1666358658,
"narHash": "sha256-BfsEsaTdLMCpreeYEEZkcnf/L1M6LRoBa6FCBzK9csQ=", "narHash": "sha256-xNszm7yHrsF7hLzvHYUIrvM69U1uNNK3vddGjFAgk0w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d27415b45fd82432b4e2fb5bc3bd3822e880cf9b", "rev": "6c1a3c3e533118ef6466718dd389896c47cf588d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1014,7 +968,7 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence", "nixos-persistence": "nixos-persistence",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur", "nur": "nur",
"webcord": "webcord" "webcord": "webcord"
@ -1040,11 +994,11 @@
"rust-overlay": { "rust-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1666925689, "lastModified": 1659149515,
"narHash": "sha256-X2n+i2efiXcniDPDbvMsJVrPd7epu3+6pS/Pwu3OkHg=", "narHash": "sha256-Kf/0PgVbs4v8L8plR+j00jrDrA4DdoS32osgnXXVc7w=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4b1fcd5766db910c07c871d1454b1fe296e4547c", "rev": "96ec48e9d52eba3537629a0bf2eb0fb645314e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1055,7 +1009,7 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"eww", "eww",
"nixpkgs" "nixpkgs"
@ -1077,7 +1031,7 @@
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
@ -1109,11 +1063,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1666494036, "lastModified": 1664734860,
"narHash": "sha256-4mmm+1MBPMD56LMLN9QcEwnfnu41NkA6lDeZGjSrxIw=", "narHash": "sha256-Agin7U5+AhlVqPCZAhlAMlRnoV7rGIZXtDsPspF/DRg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "af2e939ba2c7cbb188d06d6650c6353b10b3f2be", "rev": "5db6b63124ccedd61e896ec98def85fb4e6668f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1122,14 +1076,21 @@
"type": "github" "type": "github"
} }
}, },
"tailwind": { "tailwind-haskell": {
"flake": false, "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"blog",
"emanote",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1665932648, "lastModified": 1658431129,
"narHash": "sha256-YM/6pnBi8MymRHrPheiKrtL9FZPLeeTp/evd3O/0CkI=", "narHash": "sha256-AtTxP0AMXdeU0ZTJP5R1lCtx5az3ejrmGP1klEdu1qU=",
"owner": "srid", "owner": "srid",
"repo": "tailwind-haskell", "repo": "tailwind-haskell",
"rev": "7aaaf2282d02846890904f1c23610ddea98d91b6", "rev": "09a102164b1a4559892277ff38efdc9b949c5433",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1196,11 +1157,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1666466001, "lastModified": 1665405587,
"narHash": "sha256-ZjxAnqtcGmHQHKL1Z9sIraDnzIqrJleWcJXfPtzAm74=", "narHash": "sha256-lVL48azhjGA/oEIcUSZQNwomNs0EzPxCcjgzyDST0PM=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c2d2773df57750081b16d56da13b5015d752cbd7", "rev": "221ee83d440fb7dcbfd141ef3a459a5a973331b6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

23
hosts/tkaronto/default.nix
View File

@ -54,13 +54,10 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
}; };
hardware.pulseaudio = {
enable = false;
support32Bit = true;
};
services.xserver.videoDrivers = ["nvidia" "amdgpu"]; services.xserver.videoDrivers = ["nvidia" "amdgpu"];
hardware = { hardware = {
bluetooth.enable = true;
xpadneo.enable = true;
nvidia.prime = { nvidia.prime = {
amdgpuBusId = "PCI:5:0:0"; amdgpuBusId = "PCI:5:0:0";
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
@ -82,11 +79,10 @@
vulkan-loader vulkan-loader
]; ];
}; };
pulseaudio = {
enable = false;
support32Bit = true;
}; };
hardware = {
bluetooth.enable = true;
xpadneo.enable = true;
}; };
programs.light.enable = true; programs.light.enable = true;
@ -113,12 +109,15 @@
}; };
}; };
# for tailscale
networking.firewall.checkReversePath = "loose"; networking.firewall.checkReversePath = "loose";
services.tailscale.enable = false;
services = { services = {
earlyoom.enable = true; earlyoom.enable = true;
tailscale.enable = false;
ipfs = {
enable = false;
enableGC = true;
autoMount = true;
};
gvfs.enable = true; gvfs.enable = true;
}; };

1
hosts/tkaronto/modules/gamemode.nix
View File

@ -1 +0,0 @@
../../../modules/gamemode/default.nix

1
modules/ananicy/default.nix
View File

@ -11,6 +11,7 @@
in { in {
services.ananicy = { services.ananicy = {
enable = true; enable = true;
package = pkgs.ananicy-cpp;
extraRules = l.concatStringsSep "\n" [ extraRules = l.concatStringsSep "\n" [
# coompilers # coompilers
(mkRule "g++" "BG_CPUIO") (mkRule "g++" "BG_CPUIO")

35
modules/gamemode/default.nix
View File

@ -1,35 +0,0 @@
{
pkgs,
inputs,
lib,
...
}: let
programs = inputs.hyprland.packages.${pkgs.system}.default;
startscript = pkgs.writeShellScript "gamemode-start" ''
export PATH=$PATH:${programs}
export HYPRLAND_INSTANCE_SIGNATURE=$(ls -w1 /tmp/hypr | tail -1)
hyprctl --batch 'keyword decoration:blur 0 ; keyword animations:enabled 0 ; keyword misc:no_vfr 1'
'';
endscript = pkgs.writeShellScript "gamemode-end" ''
export PATH=$PATH:${programs}
export HYPRLAND_INSTANCE_SIGNATURE=$(ls -w1 /tmp/hypr | tail -1)
hyprctl --batch 'keyword decoration:blur 1 ; keyword animations:enabled 1 ; keyword misc:no_vfr 0'
'';
in {
programs.gamemode = {
enable = true;
enableRenice = true;
settings = {
general = {
softrealtime = "auto";
renice = 15;
};
custom = {
start = "${startscript}";
end = "${endscript}";
};
};
};
}

8
pkgs-set/pkgs/fractal-next.nix
View File

@ -35,20 +35,20 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fractal-next"; pname = "fractal-next";
version = "26_10_2022"; version = "5c70961c";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "fractal"; repo = "fractal";
rev = "c3d1bd7ac8c1374d887746acf614b5036ac2f95c"; rev = "5c70961cea34ac92658b59254bc3ef428ca7fa91";
sha256 = "sha256-UzlV9MSOtCSx7RNIbr2sv4y1Kxfqo/laWJBeNiGdrZI="; sha256 = "sha256-Ai26Nwm9ujqxW0NCpxd97NiJWImitl87coS724nv27g=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "sha256-E0x+0vtpJATagVzpQ57hMiiTxqFR1vFM2sN7W2e17fc="; sha256 = "sha256-8fgQvlZGbntz2buQ/nCo90Kbel9aeC4kD3uqTdefylg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -17,10 +17,7 @@
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
]; ];
home.sessionVariables = { home.sessionVariables.GDK_SCALE = "2";
GDK_SCALE = "2";
QT_SCALE_FACTOR = "2";
};
home.packages = with pkgs; [ home.packages = with pkgs; [
wf-recorder wf-recorder

3
users/patriot/default.nix
View File

@ -223,9 +223,6 @@ in {
'' ''
) )
obs-studio obs-studio
libreoffice-fresh
helvum
nix-output-monitor
]; ];
}; };
programs = { programs = {