mirror of
https://github.com/blahai/nyx.git
synced 2025-06-07 15:03:02 -04:00
stuff
This commit is contained in:
parent
02698c1b48
commit
ff043bb6c6
7 changed files with 154 additions and 248 deletions
315
flake.lock
generated
315
flake.lock
generated
|
@ -42,11 +42,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743265529,
|
"lastModified": 1744289235,
|
||||||
"narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=",
|
"narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "1d2dbd72c2bbaceab031c592d4810f744741d203",
|
"rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -62,19 +62,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744793570,
|
||||||
"lastModified": 1744375180,
|
"narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=",
|
||||||
"narHash": "sha256-s2FmOufSMIz6H0UrGOHJ7RrQfqvhCjUIvk54J8LlZFA=",
|
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "75c26f52a685291fedfd3a9c93f5cbe80a5d3321",
|
"rev": "192378974a131c402633bee18dc892b804a663e0",
|
||||||
=======
|
|
||||||
"lastModified": 1743801669,
|
|
||||||
"narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
|
|
||||||
"owner": "catppuccin",
|
|
||||||
"repo": "nix",
|
|
||||||
"rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -92,19 +84,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744662018,
|
||||||
"lastModified": 1744381971,
|
"narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=",
|
||||||
"narHash": "sha256-JDjAjBJJZWS9JEwLUilcP5yipDvCi3B8zfysKq3rhmQ=",
|
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "cdd79e28e8bd7a63e51b7cefa8e38c97866f4b4b",
|
"rev": "6318c913eb1b29236050bbb0202d957c6ae97191",
|
||||||
=======
|
|
||||||
"lastModified": 1744070747,
|
|
||||||
"narHash": "sha256-ds14Cu3aXDwTVtV6IN9q5nVCCz2H6vqQxIQ2KNd5/z0=",
|
|
||||||
"owner": "chaotic-cx",
|
|
||||||
"repo": "nyx",
|
|
||||||
"rev": "5d40cdae16b48c400b0d024a79644d0bd52eabcc",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -123,11 +107,11 @@
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742452566,
|
"lastModified": 1744618085,
|
||||||
"narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
|
"narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "fenix",
|
"repo": "fenix",
|
||||||
"rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
|
"rev": "a85d390a5607188dca2dbc39b5b37571651d69ce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -303,19 +287,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744762809,
|
||||||
"lastModified": 1744374744,
|
"narHash": "sha256-K4THPEfz75m29Ruui790RBuNP9JvS8l/pYt9zoN0Jmw=",
|
||||||
"narHash": "sha256-yoE0oJPSNkBLjQnJyCdFq2nJLpe7iV5Sgj8szgh2A0c=",
|
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "0390fb84bfa7223652041d21735296c1adaf796b",
|
"rev": "3dc9101e42a0e6b515828b8b9eb2c920e6a577f0",
|
||||||
"revCount": 171,
|
"revCount": 180,
|
||||||
=======
|
|
||||||
"lastModified": 1744070866,
|
|
||||||
"narHash": "sha256-I0jc0GlqXuyJLRTnhg1dilf1d6jgL5Lu1q1oGNk5mjs=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "171fd0da3663b471f67bb1e73985e00753e44fdf",
|
|
||||||
"revCount": 163,
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.blahai.gay/elissa/haipkgs.git"
|
"url": "https://git.blahai.gay/elissa/haipkgs.git"
|
||||||
},
|
},
|
||||||
|
@ -333,19 +309,11 @@
|
||||||
"nixvim": "nixvim"
|
"nixvim": "nixvim"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744762655,
|
||||||
"lastModified": 1744330643,
|
"narHash": "sha256-etyL0iP9ssrWnszcRDPm7Rp689zjT9xk4iVBD9++Opk=",
|
||||||
"narHash": "sha256-MSgrQMEQF8/IYrW08smpkxRAjyOgztfOwgIMvUcCORI=",
|
|
||||||
"owner": "blahai",
|
"owner": "blahai",
|
||||||
"repo": "haivim",
|
"repo": "haivim",
|
||||||
"rev": "9a27e61d1a9cd45911c2b3f0b61fb667dc2b4ffc",
|
"rev": "9a02ff5ef706c66450e43476dacc60b4529b0860",
|
||||||
=======
|
|
||||||
"lastModified": 1744157831,
|
|
||||||
"narHash": "sha256-FNfznkdBV8Ah5UvEnvHoXLq047eBVh5qU50sPqERuLQ=",
|
|
||||||
"owner": "blahai",
|
|
||||||
"repo": "haivim",
|
|
||||||
"rev": "e9594c3b544906c6a5ef1eadd8dd6525093bfe4a",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -362,19 +330,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744659400,
|
||||||
"lastModified": 1744172174,
|
"narHash": "sha256-q0wwsR/hvOjj1G8ogdudX5cU0IE/Vgvgjo9g9OpQv5U=",
|
||||||
"narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=",
|
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d",
|
"rev": "5a096a8822cb98584c5dc4f2616dcd5ed394bfd7",
|
||||||
=======
|
|
||||||
"lastModified": 1743869639,
|
|
||||||
"narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -390,40 +350,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744919155,
|
||||||
"lastModified": 1744400600,
|
"narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
|
||||||
"narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=",
|
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3",
|
"rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
|
||||||
=======
|
|
||||||
"lastModified": 1744138333,
|
|
||||||
"narHash": "sha256-l0Vjq1EZoYTfWImVmwsvMEuIdasrBRRCoNTV0rNtYi0=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "760eed59594f2f258db0d66b7ca4a5138681fd97",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_3": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"zen-browser",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1743604125,
|
|
||||||
"narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -477,11 +408,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739049071,
|
"lastModified": 1743953322,
|
||||||
"narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
|
"narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
|
"rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -508,19 +439,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744921985,
|
||||||
"lastModified": 1744324490,
|
"narHash": "sha256-to3lo8FYzHl4Z0O30wHprOZHUQdKYvAecWyX+zdoEEY=",
|
||||||
"narHash": "sha256-NddZqhX+75btNvcxhZD0AVXuAAM4Lnip2c+yrQThSVU=",
|
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "382f0f23f144e11bdccac6c5d3c1ed415b4b1855",
|
"rev": "ddae3036ca6a1729ffe7854a59184116d2622809",
|
||||||
=======
|
|
||||||
"lastModified": 1744134195,
|
|
||||||
"narHash": "sha256-6khrmCqqm4wIsTWZ0q8zCNn93hPRK03GE2Y9YaxFYq0=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "Hyprland",
|
|
||||||
"rev": "ea852965ffd4bf2bd2a74c0e821ba6190021eb31",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -638,11 +561,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741191527,
|
"lastModified": 1744468525,
|
||||||
"narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
|
"narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
|
"rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -740,19 +663,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744648917,
|
||||||
"lastModified": 1744117730,
|
"narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=",
|
||||||
"narHash": "sha256-kcxkKeBYyhy3BT5wfGmMo6kNo3XM5R7h/bu5fLdbnG4=",
|
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "92a01193c13d5ef9085899e22715c6e5f2590af8",
|
"rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5",
|
||||||
=======
|
|
||||||
"lastModified": 1743879910,
|
|
||||||
"narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=",
|
|
||||||
"owner": "Jovian-Experiments",
|
|
||||||
"repo": "Jovian-NixOS",
|
|
||||||
"rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -772,19 +687,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks_2"
|
"pre-commit-hooks": "pre-commit-hooks_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"lastModified": 1744302352,
|
"lastModified": 1744302352,
|
||||||
"narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=",
|
"narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=",
|
||||||
"rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6",
|
"rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/81d476984901d1f00fdcac36a0a8f06cb54048f6.tar.gz?rev=81d476984901d1f00fdcac36a0a8f06cb54048f6"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/81d476984901d1f00fdcac36a0a8f06cb54048f6.tar.gz?rev=81d476984901d1f00fdcac36a0a8f06cb54048f6"
|
||||||
=======
|
|
||||||
"lastModified": 1744100513,
|
|
||||||
"narHash": "sha256-eDym7mHXW0AVuqhp5BZ7uBk5b5NcM4slnSXFuoAUadc=",
|
|
||||||
"rev": "fb0ef6ca6bfea368e594e9ae2714858030f66bc6",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fb0ef6ca6bfea368e594e9ae2714858030f66bc6.tar.gz"
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -807,7 +714,7 @@
|
||||||
"narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
|
"narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
|
||||||
"rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
|
"rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -855,19 +762,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744463964,
|
||||||
"lastModified": 1744232761,
|
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||||
"narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
|
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
|
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||||
=======
|
|
||||||
"lastModified": 1743964447,
|
|
||||||
"narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -893,21 +792,29 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1744463964,
|
||||||
|
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"lastModified": 1744157173,
|
"lastModified": 1744157173,
|
||||||
"narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
|
"narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f",
|
"rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f",
|
||||||
=======
|
|
||||||
"lastModified": 1744032190,
|
|
||||||
"narHash": "sha256-KSlfrncSkcu1YE+uuJ/PTURsSlThoGkRqiGDVdbiE/k=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -919,35 +826,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744906855,
|
||||||
"lastModified": 1744688649,
|
"narHash": "sha256-nY2z3XZpmxQmhMzCnO2VwVXNdvnPf5nUmR8lHP2YN2M=",
|
||||||
"narHash": "sha256-VBWLtBfOUDxTD3Qo7fcrYVAiswKKERuf4f0IiqoCb5k=",
|
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "41bb44a543ea4c38b2bb5421c42e53437a4f1dc2",
|
"rev": "5c33c8b050193520cc1c2cd80ccd557ea61ffbf1",
|
||||||
=======
|
|
||||||
"lastModified": 1743827369,
|
|
||||||
"narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "42a1c966be226125b48c384171c44c651c236c22",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1744049787,
|
|
||||||
"narHash": "sha256-Xrcdw5arr01TL1pxvtyQGPBCMg8Budp7ejOG5H9u7cE=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "48382072d09ce1c72f2a6f716afaecd643226542",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -957,25 +840,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"nixpkgs_5": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1743448293,
|
|
||||||
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"nixvim": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
|
@ -983,19 +847,11 @@
|
||||||
"nuschtosSearch": "nuschtosSearch"
|
"nuschtosSearch": "nuschtosSearch"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744753228,
|
||||||
"lastModified": 1744325505,
|
"narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=",
|
||||||
"narHash": "sha256-dCmxSHzy3pcE+12Nf1slkAHYe/O6zJuCnRQrBtk4yjs=",
|
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "9bc29e6a9b2b7d5dc4c6757b17e849085f6c7a97",
|
"rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783",
|
||||||
=======
|
|
||||||
"lastModified": 1744119992,
|
|
||||||
"narHash": "sha256-XtwL/QfMjJtqO//mAjEfiC7noaAtH/gtQttcBE8dufs=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixvim",
|
|
||||||
"rev": "7114362f36123a8401f4905c2e833fd9a0c2ddd1",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1099,6 +955,7 @@
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"lix-module": "lix-module",
|
"lix-module": "lix-module",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"quickshell": "quickshell",
|
"quickshell": "quickshell",
|
||||||
"spicetify-nix": "spicetify-nix",
|
"spicetify-nix": "spicetify-nix",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
|
@ -1107,11 +964,11 @@
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742296961,
|
"lastModified": 1744539868,
|
||||||
"narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
|
"narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=",
|
||||||
"owner": "rust-lang",
|
"owner": "rust-lang",
|
||||||
"repo": "rust-analyzer",
|
"repo": "rust-analyzer",
|
||||||
"rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
|
"rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1151,19 +1008,11 @@
|
||||||
"systems": "systems_6"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
"lastModified": 1744682091,
|
||||||
"lastModified": 1744251450,
|
"narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=",
|
||||||
"narHash": "sha256-4zwkN8aC/B8G48p2R5ptqp4/l8M+SmLN/VddF39DeXM=",
|
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "e1326d6cd66f74595da4707ed7f1928e3d8cbbdd",
|
"rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a",
|
||||||
=======
|
|
||||||
"lastModified": 1744079955,
|
|
||||||
"narHash": "sha256-qIdHmNcq3qNCQA1cQTEfCZq7tqtgjhJqKKMFfZPTZPc=",
|
|
||||||
"owner": "Gerg-L",
|
|
||||||
"repo": "spicetify-nix",
|
|
||||||
"rev": "c0876c796c44a0a3ead0d36b5c100dbf47ea1dbd",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1290,11 +1139,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741934139,
|
"lastModified": 1744644585,
|
||||||
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
|
"narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
|
"rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1305,7 +1154,6 @@
|
||||||
},
|
},
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
"home-manager"
|
"home-manager"
|
||||||
],
|
],
|
||||||
|
@ -1314,22 +1162,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744398946,
|
"lastModified": 1744910227,
|
||||||
"narHash": "sha256-KJLrn9ONdiheUyEL/LIxGV4eeJrlUtUkLZvl6aFh0JI=",
|
"narHash": "sha256-qDAz+M2ZsqMEtar8WCkNkppDnXop83wB2GL66GbL1Lo=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "407f06610d0d149b2a284560fc9073b12c58707b",
|
"rev": "df60f61389c91f9db119cebc450580ede16d316f",
|
||||||
=======
|
|
||||||
"home-manager": "home-manager_3",
|
|
||||||
"nixpkgs": "nixpkgs_5"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1744155303,
|
|
||||||
"narHash": "sha256-Im6VnR4YKNEaIqETnD56meKaXpxZMeEjvNlfLgz6aWY=",
|
|
||||||
"owner": "0xc000022070",
|
|
||||||
"repo": "zen-browser-flake",
|
|
||||||
"rev": "6ff9a7e1a700032d8a9824cf4e6ca97107c3ba8a",
|
|
||||||
>>>>>>> 8e43637431df5894393d5b30935811e50567129c
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
#nixpkgs.url = "github:nixos/nixpkgs";
|
#nixpkgs.url = "github:nixos/nixpkgs";
|
||||||
#nixpkgs.url = "path:/home/pingu/Documents/GitHub/NixOS/nixpkgs";
|
#nixpkgs.url = "path:/home/pingu/Documents/GitHub/NixOS/nixpkgs";
|
||||||
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||||
|
|
||||||
# to keep lix up to date
|
# to keep lix up to date
|
||||||
|
@ -77,6 +78,7 @@
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
|
nixpkgs-unstable,
|
||||||
lix-module,
|
lix-module,
|
||||||
chaotic,
|
chaotic,
|
||||||
home-manager,
|
home-manager,
|
||||||
|
@ -87,6 +89,7 @@
|
||||||
nyx = nixpkgs.lib.nixosSystem {
|
nyx = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
|
upkgs = import nixpkgs-unstable;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/nyx/configuration.nix
|
./hosts/nyx/configuration.nix
|
||||||
|
|
|
@ -14,6 +14,12 @@
|
||||||
documentation.nixos.enable = false;
|
documentation.nixos.enable = false;
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
binfmt = {
|
||||||
|
emulatedSystems = ["aarch64-linux"];
|
||||||
|
registrations = {
|
||||||
|
aarch64-linux.interpreter = "${pkgs.qemu}/bin/qemu-aarch64";
|
||||||
|
};
|
||||||
|
};
|
||||||
tmp.cleanOnBoot = true;
|
tmp.cleanOnBoot = true;
|
||||||
loader = {
|
loader = {
|
||||||
systemd-boot = {
|
systemd-boot = {
|
||||||
|
@ -30,7 +36,7 @@
|
||||||
package = pkgs.zfs;
|
package = pkgs.zfs;
|
||||||
allowHibernation = true; # might cause corruption?
|
allowHibernation = true; # might cause corruption?
|
||||||
};
|
};
|
||||||
kernelPackages = pkgs.linuxPackages_6_12;
|
kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
|
||||||
kernel = {sysctl = {"vm.max_map_count" = 2147483642;};};
|
kernel = {sysctl = {"vm.max_map_count" = 2147483642;};};
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"elevator=none" # for zfs
|
"elevator=none" # for zfs
|
||||||
|
@ -196,6 +202,21 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ssh = {
|
||||||
|
extraConfig = ''
|
||||||
|
Host selene
|
||||||
|
HostName 135.181.31.235
|
||||||
|
User pingu
|
||||||
|
Port 22
|
||||||
|
'';
|
||||||
|
knownHosts = {
|
||||||
|
selene = {
|
||||||
|
hostNames = ["selene" "135.181.31.235"];
|
||||||
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINYiLDjNpZkBCCP4PGj2xc6hfbWhSqXMoeO2+VP+4vX6";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
@ -204,6 +225,21 @@
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||||
|
distributedBuilds = true;
|
||||||
|
|
||||||
|
buildMachines = [
|
||||||
|
{
|
||||||
|
hostName = "selene";
|
||||||
|
system = "aarch64-linux";
|
||||||
|
sshUser = "pingu";
|
||||||
|
sshKey = "/home/pingu/.ssh/id_ed25519";
|
||||||
|
protocol = "ssh-ng";
|
||||||
|
maxJobs = 8;
|
||||||
|
speedFactor = 2;
|
||||||
|
supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = [
|
experimental-features = [
|
||||||
"nix-command"
|
"nix-command"
|
||||||
|
@ -224,6 +260,7 @@
|
||||||
use-xdg-base-directories = true;
|
use-xdg-base-directories = true;
|
||||||
allowed-users = ["@wheel" "pingu" "root"];
|
allowed-users = ["@wheel" "pingu" "root"];
|
||||||
trusted-users = ["@wheel" "pingu" "root"];
|
trusted-users = ["@wheel" "pingu" "root"];
|
||||||
|
builders-use-substitutes = true;
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nixpkgs-unfree.cachix.org"
|
"https://nixpkgs-unfree.cachix.org"
|
||||||
|
@ -261,7 +298,11 @@
|
||||||
diff-so-fancy
|
diff-so-fancy
|
||||||
eog
|
eog
|
||||||
bottles
|
bottles
|
||||||
ffmpeg
|
((ffmpeg-full.override {
|
||||||
|
withUnfree = true;
|
||||||
|
withOpengl = true;
|
||||||
|
})
|
||||||
|
.overrideAttrs (_: {doCheck = false;}))
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gst_all_1.gst-libav
|
gst_all_1.gst-libav
|
||||||
gst_all_1.gst-vaapi
|
gst_all_1.gst-vaapi
|
||||||
|
@ -321,6 +362,22 @@
|
||||||
speedcrunch
|
speedcrunch
|
||||||
geogebra
|
geogebra
|
||||||
qbittorrent
|
qbittorrent
|
||||||
|
|
||||||
|
# Quickshell
|
||||||
|
(inputs.quickshell.packages."${pkgs.system}".default.override
|
||||||
|
{
|
||||||
|
withJemalloc = true;
|
||||||
|
withQtSvg = true;
|
||||||
|
withWayland = true;
|
||||||
|
withX11 = false;
|
||||||
|
withPipewire = true;
|
||||||
|
withPam = true;
|
||||||
|
withHyprland = true;
|
||||||
|
withI3 = false;
|
||||||
|
})
|
||||||
|
qt6.qtwayland
|
||||||
|
libsForQt5.qt5.qtgraphicaleffects
|
||||||
|
kdePackages.qt5compat
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/home-manager/default.nix
|
../../modules/home-manager/default.nix
|
||||||
inputs.catppuccin.homeManagerModules.catppuccin
|
inputs.catppuccin.homeModules.catppuccin
|
||||||
];
|
];
|
||||||
|
|
||||||
home.username = "pingu";
|
home.username = "pingu";
|
||||||
|
@ -41,13 +41,13 @@
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
Host theia
|
|
||||||
HostName 5.231.45.234
|
|
||||||
User pingu
|
|
||||||
|
|
||||||
Host artemis
|
Host artemis
|
||||||
HostName 100.106.17.39
|
HostName 100.106.17.39
|
||||||
User pingu
|
User pingu
|
||||||
|
|
||||||
|
Host selene
|
||||||
|
HostName 135.181.31.235
|
||||||
|
User pingu
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{...}: {
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./cli/default.nix
|
./cli/default.nix
|
||||||
./hypr/default.nix
|
./hypr/default.nix
|
||||||
./ags/default.nix
|
./ags/default.nix
|
||||||
./spotify/default.nix
|
./spotify/default.nix
|
||||||
|
./quickshell.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
|
|
||||||
"Super+Shift, S, togglespecialworkspace"
|
"Super+Shift, S, togglespecialworkspace"
|
||||||
|
|
||||||
"Super, R, exec, ${pkgs.anyrun}/bin/anyrun"
|
|
||||||
"Super, W, exec, ${pkgs.floorp}/bin/floorp"
|
"Super, W, exec, ${pkgs.floorp}/bin/floorp"
|
||||||
"Super, Q, exec, wezterm"
|
"Super, Q, exec, wezterm"
|
||||||
"Super, C, killactive"
|
"Super, C, killactive"
|
||||||
|
|
9
modules/home-manager/quickshell.nix
Normal file
9
modules/home-manager/quickshell.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
];
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue