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": {

721
flake.lock.orig Normal file
View File

@@ -0,0 +1,721 @@
{
"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
}

6
flake.nix
View File

@@ -40,7 +40,10 @@
home-manager.nixosModules.home-manager
{
home-manager = {
<<<<<<< HEAD
#useGlobalPkgs = true;
=======
>>>>>>> test
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
users.elias = import ./home/default-laptop.nix;
@@ -68,7 +71,10 @@
home-manager.nixosModules.home-manager
{
home-manager = {
<<<<<<< HEAD
#useGlobalPkgs = true;
=======
>>>>>>> test
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
users.elias = import ./home/default-desktop.nix;

98
flake.nix.orig Normal file
View File

@@ -0,0 +1,98 @@
{
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;
};
};
};
}

9
hardware-configuration-desktop.nix
View File

@@ -14,17 +14,20 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/fcd3cb1a-9ca3-42a1-981d-84b8a709eb26";
{ device = "/dev/disk/by-label/NIXROOT";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1A1E-0B59";
{ device = "/dev/disk/by-label/NIXBOOT";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
swapDevices = [{
device = "/.swapfile";
size = 2048;
}];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

2
home/programs/alacritty/default.nix
View File

@@ -4,7 +4,7 @@ let
theme = builtins.fetchurl {
url =
"https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml";
sha256 = "1rnc6gsqjdvkb6xbv1pnawrp6f0j5770dqml2di90j3lhv0fppgw";
sha256 = "1idjbm5jim9b36235hgwgp9ab81fmbij42y7h85l4l7cqcbyz74l";
};
in {
home.packages = with pkgs; [ fira-code alacritty-theme ];

5
home/programs/default.nix
View File

@@ -3,7 +3,6 @@
./alacritty
./anki
./calibre
#./cura
./discord
./dolphin
./dunst
@@ -14,11 +13,10 @@
./inkscape
./ktouch
./libreoffice
./maestral
./neovim
##./nixvim
./nextcloud
./obs
./openscad
./picard
./planify
./prismlauncher
@@ -38,6 +36,5 @@
./xmonad
./zoom
./zsh
./zulip
];
}

107
home/programs/eww/src/eww.yuck
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
(defwindow bar-primary
:monitor 0
:geometry (geometry :x "0px"
@@ -16,82 +17,34 @@
:onrightclick "notify-send Right"
"Click Me!")
(rightSideBar)))
=======
(defwidget workspaces-and-windows []
(let content (split " " (file "/tmp/xmonad-eww-log"))
(let ws-list (take 9 content)
(let win-list (drop 9 content)
(box :orientation "vertical" :class "bar"
>>>>>>> test
;; The Wrapper of the rightside Information
(defwidget rightSideBar []
(box
:space-evenly "false"
:halign "end"
(audio)
(nw)
(date)
))
;; The Internet Information box.
(defwidget audio []
(box :class "container"
:space-evenly "false"
:halign "end"
(label :class "iconBat" :text "${volicon} ")
(label :class "text" :text "${vol} % ")
(label :class "text" :text "${micicon} ")))
;; The Internet Information box.
(defwidget nw []
(box :class "container"
:space-evenly "false"
:halign "end"
(label :class "iconNWDown" :text " ")
(label :class "text" :text " ${nwdown} ")
(label :class "iconNWUp" :text " ")
(label :class "text" :text "${nwup} ")))
;; The date Information box.
(defwidget date []
(box :class "container"
:space-evenly "false"
:halign "end"
(label :class "iconClock" :text " ")
(label :class "text" :text "${date-time} ")))
;; Variables
(defpoll volicon
:interval "1s"
:initial "-" ; optional, defaults to poll at startup
`if [[ $(cut -d ' ' -f 2 <<< $(pulseaudio-ctl full-status)) == "yes" ]]; then echo "󰝟"; else echo ""; fi`)
(defpoll vol
:interval "1s"
:initial "-" ; optional, defaults to poll at startup
`Volume=$(cut -d ' ' -f 1 <<<$(pulseaudio-ctl full-status)); echo "$(( Volume/2 ))"`)
(defpoll micicon
:interval "1s"
:initial "-" ; optional, defaults to poll at startup
`if [[ $(cut -d ' ' -f 3 <<< $(pulseaudio-ctl full-status)) == "yes" ]]; then echo ""; else echo ""; fi`)
(defpoll nwup ;; TODO
:interval "1s"
:initial "-" ; optional, defaults to poll at startup
`echo "up"`)
(defpoll nwdown ; TODO
:interval "1s"
:initial "-" ; optional, defaults to poll at startup
`echo "down"`)
(defpoll date-time
:interval "1s"
:initial "initial-value" ; optional, defaults to poll at startup
`date "+%a %d.%m.%y %H:%M:%S"`)
;; IDK
(defwidget greeter [?text name]
;; Workspaces
(box :orientation "horizontal"
:halign "center"
:geometry (geometry :x "0px"
:y "0px"
:height "20px"
:anchor "top center")
text))
(for ws in ws-list
(let class (if (starts-with ws "[[")
"ws-current"
(if (starts-with ws "(")
"ws-visible"
"ws-hidden")))
(let name (string-trim ws "[]()")
(button :onclick (format "wmctrl -s %s" name)
:class class
(label :text name))))))
;; Open windows
(box :orientation "horizontal" :class "window-list"
(for win in win-list
(let class (if (starts-with win "*") "win-focused" "win")
(label :class class :text (string-trim win "*")))))
)
)
)
)
)

50
home/programs/eww/src/eww.yuck.orig Normal file
View File

@@ -0,0 +1,50 @@
<<<<<<< HEAD
(defwindow bar-primary
:monitor 0
:geometry (geometry :x "0px"
:y "0px"
:width "100%"
:height "25px"
:anchor "top center")
:stacking "fg"
:reserve (struts :distance 25px" :side "top")
:windowtype "dock"
:wm-ignore false
(box
:orientation "horizontal"
:halign "right"
(eventbox :onclick "notify-send Left"
:onrightclick "notify-send Right"
"Click Me!")
(rightSideBar)))
=======
(defwidget workspaces-and-windows []
(let content (split " " (file "/tmp/xmonad-eww-log"))
(let ws-list (take 9 content)
(let win-list (drop 9 content)
(box :orientation "vertical" :class "bar"
>>>>>>> test
;; Workspaces
(box :orientation "horizontal"
(for ws in ws-list
(let class (if (starts-with ws "[[")
"ws-current"
(if (starts-with ws "(")
"ws-visible"
"ws-hidden")))
(let name (string-trim ws "[]()")
(button :onclick (format "wmctrl -s %s" name)
:class class
(label :text name))))))
;; Open windows
(box :orientation "horizontal" :class "window-list"
(for win in win-list
(let class (if (starts-with win "*") "win-focused" "win")
(label :class class :text (string-trim win "*")))))
)
)
)
)
)

4
home/programs/eww/src/scripts/xmonad_log.sh Executable file
View File

@@ -0,0 +1,4 @@
tail -F /tmp/xmonad-eww-log | while read -r line; do
clean_line=$(echo "$line" | sed -E 's/<[^>]+>//g')
eww update xmonad_log="$clean_line"
done

5
home/programs/maestral/default.nix
View File

@@ -1,5 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ maestral maestral-gui ];
}

8
home/programs/neovim/default.nix
View File

@@ -10,6 +10,10 @@ in {
nerd-fonts.jetbrains-mono
texliveFull
clang-tools
<<<<<<< HEAD
=======
vimPlugins.catppuccin-nvim
>>>>>>> test
];
programs.neovim = {
@@ -91,7 +95,11 @@ in {
neovim-remote
# Nix
nixd
<<<<<<< HEAD
nixfmt-classic
=======
nixfmt-rfc-style
>>>>>>> test
# Rust
rust-analyzer
# Bash

126
home/programs/neovim/default.nix.orig Normal file
View File

@@ -0,0 +1,126 @@
{ pkgs, config, ... }:
let
mkLuaConfig = file: args:
builtins.readFile "${pkgs.substituteAll (args // { src = file; })}";
in {
home.sessionVariables = { EDITOR = "nvim"; };
home.packages = with pkgs; [
nerd-fonts.jetbrains-mono
texliveFull
clang-tools
<<<<<<< HEAD
=======
vimPlugins.catppuccin-nvim
>>>>>>> test
];
programs.neovim = {
enable = true;
vimAlias = true;
vimdiffAlias = true;
withNodeJs = true;
withPython3 = true;
plugins = (with pkgs.vimPlugins; [
bufferline-nvim
catppuccin-nvim
cmp-buffer
cmp-conjure
cmp-nvim-lua
cmp-nvim-lsp
cmp-path
cmp_luasnip
conform-nvim
conjure
dropbar-nvim
friendly-snippets
lazy-nvim
lean-nvim
leap-nvim
lspkind-nvim
lualine-lsp-progress
lualine-nvim
luasnip
markdown-preview-nvim
neoconf-nvim
neodev-nvim
neoscroll-nvim
nvim-autopairs
nvim-cmp
nvim-lspconfig
nvim-surround
nvim-tree-lua
nvim-treesitter-textobjects
nvim-ts-context-commentstring
nvim-web-devicons
oil-nvim
plenary-nvim
rainbow-delimiters-nvim
telescope-fzf-native-nvim
telescope-nvim
vimtex
which-key-nvim
]) ++ [
(pkgs.vimPlugins.nvim-treesitter.withPlugins
(plugins: pkgs.tree-sitter.allGrammars))
];
extraPackages = with pkgs; [
ripgrep
fd
codespell
prettierd
# Lua
lua-language-server
stylua
# Haskell
haskell-language-server
ghc
stack
cabal-install
haskellPackages.fourmolu
# Lean
lean
# Python
ruff
pyright
isort
python311Packages.autopep8
# LaTeX
texlab
xdotool
pplatex
neovim-remote
# Nix
nixd
<<<<<<< HEAD
nixfmt-classic
=======
nixfmt-rfc-style
>>>>>>> test
# Rust
rust-analyzer
# Bash
nodePackages.bash-language-server
shellcheck
shellharden
# sh
shfmt
# Scheme
chez
];
extraLuaConfig = mkLuaConfig ./init.lua {
path = "${pkgs.vimUtils.packDir
config.programs.neovim.finalPackage.passthru.packpathDirs}";
};
};
xdg.configFile."nvim/lua" = {
recursive = true;
source = ./lua;
};
}

1
home/programs/neovim/lua/plugins/catppuccin-nvim.lua
View File

@@ -5,6 +5,7 @@ return {
name = "catppuccin",
priority = 1000,
config = function()
require("catppuccin").setup()
vim.cmd.colorscheme("catppuccin-mocha")
end,
opts = {

4
home/programs/neovim/lua/plugins/conform-nvim.lua
View File

@@ -29,7 +29,11 @@ return {
markdown = { "prettierd" },
json = { "prettierd" },
yaml = { "prettierd" },
<<<<<<< HEAD
nix = { "nixfmt-classic" },
=======
nix = { "nixfmt-rfc-style" },
>>>>>>> test
tex = { "latexindent" },
c = { "clang_format" },
cpp = { "clang_format" },

66
home/programs/neovim/lua/plugins/conform-nvim.lua.orig Normal file
View File

@@ -0,0 +1,66 @@
return {
{
"stevearc/conform.nvim",
event = { "BufWritePre" },
cmd = "ConformInfo",
keys = {
{
"<leader>cF",
function()
require("conform").format({ formatters = { "injected" } })
end,
mode = { "n", "v" },
desc = "Format Injected Langs",
},
},
config = function()
require("conform").setup({
format_on_save = {
-- These options will be passed to conform.format()
timeout_ms = 500,
lsp_fallback = true,
},
formatters_by_ft = {
lua = { "stylua" },
python = { "isort", "autopep8" },
haskell = { "fourmolu" },
bash = { "shellcheck", "shellharden" },
sh = { "shfmt" },
markdown = { "prettierd" },
json = { "prettierd" },
yaml = { "prettierd" },
<<<<<<< HEAD
nix = { "nixfmt-classic" },
=======
nix = { "nixfmt-rfc-style" },
>>>>>>> test
tex = { "latexindent" },
c = { "clang_format" },
cpp = { "clang_format" },
["*"] = { "codespell" },
["_"] = { "trim_whitespace" },
},
formatters = {
stylua = {
inherit = true,
prepend_args = { "--indent-type", "Spaces", "--indent-width", "2" },
},
codespell = {
inherit = true,
prepend_args = { "-L", "launch" },
},
latexindent = {
inherit = true,
prepend_args = { "-y=\"defaultIndent:' '\"" },
},
clang_format = {
prepend_args = {
"--style=file:./.clang-format",
"--fallback-style=LLVM",
},
},
},
})
end,
},
}

5
home/programs/openscad/default.nix Normal file
View File

@@ -0,0 +1,5 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ gnumake openscad ];
}

2
home/programs/signal/default.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ signal-desktop ];
home.packages = with pkgs; [ signal-desktop-bin ];
}

2
home/programs/vscode/default.nix
View File

@@ -3,7 +3,7 @@
{
programs.vscode = {
enable = true;
extensions = with pkgs.vscode-extensions; [
profiles.default.extensions = with pkgs.vscode-extensions; [
dracula-theme.theme-dracula
vscodevim.vim
yzhang.markdown-all-in-one

2
home/programs/xmonad/default.nix
View File

@@ -19,5 +19,7 @@
xorg.xmessage
ghc
cabal-install
wmctrl
trayer
];
}

107
home/programs/xmonad/src/xmonad.hs
View File

@@ -1,40 +1,46 @@
import XMonad
import XMonad.Util.SpawnOnce (spawnOnce)
import XMonad.Hooks.EwmhDesktops
import XMonad.Util.EZConfig
import XMonad.Hooks.DynamicLog
import XMonad.Hooks.StatusBar
import XMonad.Hooks.StatusBar.PP
import XMonad.Layout.ThreeColumns
import XMonad.Layout.Magnifier
import XMonad.Util.ClickableWorkspaces
import XMonad.Util.Loggers
import Data.ByteString (maximum)
import Distribution.Compat.Prelude (print)
import System.IO
import XMonad
import XMonad.Hooks.DynamicLog
import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.ManageDocks
import XMonad.Hooks.StatusBar
import XMonad.Hooks.StatusBar.PP
import XMonad.Layout.Magnifier
import XMonad.Layout.ThreeColumns
import XMonad.Util.ClickableWorkspaces
import XMonad.Util.EZConfig
import XMonad.Util.Loggers
import XMonad.Util.Run (spawnPipe)
import XMonad.Util.SpawnOnce (spawnOnce)
-- import Control.Monad.RWS (All(All))
import XMonad.Hooks.ManageHelpers
main = do
xmonad . ewmhFullscreen . ewmh $ myConfig
main = xmonad . ewmhFullscreen . ewmh . withEasySB (statusBarProp "xmobar" (pure myXmobarPP)) defToggleStrutsKey $ myconfig
myconfig = def
{
modMask = mod4Mask
, layoutHook = myLayout
myConfig =
def
{ modMask = mod4Mask
, terminal = "alacritty"
, layoutHook = avoidStruts myLayout
, normalBorderColor = "#f5c2e7"
, focusedBorderColor = "#cdd6f4"
, manageHook = myManageHooks
, manageHook = manageDocks <+> myManageHooks
, startupHook = myStartupHook
, logHook = dynamicLogWithPP myXmobarPP
}
`additionalKeysP`
[
-- Messages
`additionalKeysP` myKeys
myKeys =
[ -- Messages
("M-m w", spawn "xmessage 'Test Message :)'") -- type mod+x then w to pop up 'woohoo!')
-- System
, ("M-p", spawn "rofi -show \"drun\"")
-- Screenshots
, ("<Print>", spawn "maim --format=png \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Whole Screen to File
, -- Screenshots
("<Print>", spawn "maim --format=png \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Whole Screen to File
, ("M-<Print>", spawn "maim --format=png --window $(xdotool getactivewindow) \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Focused Window to File
, ("S-<Print>", spawn "maim --format=png --select \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Selection to File
, ("C-<Print>", spawn "maim --format=png | xclip -selection clipboard -t image/png") -- Whole Screen to Clipboard
@@ -46,57 +52,50 @@ myconfig = def
, ("M-x", spawn "telegram-desktop")
, ("M-c", spawn "firefox")
, ("M-v", spawn "thunderbird")
-- Brightness
, ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 10")
, -- Brightness
("<XF86MonBrightnessUp>", spawn "xbacklight -inc 10")
, ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 10")
-- Audio
, ("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
, -- Audio
("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
, ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up 5")
, ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down 5")
, ("<XF86AudioMicMute>", spawn "pulseaudio-ctl mute-input")
]
-- `removeKeysP` [ "M-S-q" ]
myXmobarPP :: PP
myXmobarPP = def
{
ppSep = pink " • "
, ppWsSep = ""
, ppCurrent = wrap " " "" . xmobarBorder "Top" "#f38ba8" 2
, ppVisible = wrap " " "" . xmobarBorder "Top" "#a6e3a1" 2
, ppHidden = green . wrap " " ""
, ppHiddenNoWindows = gray . wrap " " ""
, ppUrgent = red . wrap (yellow "!") (yellow "!")
, ppTitleSanitize = xmobarStrip
, ppOrder = \[ws, l, _, wins] -> [ws, l, wins]
myXmobarPP =
def
{ ppOutput = \str -> do
writeFile "/tmp/xmonad-eww-log" str
, ppCurrent = wrap "[[" "]]"
, ppVisible = wrap "(" ")"
, ppHidden = wrap " " " "
, ppHiddenNoWindows = id
, ppUrgent = wrap "!" "!"
, ppSep = " "
, ppOrder = \(ws : _ : _ : wins : _) -> [ws, wins]
, ppExtras = [logTitles formatFocused formatUnfocused]
}
where
formatFocused = wrap "[" "]" . pink . ppWindow
formatUnfocused = wrap "[" "]" . gray . ppWindow
formatFocused = wrap "*" "*" . ppWindow
formatUnfocused = id . ppWindow
ppWindow :: String -> String
ppWindow = xmobarRaw . (\w -> if null w then "???" else w) . shorten 15 -- set maximum length of windowtitle to 15
pink, gray, red, yellow, green :: String -> String
pink = xmobarColor "#f5c2e7" ""
green = xmobarColor "#a6e3a1" ""
gray = xmobarColor "#cdd6f4" ""
red = xmobarColor "#f38ba8" ""
yellow = xmobarColor "#f9e2af" ""
ppWindow w = if null w then "???" else take 30 w
myLayout = Tall 1 (3 / 100) (1 / 2) ||| Mirror (Tall 1 (3 / 100) (1 / 2)) ||| Full ||| ThreeColMid 1 (3 / 100) (1 / 2) -- wenn wieder zoom von fokusierten Seitenfenstern gewünscht, dann Fireox fixn und: magnifiercz' 1.3 (ThreeColMid 1 (3/100) (1/2))
myManageHooks :: ManageHook
myManageHooks = composeAll
[
isDialog --> doFloat
myManageHooks =
composeAll
[ isDialog --> doFloat
, className =? "Xmessage" --> doCenterFloat
]
myStartupHook :: X ()
myStartupHook = do
mapM_ spawnOnce ["xmobar -x " ++ show sid | sid <- [0..9]]
spawnOnce "dropbox"
spawnOnce "nextcloud --background"
spawnOnce "trayer --edge top --align left --widthtype request --height 25 --transparent true --alpha 0 --expand false --SetDockType true --SetPartialStrut true --monitor primary &"
spawnOnce "eww open bar"

5
home/programs/zulip/default.nix
View File

@@ -1,5 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ zulip ];
}

38
indent.log Normal file
View File

@@ -0,0 +1,38 @@
INFO: latexindent.pl version 3.24.4, 2024-07-18, a script to indent .tex files
latexindent.pl lives here: /nix/store/n170p0fiily4lcr7agswvzm84fyzi2jx-latexindent-3.24.4-tex/scripts/latexindent/
Sun Apr 20 15:34:29 2025
Reading input from STDIN
INFO: Processing switches:
-y|--yaml: YAML settings specified via command line
INFO: Directory for backup files and log file indent.log:
.
INFO: Perl modules are being loaded from the following directories:
/nix/store/3vq9qasxlqpyq1k95nq3s13g2m6w59ay-perl-5.40.0/lib/perl5/5.40.0/FindBin.pm
/nix/store/zi73jrv7iqlrwg6sk8fjbfafqs7jjj1z-perl-5.40.0-env/lib/perl5/site_perl/5.40.0/YAML/Tiny.pm
/nix/store/3vq9qasxlqpyq1k95nq3s13g2m6w59ay-perl-5.40.0/lib/perl5/5.40.0/File/Copy.pm
/nix/store/3vq9qasxlqpyq1k95nq3s13g2m6w59ay-perl-5.40.0/lib/perl5/5.40.0/File/Basename.pm
/nix/store/3vq9qasxlqpyq1k95nq3s13g2m6w59ay-perl-5.40.0/lib/perl5/5.40.0/Getopt/Long.pm
/nix/store/zi73jrv7iqlrwg6sk8fjbfafqs7jjj1z-perl-5.40.0-env/lib/perl5/site_perl/5.40.0/File/HomeDir.pm
INFO: LatexIndent perl modules are being loaded from, for example:
/nix/store/n170p0fiily4lcr7agswvzm84fyzi2jx-latexindent-3.24.4-tex/scripts/latexindent/LatexIndent/Document.pm
INFO: YAML settings read: defaultSettings.yaml
Reading defaultSettings.yaml from /nix/store/n170p0fiily4lcr7agswvzm84fyzi2jx-latexindent-3.24.4-tex/scripts/latexindent/defaultSettings.yaml
INFO: YAML reading settings
Home directory is /home/elias
latexindent.pl didn't find indentconfig.yaml or .indentconfig.yaml
see all possible locations: https://latexindentpl.readthedocs.io/en/latest/sec-appendices.html#indentconfig-options)
INFO: YAML settings read: -y switch
YAML setting: "defaultIndent:' '"
quote found in -y switch
key:
value: defaultIndent:' '
double-quoted string found in -y switch: "defaultIndent:' '", substitute to defaultIndent:' '
INFO: Phase 1: searching for objects
INFO: Phase 2: finding surrounding indentation
INFO: Phase 3: indenting objects
INFO: Phase 4: final indentation check
INFO: Output routine:
Not outputting to file; see -w and -o switches for more options.
--------------
INFO: Please direct all communication/issues to:
https://github.com/cmhughes/latexindent.pl

4
overlays/obsidian.nix
View File

@@ -3,7 +3,11 @@ final: prev: {
src = prev.fetchurl {
url = old.src.url;
<<<<<<< HEAD
hash = "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE=";
=======
hash = "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o=";
>>>>>>> test
};
});
}

14
overlays/obsidian.nix.orig Normal file
View File

@@ -0,0 +1,14 @@
final: prev: {
obsidian = prev.obsidian.overrideAttrs (old: {
src = prev.fetchurl {
url = old.src.url;
<<<<<<< HEAD
hash = "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE=";
=======
hash = "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o=";
>>>>>>> test
};
});
}