updates?
This commit is contained in:
parent
4a94a6f103
commit
bc0987c09a
8 changed files with 419 additions and 0 deletions
348
flake.lock
generated
348
flake.lock
generated
|
|
@ -2,13 +2,21 @@
|
|||
"nodes": {
|
||||
"affinity-nix": {
|
||||
"inputs": {
|
||||
<<<<<<< HEAD
|
||||
"elemental-wine-source": "elemental-wine-source",
|
||||
=======
|
||||
"corefonts": "corefonts",
|
||||
"crane": "crane",
|
||||
"elemental-wine-source": "elemental-wine-source",
|
||||
"fenix": "fenix",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"git-hooks": "git-hooks",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-wine": "nixpkgs-wine",
|
||||
"on-linux": "on-linux",
|
||||
<<<<<<< HEAD
|
||||
"plugin-loader": "plugin-loader",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
|
|
@ -18,6 +26,17 @@
|
|||
"owner": "mrshmllow",
|
||||
"repo": "affinity-nix",
|
||||
"rev": "494090443b8086f14ce851ecba8463800176c1c1",
|
||||
=======
|
||||
"plugin-loader-src": "plugin-loader-src",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778226184,
|
||||
"narHash": "sha256-PV2SjSCv9BLLjNQMDTed51Z6PDfgveGK9bvUNhyJ2a4=",
|
||||
"owner": "mrshmllow",
|
||||
"repo": "affinity-nix",
|
||||
"rev": "f76f97513153a753718aa1423e84b4cb8ea4c185",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -32,11 +51,19 @@
|
|||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775413891,
|
||||
"narHash": "sha256-U8CWiakalkP9ftAAaHZmgFtTiNieVHFCpFs9NYNw7hQ=",
|
||||
"owner": "sdaqo",
|
||||
"repo": "anipy-cli",
|
||||
"rev": "f9e936584101a265c19939e8c4a185eb35171719",
|
||||
=======
|
||||
"lastModified": 1777813213,
|
||||
"narHash": "sha256-6fTRVdrMoD90E2mlENev8D8GRNXBLEjIZaE3sRKRLf8=",
|
||||
"owner": "sdaqo",
|
||||
"repo": "anipy-cli",
|
||||
"rev": "2db2fe0cfc943dc46cb335cc86782fb9a397cb7a",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -83,11 +110,19 @@
|
|||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
=======
|
||||
"lastModified": 1776754714,
|
||||
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -152,16 +187,58 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"corefonts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1431183738,
|
||||
"narHash": "sha256-610Km9GCtYWxi2SH5jH/XYPXc5f58q5lB05/5XxO/qM=",
|
||||
"owner": "pushcx",
|
||||
"repo": "corefonts",
|
||||
"rev": "8f8627b0004b5f1b952c09cf6390e4ae46475e59",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pushcx",
|
||||
"repo": "corefonts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1778106249,
|
||||
"narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "6d015ea29630b7ad2402841386da2cb617a470a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"darkly": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1774304439,
|
||||
"narHash": "sha256-6q2+HSOh3ZWLBnBkaKVgAuJJlHF+ny1bI6zatZaj+x0=",
|
||||
"owner": "Bali10050",
|
||||
"repo": "Darkly",
|
||||
"rev": "79e8943147d7d5afa0db956776607ca366491fb7",
|
||||
=======
|
||||
"lastModified": 1777242021,
|
||||
"narHash": "sha256-BYew41wJQ8kG71+4eIvStBbmKf++WJnPCh3Lab2jOjw=",
|
||||
"owner": "Bali10050",
|
||||
"repo": "Darkly",
|
||||
"rev": "158eb5afa70c3e2a96ca58a8bc512ae65aecaa4b",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -197,11 +274,19 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775725758,
|
||||
"narHash": "sha256-2GY9HgO6t5Y8B1A5+B3wOJ4hz6DcukDr6ySOWtjiLVc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "849682305f0da62f51ae1f260ede513a7e22466b",
|
||||
=======
|
||||
"lastModified": 1778263701,
|
||||
"narHash": "sha256-xZKbShdjwFvABcPn7hrTQnXPRItbT9cmQXhmODsuxDo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "5dab538fce92fd1fe70acecf34496fa85f81c1e9",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -236,6 +321,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -244,6 +330,38 @@
|
|||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "179704030c5286c729b5b0522037d1d51341022c",
|
||||
=======
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"affinity-nix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777969788,
|
||||
"narHash": "sha256-8sr3w0KyQ0K7TEd8pYwYrxiDk0GZ4A7iIcl1lsxlzVM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "3abc2d5559f4dc30c710ab152abcb4cb60b561ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1776136500,
|
||||
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -302,11 +420,19 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
=======
|
||||
"lastModified": 1777988971,
|
||||
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -441,11 +567,19 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769939035,
|
||||
"narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "a8ca480175326551d6c4121498316261cbb5b260",
|
||||
=======
|
||||
"lastModified": 1776796298,
|
||||
"narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -521,11 +655,19 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775683737,
|
||||
"narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
|
||||
=======
|
||||
"lastModified": 1778248595,
|
||||
"narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -569,11 +711,19 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775710668,
|
||||
"narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "bef414577a6a745543989716df478afec96486bd",
|
||||
=======
|
||||
"lastModified": 1778224717,
|
||||
"narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -602,11 +752,19 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775561155,
|
||||
"narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1",
|
||||
=======
|
||||
"lastModified": 1778221858,
|
||||
"narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -685,11 +843,19 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775490113,
|
||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
||||
=======
|
||||
"lastModified": 1778143761,
|
||||
"narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -701,11 +867,19 @@
|
|||
},
|
||||
"nixos-unstable-small": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775728626,
|
||||
"narHash": "sha256-EhIPCT/tFqqPt4DMQZAUJj953GOZMjlBZq91zj/XWsk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c33d38e5790d4bbf65f0a7f1ac7fe58d2e361f4",
|
||||
=======
|
||||
"lastModified": 1778228972,
|
||||
"narHash": "sha256-L34YTBob9sdjnc+rd7nMC2X8ddw0LT4RfufnlFyArRU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1c5503ba41146fb6b49ed9706823b30de7f3a78f",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -717,11 +891,19 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1764947035,
|
||||
"narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a672be65651c80d3f592a89b3945466584a22069",
|
||||
=======
|
||||
"lastModified": 1770073757,
|
||||
"narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "47472570b1e607482890801aeaf29bfb749884f6",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -764,11 +946,19 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769909678,
|
||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||
=======
|
||||
"lastModified": 1777168982,
|
||||
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -794,11 +984,19 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775595990,
|
||||
"narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
|
||||
=======
|
||||
"lastModified": 1778003029,
|
||||
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -810,11 +1008,19 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775595990,
|
||||
"narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
|
||||
=======
|
||||
"lastModified": 1778003029,
|
||||
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -921,11 +1127,19 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769789167,
|
||||
"narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
|
||||
=======
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -937,11 +1151,19 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1767364772,
|
||||
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
|
||||
=======
|
||||
"lastModified": 1770107345,
|
||||
"narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1017,11 +1239,19 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775423009,
|
||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||
=======
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1033,11 +1263,19 @@
|
|||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775036866,
|
||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||
=======
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1059,11 +1297,19 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775228139,
|
||||
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
|
||||
=======
|
||||
"lastModified": 1777598946,
|
||||
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1080,11 +1326,19 @@
|
|||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775350197,
|
||||
"narHash": "sha256-K9u+gYoyG1BcTXjkpaqyECyKokbPc3VtNgxTP3NwRWI=",
|
||||
"owner": "mahlquistj",
|
||||
"repo": "octotype",
|
||||
"rev": "60a9757107600d2af22857b968a88308594ebc2e",
|
||||
=======
|
||||
"lastModified": 1775955139,
|
||||
"narHash": "sha256-/6pvoKhus6TjYWyWzlShMS4qFtH/QeCf7dCdGkKnp7I=",
|
||||
"owner": "mahlquistj",
|
||||
"repo": "octotype",
|
||||
"rev": "f7f788129b6cc5bf6c4684389a9ba8f4171cdcd2",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1097,11 +1351,19 @@
|
|||
"on-linux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769366983,
|
||||
"narHash": "sha256-uBLHcm0WP8n4ms7eV05wt4mc9uvUo9OVMM/41lW+u8Q=",
|
||||
"owner": "seapear",
|
||||
"repo": "AffinityOnLinux",
|
||||
"rev": "c3909c9e265f8091b9b0b26d8f51815a0a19e547",
|
||||
=======
|
||||
"lastModified": 1772699425,
|
||||
"narHash": "sha256-xhqkN2I5r+Ty2k8HEsLg5e8Eaazb0Qyioqjs87BQOnY=",
|
||||
"owner": "seapear",
|
||||
"repo": "AffinityOnLinux",
|
||||
"rev": "a0c4421946709c24c3f371fcbf15a45b814f188c",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1110,6 +1372,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"plugin-loader": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1120,6 +1383,23 @@
|
|||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://github.com/noahc3/AffinityPluginLoader/releases/download/v0.2.0/affinitypluginloader-plus-winefix.tar.xz"
|
||||
=======
|
||||
"plugin-loader-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1775508798,
|
||||
"narHash": "sha256-cD2G3M83wCEXVMMl9YoHMLxPIvbXeESgQTkXiM+lzns=",
|
||||
"owner": "noahc3",
|
||||
"repo": "AffinityPluginLoader",
|
||||
"rev": "bd93bbf9f84735d8ba6538596620bbe8d8b90efd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noahc3",
|
||||
"ref": "v0.3.0",
|
||||
"repo": "AffinityPluginLoader",
|
||||
"type": "github"
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
|
|
@ -1186,6 +1466,26 @@
|
|||
"stylix": "stylix"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1777924689,
|
||||
"narHash": "sha256-9Z0puLyCSYvtYhP1IZMxC05DSgwA+5rE99jsv1KErc4=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "91c7c2c4ca6a0520cfbf97e369e4fb7bf0b63b7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -1212,11 +1512,19 @@
|
|||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775272153,
|
||||
"narHash": "sha256-FwYb64ysv8J2TxaqsYYcDyHAHBUEaQlriPMWPMi1K7M=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "740fb0203b2852917b909a72b948d34d0b171ec0",
|
||||
=======
|
||||
"lastModified": 1775877051,
|
||||
"narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "08b4f3633471874c8894632ade1b78d75dbda002",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1267,11 +1575,19 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1775429060,
|
||||
"narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
|
||||
=======
|
||||
"lastModified": 1778104276,
|
||||
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1375,11 +1691,19 @@
|
|||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1772661346,
|
||||
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "13b5b0c299982bb361039601e2d72587d6846294",
|
||||
=======
|
||||
"lastModified": 1777041405,
|
||||
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1391,11 +1715,19 @@
|
|||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1772934010,
|
||||
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
|
||||
=======
|
||||
"lastModified": 1777169200,
|
||||
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1407,11 +1739,19 @@
|
|||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1772909925,
|
||||
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
|
||||
=======
|
||||
"lastModified": 1777463218,
|
||||
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1425,11 +1765,19 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1769691507,
|
||||
"narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
|
||||
=======
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
];
|
||||
};
|
||||
overlays = [
|
||||
niri.overlays.niri
|
||||
emacs.overlays.default
|
||||
# rust-overlay.overlays.default
|
||||
# eww.overlays.default
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@ in
|
|||
};
|
||||
programs.niri = {
|
||||
# enable = true;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
package = pkgs.niri-stable;
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
settings = {
|
||||
prefer-no-csd = true;
|
||||
binds = with config.lib.niri.actions; let
|
||||
|
|
|
|||
|
|
@ -19,7 +19,11 @@ in
|
|||
|
||||
|
||||
boot = {
|
||||
<<<<<<< HEAD
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
=======
|
||||
kernelPackages = pkgs.linuxPackages_6_18;
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,11 @@ with lib;
|
|||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
airshipper
|
||||
<<<<<<< HEAD
|
||||
lutris
|
||||
=======
|
||||
# lutris
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
heroic
|
||||
protonup-qt
|
||||
winePackages.waylandFull
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@
|
|||
# kdePackages.ark
|
||||
harper
|
||||
mumble
|
||||
<<<<<<< HEAD
|
||||
niri
|
||||
=======
|
||||
#niri
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
bluetui
|
||||
# pantalaimon
|
||||
ifuse
|
||||
|
|
@ -36,7 +40,11 @@
|
|||
kdePackages.ffmpegthumbs
|
||||
kdePackages.kdegraphics-thumbnailers
|
||||
kdePackages.kdesdk-thumbnailers
|
||||
<<<<<<< HEAD
|
||||
inputs.affinity-nix.packages.x86_64-linux.v3
|
||||
=======
|
||||
inputs.affinity-nix.packages.x86_64-linux.affinity-v3
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
android-tools
|
||||
# xfce.thunar
|
||||
# xfce.tumbler
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
;; #!/run/current-system/sw/bin/sbcl --script
|
||||
|
||||
;; (load "~/quicklisp/setup.lisp")
|
||||
|
|
@ -7,20 +8,39 @@
|
|||
(loop for i from 748 to 1489 do
|
||||
(let* ((request (drakma:http-request
|
||||
(concatenate 'string "https://www.lfg.co/page/" (write-to-string i))))
|
||||
=======
|
||||
#!/usr/bin/env -S sbcl --script
|
||||
|
||||
(load "~/quicklisp/setup.lisp")
|
||||
(ql:quickload '(drakma lquery))
|
||||
|
||||
(defun get-images ()
|
||||
(loop for i from 1490 to 1734 do
|
||||
(let* ((request (drakma:http-request
|
||||
(concatenate 'string "https://www.lfg.co/read/comic/" (write-to-string i))))
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
(parsed-content (lquery:$ (lquery:initialize request)))
|
||||
(url (vector-pop (lquery:$ parsed-content "img" (attr :src))))
|
||||
(img (drakma:http-request url)))
|
||||
|
||||
(if (not (search ".jpg" url))
|
||||
(with-open-file (stream
|
||||
<<<<<<< HEAD
|
||||
(concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".gif")
|
||||
=======
|
||||
(concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".gif")
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
:direction :output
|
||||
:if-exists :supersede
|
||||
:if-does-not-exist :create
|
||||
:element-type 'unsigned-byte)
|
||||
(write-sequence img stream))
|
||||
(with-open-file (stream
|
||||
<<<<<<< HEAD
|
||||
(concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".jpg")
|
||||
=======
|
||||
(concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".jpg")
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
:direction :output
|
||||
:if-exists :supersede
|
||||
:if-does-not-exist :create
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
|
||||
fileSystems."/" =
|
||||
<<<<<<< HEAD
|
||||
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
|
||||
|
|
@ -31,18 +32,47 @@
|
|||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/1D14-97A8";
|
||||
=======
|
||||
{ device = "/dev/disk/by-label/ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-label/ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
|
||||
};
|
||||
|
||||
fileSystems."/snapshots" =
|
||||
{ device = "/dev/disk/by-label/ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=snapshots" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/BOOT";
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/run/media/chris/Storage" =
|
||||
<<<<<<< HEAD
|
||||
{ device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
|
||||
=======
|
||||
{ device = "/dev/disk/by-label/Storage";
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
fsType = "btrfs";
|
||||
options = [ "noatime" "space_cache=v2" "compress=zstd:1" ];
|
||||
};
|
||||
|
||||
fileSystems."/run/media/chris/backup" =
|
||||
<<<<<<< HEAD
|
||||
{ device = "/dev/disk/by-uuid/4286b9ef-e8ed-49a0-9eec-91b8ee05b2cb";
|
||||
=======
|
||||
{ device = "/dev/disk/by-label/backup";
|
||||
>>>>>>> 4827e2d (updates?)
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue