From 5c0b690e94411a7849685c39a38282d2bafe8ac5 Mon Sep 17 00:00:00 2001 From: 4Lost Date: Mon, 5 May 2025 12:03:03 +0200 Subject: [PATCH] rm .orig files --- flake.lock.orig | 721 ------------------------------------------------ flake.nix.orig | 98 ------- 2 files changed, 819 deletions(-) delete mode 100644 flake.lock.orig delete mode 100644 flake.nix.orig diff --git a/flake.lock.orig b/flake.lock.orig deleted file mode 100644 index bba7c89..0000000 --- a/flake.lock.orig +++ /dev/null @@ -1,721 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "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": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "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": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "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": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-ignore-nix": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "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": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "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": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": [ - "nixpkgs" - ], - "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": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "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": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "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": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "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": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "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": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_2", - "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": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs", - "nur": "nur", - "wpaperd": "wpaperd", - "xmonad-contrib": "xmonad-contrib" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "wpaperd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "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": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "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": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "wpaperd": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay", - "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": { - "owner": "danyspin97", - "repo": "wpaperd", - "type": "github" - } - }, - "xmonad": { - "inputs": { - "flake-utils": "flake-utils_2", - "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_5", - "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": { - "owner": "xmonad", - "repo": "xmonad", - "type": "github" - } - }, - "xmonad-contrib": { - "inputs": { - "flake-utils": "flake-utils", - "git-ignore-nix": "git-ignore-nix", - "nixpkgs": [ - "nixpkgs" - ], - "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": { - "owner": "xmonad", - "repo": "xmonad-contrib", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix.orig b/flake.nix.orig deleted file mode 100644 index 20c1339..0000000 --- a/flake.nix.orig +++ /dev/null @@ -1,98 +0,0 @@ -{ - description = "My NixOS Flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - xmonad-contrib = { - url = "github:xmonad/xmonad-contrib"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nur = { url = "github:nix-community/NUR"; }; - - neovim-nightly-overlay = { - url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - wpaperd = { - url = "github:danyspin97/wpaperd"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - }; - - outputs = { nixpkgs, xmonad-contrib, home-manager, nur, ... }@inputs: { - formatter.x86_64-linux = - nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; - nixosConfigurations = { - eliasLaptop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./machines/configuration-laptop.nix - ./home/services/pipewire.nix - nur.modules.nixos.default - home-manager.nixosModules.home-manager - { - home-manager = { -<<<<<<< HEAD - #useGlobalPkgs = true; -======= ->>>>>>> test - useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-laptop.nix; - }; - nixpkgs.overlays = [ - (final: prev: { - xmobar = final.haskellPackages.callPackage - ./home/programs/xmonad/src/xmobar/default.nix { }; - }) - inputs.neovim-nightly-overlay.overlays.default - inputs.wpaperd.overlays.default - inputs.nur.overlays.default - (import overlays/minlog.nix) - (import overlays/obsidian.nix) - ]; - } - ] ++ xmonad-contrib.nixosModules; - }; - eliasDesktop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./machines/configuration-desktop.nix - ./home/services/pipewire.nix - nur.modules.nixos.default - home-manager.nixosModules.home-manager - { - home-manager = { -<<<<<<< HEAD - #useGlobalPkgs = true; -======= ->>>>>>> test - useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-desktop.nix; - }; - nixpkgs.overlays = [ - (final: prev: { - xmobar = final.haskellPackages.callPackage - ./home/programs/xmonad/src/xmobar/default.nix { }; - }) - inputs.neovim-nightly-overlay.overlays.default - inputs.wpaperd.overlays.default - inputs.nur.overlays.default - (import overlays/minlog.nix) - (import overlays/obsidian.nix) - ]; - } - ] ++ xmonad-contrib.nixosModules; - }; - }; - }; -}