4Lost/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge test

Browse Source
This commit is contained in:
4Lost
2025-04-30 13:41:48 +02:00
parent e257ff991d 7fb65ea258
commit 4364cc2d16
25 changed files with 1381 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
flake.lock generated
View File

@@ -40,11 +40,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
=======
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
>>>>>>> test
"type": "github"
},
"original": {
@@ -62,11 +70,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
=======
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
>>>>>>> test
"type": "github"
},
"original": {
@@ -141,11 +157,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741379162,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
=======
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
>>>>>>> test
"type": "github"
},
"original": {
@@ -223,11 +247,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1739595404,
"narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "06519cec8fb32d219006da6eacd255504a9996af",
=======
"lastModified": 1744693102,
"narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
>>>>>>> test
"type": "github"
},
"original": {
@@ -243,11 +275,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741635347,
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
=======
"lastModified": 1744987093,
"narHash": "sha256-IVioWVz5qVtHiqosesW7CJW//m/yADr7cVdgF1P4N8s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5e6a8203cee7cc33b2e0d9a0adb7268f46447292",
>>>>>>> test
"type": "github"
},
"original": {
@@ -269,11 +309,19 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741676952,
"narHash": "sha256-14tBgnGZLu3sH23O61PA1oG4op4TvZRUj3Aof8m4bEQ=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "adee34d9e71f021dd8b635e8dd8e7329dea6ef79",
=======
"lastModified": 1744960122,
"narHash": "sha256-9bIzs90K5+baT7C9Jy2/Q6WMfgeZ+tX5MyIwC+VHl60=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "e3bc827059b3e1606d48c8b0d492e0101b7b32ff",
>>>>>>> test
"type": "github"
},
"original": {
@@ -285,11 +333,19 @@
"neovim-src": {
"flake": false,
"locked": {
<<<<<<< HEAD
"lastModified": 1741647257,
"narHash": "sha256-1fKiWpHhE0WcrPMJgxHiYK9sBews+KXFDALGiWnYSPk=",
"owner": "neovim",
"repo": "neovim",
"rev": "7e2b75760f1723c44bf69951dad2cb8da92aa213",
=======
"lastModified": 1744932170,
"narHash": "sha256-XG8mE3iggeRRi5MdYYJtmXiDxuA2c4w57UgZfLLqxKQ=",
"owner": "neovim",
"repo": "neovim",
"rev": "b4c759716a9e945b41439ae6d686c81107115516",
>>>>>>> test
"type": "github"
},
"original": {
@@ -300,11 +356,19 @@
},
"nixpkgs": {
"locked": {
<<<<<<< HEAD
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
=======
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
>>>>>>> test
"type": "github"
},
"original": {
@@ -316,11 +380,19 @@
},
"nixpkgs_2": {
"locked": {
<<<<<<< HEAD
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
=======
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
>>>>>>> test
"type": "github"
},
"original": {
@@ -361,8 +433,13 @@
"nixpkgs_5": {
"locked": {
"lastModified": 0,
<<<<<<< HEAD
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"path": "/nix/store/pqgpwakx0m4r75zg34954w5mwi5shg89-source",
=======
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source",
>>>>>>> test
"type": "path"
},
"original": {
@@ -377,11 +454,19 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741690149,
"narHash": "sha256-+0EpQJDaYhZDF6SIc/v0PSbpK3yd14MniMl+HWVgd8A=",
"owner": "nix-community",
"repo": "NUR",
"rev": "f1b3ba0c23233b402b4df174d9e7cc5933e2a53b",
=======
"lastModified": 1744987300,
"narHash": "sha256-C3GtrgAVItvuKzUbzRWGw8QWpKVBard5OX6JZMAVnFI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "3df1ac0aef0f9f7664acb60ea36edced26b7a161",
>>>>>>> test
"type": "github"
},
"original": {
@@ -474,11 +559,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1739829690,
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
=======
"lastModified": 1744707583,
"narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49d05555ccdd2592300099d6a657cc33571f4fe0",
>>>>>>> test
"type": "github"
},
"original": {
@@ -510,11 +603,19 @@
},
"unstable": {
"locked": {
<<<<<<< HEAD
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
=======
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
>>>>>>> test
"type": "github"
},
"original": {
@@ -533,11 +634,19 @@
"systems": "systems"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1740150837,
"narHash": "sha256-fDNPiftVD/npKTMEBFzFBFcf1Tj7389sIRHVGPRes28=",
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "8095cc91dc8122ee6d6580ed3f73220bd3945374",
=======
"lastModified": 1744728945,
"narHash": "sha256-zTeJdaAaXf4aeGHY8P4EbSob9Hu/0eZ7mEaygxHX1nU=",
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "32377e8061578f36e4785ea15eeda2ab94f17ab6",
>>>>>>> test
"type": "github"
},
"original": {
@@ -554,11 +663,19 @@
"unstable": "unstable"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1740222736,
"narHash": "sha256-7RhlA0HKqauUK8ap8Qsp/xBVHd+4CotLqWL7+sLWyzg=",
"owner": "xmonad",
"repo": "xmonad",
"rev": "07d95ad8fc395866200b4587aca8b4db50aa20bd",
=======
"lastModified": 1744559834,
"narHash": "sha256-4AeqylaTW3B+iIab7/JobZruTOU1AgDZ8s+wYaZKQos=",
"owner": "xmonad",
"repo": "xmonad",
"rev": "ebf265a84c6295d4fe15c4a5cf88cb08746f2145",
>>>>>>> test
"type": "github"
},
"original": {
@@ -577,11 +694,19 @@
"xmonad": "xmonad"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741673055,
"narHash": "sha256-o0DD+4E0x5+qRalpMb77x+pX+gOc0P/1baJTxiE1brA=",
"owner": "xmonad",
"repo": "xmonad-contrib",
"rev": "b470de0d7580b98adfd6d33378622ce347a090c2",
=======
"lastModified": 1744559846,
"narHash": "sha256-Cq2N2Gokz+TLz+D1TFNtc34z5OxBAuY9qmz2m6hhKpg=",
"owner": "xmonad",
"repo": "xmonad-contrib",
"rev": "4b866210512b90bc532b4cd46dc5171542d0fac8",
>>>>>>> test
"type": "github"
},
"original": {