Compare commits
7 Commits
9e4ac614da
...
0bf9f2ff2c
| Author | SHA1 | Date | |
|---|---|---|---|
0bf9f2ff2c
|
|||
|
c762b49d03
|
|||
|
944a4d7ffe
|
|||
|
d6c43647c6
|
|||
|
9b89e0fe64
|
|||
|
64c6cefe44
|
|||
|
c78cf8f7f5
|
366
flake.lock
generated
366
flake.lock
generated
@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736877444,
|
||||
"narHash": "sha256-K25atZ9alRsGb6TW+rRcpJTbtP5tnb3qusd762B2qWw=",
|
||||
"lastModified": 1743475805,
|
||||
"narHash": "sha256-H3T9CQ1qBwtEW8M+v5noSpRej6YNJRC5cpU0fO4oH/0=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "a1f0ce3bfbe9f0cc81e8b7def5e652a021e95c98",
|
||||
"rev": "d57ccce285ce6fc5e970420c31b49d9cef62d0bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -41,11 +41,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739103745,
|
||||
"narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=",
|
||||
"lastModified": 1743265529,
|
||||
"narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd",
|
||||
"rev": "1d2dbd72c2bbaceab031c592d4810f744741d203",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -57,15 +57,16 @@
|
||||
"ataraxiasjel-nur": {
|
||||
"inputs": {
|
||||
"devenv": "devenv",
|
||||
"devenv-root": "devenv-root",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739288283,
|
||||
"narHash": "sha256-/tEGehxzK9czlWqlED8lJF9V54jIAYHw7nGuFDkciFI=",
|
||||
"lastModified": 1742205455,
|
||||
"narHash": "sha256-mAxK0G/pqq4d8ADdGUpY9sBdrstzHjz/7MxQxnD2qH8=",
|
||||
"owner": "AtaraxiaSjel",
|
||||
"repo": "nur",
|
||||
"rev": "06d4603876e16cfe6fc41f9b44162be02a8b5d54",
|
||||
"rev": "0281ee4c5528f7200ecd2ad58d90d724133739fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -229,11 +230,11 @@
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739283129,
|
||||
"narHash": "sha256-GXJllf1wY7tOF6uei9S3PnSEghFbnJP1vkxM0kkMOoI=",
|
||||
"lastModified": 1743801669,
|
||||
"narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "d4e258e29075a86a82dacaf4f5e0985935ae4658",
|
||||
"rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -242,38 +243,20 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"catppuccin-vsc": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739527968,
|
||||
"narHash": "sha256-4ApAOtFIbqhtHpC59nEC1SdNX75D1dipDiB6rUhyqTY=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "vscode",
|
||||
"rev": "b8e5951a8ad03268854ef29780ce93fe9ea14294",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "catppuccin",
|
||||
"repo": "vscode",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"chaotic": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-schemas": "flake-schemas",
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739541414,
|
||||
"narHash": "sha256-F3HAp7k9/ZCvD1642D5Q3jbP35jjOmyBAfTli9yc2oU=",
|
||||
"lastModified": 1743703189,
|
||||
"narHash": "sha256-5s1zBM+pmpxvHInRbVScsueETRxVAi4EvDl4V3FzKjI=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "946e012ae9ce4d3da5ff51b6e8f7bfbe8864db34",
|
||||
"rev": "d3d2a0d76c2d85a49f30cb50956b0e8d93ee6ec6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -307,7 +290,7 @@
|
||||
"deploy-rs": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
@ -346,6 +329,18 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devenv-root": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=",
|
||||
"type": "file",
|
||||
"url": "file:///dev/null"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "file:///dev/null"
|
||||
}
|
||||
},
|
||||
"devenv_2": {
|
||||
"inputs": {
|
||||
"cachix": "cachix_2",
|
||||
@ -427,11 +422,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739634831,
|
||||
"narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=",
|
||||
"lastModified": 1743598667,
|
||||
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "fa5746ecea1772cf59b3f34c5816ab3531478142",
|
||||
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -449,11 +444,11 @@
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739342042,
|
||||
"narHash": "sha256-oi6joJyRviczLJeN8TEI1XVKVb+E/UCnMTtdIn/6fhg=",
|
||||
"lastModified": 1742452566,
|
||||
"narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "2d0149540591393c61dfd29f6883ba712d24e04f",
|
||||
"rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -478,22 +473,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_10": {
|
||||
"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": {
|
||||
@ -608,11 +587,11 @@
|
||||
"flake-compat_9": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -688,11 +667,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738453229,
|
||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -730,11 +709,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736143030,
|
||||
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -877,11 +856,11 @@
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -958,11 +937,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739381933,
|
||||
"narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=",
|
||||
"lastModified": 1743648554,
|
||||
"narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "15b59d4191b993ebdfcb1f61b834fced217882ba",
|
||||
"rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -978,11 +957,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739676861,
|
||||
"narHash": "sha256-X86ptHMNVuu1Z9leL0YV2E/oxD2IgPYrYANPcvFYpNo=",
|
||||
"lastModified": 1743869639,
|
||||
"narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "eb44c1601ed99896525e983bc9b15eb8b4d5879e",
|
||||
"rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1007,11 +986,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738664950,
|
||||
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
|
||||
"lastModified": 1742215578,
|
||||
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
|
||||
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1059,17 +1038,17 @@
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"pre-commit-hooks": "pre-commit-hooks_3",
|
||||
"systems": "systems_3",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739665242,
|
||||
"narHash": "sha256-iY4DtNDebYHt0uuN0EWWeNQ8K/SYix8KeUe2tcFzW0A=",
|
||||
"lastModified": 1743809433,
|
||||
"narHash": "sha256-tCOlE2zMXfd+KNG5ETr2VxhbniDMD7jBbD0JQhYBrlc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf",
|
||||
"rev": "8ba20fcae124591718bddadd94c5e8c381d02097",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1090,11 +1069,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738422629,
|
||||
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
|
||||
"lastModified": 1743549251,
|
||||
"narHash": "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
|
||||
"rev": "4ab17ccac08456cb5e00e8bd323de2efd30612be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1187,11 +1166,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739048914,
|
||||
"narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
|
||||
"lastModified": 1741191527,
|
||||
"narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "a7334904d591f38757c46fbe2ab68651877d9099",
|
||||
"rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1212,11 +1191,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739048933,
|
||||
"narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=",
|
||||
"lastModified": 1742984269,
|
||||
"narHash": "sha256-uz9FaCIbga/gQ5ZG1Hb4HVVjTWT1qjjCAFlCXiaefxg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499",
|
||||
"rev": "7248194a2ce0106ae647b70d0526a96dc9d6ad60",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1237,11 +1216,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739049028,
|
||||
"narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
|
||||
"lastModified": 1739870480,
|
||||
"narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "04146df74a8d5ec0b579657307be01f1e241125f",
|
||||
"rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1274,11 +1253,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739364465,
|
||||
"narHash": "sha256-LhyeVj5plHO3/3QV7SzOSOnvl0sehOjE4h6LHaiiJqU=",
|
||||
"lastModified": 1743660830,
|
||||
"narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "3dab95e02b5eeb9aec44a161bbed2b16b3d03aac",
|
||||
"rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1375,7 +1354,7 @@
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nix": "nix_4",
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1669478601,
|
||||
@ -1429,11 +1408,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739614676,
|
||||
"narHash": "sha256-iDX6hXrO0J79hY3MqwU7t8b95j8DbqwdOug/Xdz4g6E=",
|
||||
"lastModified": 1742038403,
|
||||
"narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "6255ffad7785bf04c7cff222f440de576c63363f",
|
||||
"rev": "876d83ac35fc52145674282f87898824182edc48",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1445,15 +1424,15 @@
|
||||
"nix-direnv": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_5",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739583861,
|
||||
"narHash": "sha256-IOWna75ou7OGQwFRZ+5VOYECPlCmk0kq5WoGMvlQj+o=",
|
||||
"lastModified": 1742186154,
|
||||
"narHash": "sha256-KXoeTXrilpJ+nCjutA1s0fK7Pxe174NptwMXSRb1lBc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-direnv",
|
||||
"rev": "2e82170f0689000d50ba5409fb139863f59ffd92",
|
||||
"rev": "69a5b2175e278115e1dd6354e5db42c1f6319dec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1471,11 +1450,11 @@
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736592044,
|
||||
"narHash": "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=",
|
||||
"lastModified": 1743836696,
|
||||
"narHash": "sha256-qd5SlOzyBHk3BGtL3sBGw22JonJ9Go3P32O1YURRlNk=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-fast-build",
|
||||
"rev": "906af17fcd50c84615a4660d9c08cf89c01cef7d",
|
||||
"rev": "2fadd8696095bde39531e3815deea894a00b9b4a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1578,11 +1557,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739071773,
|
||||
"narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=",
|
||||
"lastModified": 1741619381,
|
||||
"narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea",
|
||||
"rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1593,18 +1572,17 @@
|
||||
},
|
||||
"nix-vscode-marketplace": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_9",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739670916,
|
||||
"narHash": "sha256-Tdzu06QlI8DsYdXNe96c9eu0clj9Wkd1cKo6em/0xPU=",
|
||||
"lastModified": 1743817938,
|
||||
"narHash": "sha256-4mqj8t6YBymdfORyGaYB1HwL2mxgCyuHp3U5RSHdC/Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "370af219cf4ad7660e3ad4577849fb0478edb33c",
|
||||
"rev": "2a7a2b80740dd1dbb8b4e1d5b2ae6ad9b7fbd5e3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1678,7 +1656,7 @@
|
||||
"nix_4": {
|
||||
"inputs": {
|
||||
"lowdown-src": "lowdown-src",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"nixpkgs-regression": "nixpkgs-regression_4"
|
||||
},
|
||||
"locked": {
|
||||
@ -1718,11 +1696,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737057290,
|
||||
"narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
|
||||
"lastModified": 1742568034,
|
||||
"narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
|
||||
"rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1777,23 +1755,26 @@
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1738452942,
|
||||
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
"lastModified": 1743296961,
|
||||
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1739709408,
|
||||
"narHash": "sha256-D5kCBeD25UG+pV1gh8TTixzM1sVwv+E/QQQYKxAtcsA=",
|
||||
"lastModified": 1743872463,
|
||||
"narHash": "sha256-lFvdG84YZKiNQcQA/KxCS3nH3SHNGFNbo1N2/GAUO4I=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e3dcb8103396d6303e6e46dd3ebeab2ce97bfbc0",
|
||||
"rev": "aa44c348cbcbdada46a649642eb622bf605de3cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1901,11 +1882,11 @@
|
||||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1739484910,
|
||||
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
|
||||
"lastModified": 1743703532,
|
||||
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
|
||||
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1917,27 +1898,11 @@
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1702272962,
|
||||
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1947,7 +1912,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1657693803,
|
||||
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
|
||||
@ -1963,7 +1928,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1669378442,
|
||||
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
|
||||
@ -1979,7 +1944,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1725194671,
|
||||
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
|
||||
@ -1995,13 +1960,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"nixpkgs_14": {
|
||||
"locked": {
|
||||
"lastModified": 1739446958,
|
||||
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2011,13 +1976,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_16": {
|
||||
"nixpkgs_15": {
|
||||
"locked": {
|
||||
"lastModified": 1735834308,
|
||||
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
|
||||
"lastModified": 1740695751,
|
||||
"narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
|
||||
"rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2061,15 +2026,15 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1725983898,
|
||||
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1741513245,
|
||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
|
||||
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
@ -2109,11 +2074,11 @@
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1736012469,
|
||||
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2125,11 +2090,11 @@
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1732837521,
|
||||
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2141,16 +2106,16 @@
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1739446958,
|
||||
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
||||
"lastModified": 1702272962,
|
||||
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
||||
"rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@ -2262,11 +2227,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737465171,
|
||||
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2277,17 +2242,17 @@
|
||||
},
|
||||
"prismlauncher": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_10",
|
||||
"flake-compat": "flake-compat_9",
|
||||
"libnbtplusplus": "libnbtplusplus",
|
||||
"nix-filter": "nix-filter",
|
||||
"nixpkgs": "nixpkgs_16"
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736610087,
|
||||
"narHash": "sha256-ceYrz2mBJuf7pnUWbIvZBhh6SFiDLk6GWRdamGTUNY4=",
|
||||
"lastModified": 1742036351,
|
||||
"narHash": "sha256-bUnTyLMWVCVtjHKgle2D340ExlxEq5gnf6S48Svaw4w=",
|
||||
"owner": "AtaraxiaSjel",
|
||||
"repo": "PrismLauncher",
|
||||
"rev": "79a719295fe04e553be858f5320219be86444177",
|
||||
"rev": "e5059cfac0b3da39366b95ecd6e93d691e99e130",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2306,7 +2271,6 @@
|
||||
"base16-tokyonight-scheme": "base16-tokyonight-scheme",
|
||||
"cassowary": "cassowary",
|
||||
"catppuccin": "catppuccin",
|
||||
"catppuccin-vsc": "catppuccin-vsc",
|
||||
"chaotic": "chaotic",
|
||||
"deploy-rs": "deploy-rs",
|
||||
"disko": "disko",
|
||||
@ -2322,7 +2286,7 @@
|
||||
"nix-fast-build": "nix-fast-build",
|
||||
"nix-vscode-marketplace": "nix-vscode-marketplace",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixpkgs": "nixpkgs_15",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||
"prismlauncher": "prismlauncher",
|
||||
@ -2333,11 +2297,11 @@
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739305728,
|
||||
"narHash": "sha256-ZYZ6xYhvWcVvbIazMFEUPPkJFkjIa0tmdUFlbuZfcOM=",
|
||||
"lastModified": 1742296961,
|
||||
"narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "f63e4761a9f73ddfc04a3e198f77e5e8825d0136",
|
||||
"rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2354,11 +2318,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739262228,
|
||||
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
|
||||
"lastModified": 1743756170,
|
||||
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
|
||||
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2374,11 +2338,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739438633,
|
||||
"narHash": "sha256-7nTfMqYkc7WQwmB6m2zo2m2DEmNqrfyE+Pdisr7cTTI=",
|
||||
"lastModified": 1743041209,
|
||||
"narHash": "sha256-ANo3g355dNIF0Rtv3eLrJPu1h58Pn6O6mK0oBrcBq8A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "srvos",
|
||||
"rev": "54aae80b7526d234658632d251e9bf278b58b7ef",
|
||||
"rev": "7a4dc5c1112b2cde72ab05f70f522cfecb9c48d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2491,11 +2455,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736154270,
|
||||
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
|
||||
"lastModified": 1743748085,
|
||||
"narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
|
||||
"rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -2550,11 +2514,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737634991,
|
||||
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
|
||||
"lastModified": 1741934139,
|
||||
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
|
||||
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
catppuccin-vsc.url = "github:catppuccin/vscode";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
|
||||
@ -61,20 +61,16 @@
|
||||
deviceSpecific.vpn.sing-box.config = "ataraxia-singbox";
|
||||
|
||||
# Mount
|
||||
# TODO: fix sops
|
||||
sops.secrets.files-veracrypt.sopsFile = secretsDir + /amd-workstation/misc.yaml;
|
||||
services.cryptmount.files-veracrypt = {
|
||||
what = "/dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a";
|
||||
where = "/media/files";
|
||||
fsType = "ntfs";
|
||||
cryptType = "tcrypt";
|
||||
passwordFile = config.sops.secrets.files-veracrypt.path;
|
||||
mountOptions = [
|
||||
"uid=${toString config.users.users.${config.mainuser}.uid}"
|
||||
"gid=${toString config.users.groups.users.gid}"
|
||||
];
|
||||
};
|
||||
fileSystems = {
|
||||
"/media/files" = {
|
||||
fsType = "ntfs";
|
||||
device = "/dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a";
|
||||
options = [
|
||||
"nofail"
|
||||
"uid=${toString config.users.users.${config.mainuser}.uid}"
|
||||
"gid=${toString config.users.groups.users.gid}"
|
||||
];
|
||||
};
|
||||
"/media/win-sys" = {
|
||||
fsType = "ntfs";
|
||||
device = "/dev/disk/by-partuuid/4fba33e7-6b47-4e3b-b18b-882a58032673";
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
systemd.services = let
|
||||
service = user: group: {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
path = [ pkgs.nix-index-update ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = lib.getExe pkgs.nix-index-update;
|
||||
User = user;
|
||||
Group = group;
|
||||
};
|
||||
};
|
||||
in {
|
||||
"nix-index-update-root" = service "root" "root";
|
||||
"nix-index-update-${config.mainuser}" = service config.mainuser "users";
|
||||
};
|
||||
# systemd.services = let
|
||||
# service = user: group: {
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
# wants = [ "network-online.target" ];
|
||||
# after = [ "network-online.target" ];
|
||||
# path = [ pkgs.nix-index-update ];
|
||||
# serviceConfig = {
|
||||
# Type = "oneshot";
|
||||
# ExecStart = lib.getExe pkgs.nix-index-update;
|
||||
# User = user;
|
||||
# Group = group;
|
||||
# };
|
||||
# };
|
||||
# in {
|
||||
# "nix-index-update-root" = service "root" "root";
|
||||
# "nix-index-update-${config.mainuser}" = service config.mainuser "users";
|
||||
# };
|
||||
home-manager.users.${config.mainuser} = {
|
||||
programs.nix-index = {
|
||||
enable = true;
|
||||
|
||||
@ -60,7 +60,7 @@ with config.deviceSpecific; {
|
||||
tidal-dl
|
||||
tor-browser-bundle-bin
|
||||
ungoogled-chromium
|
||||
webcord-vencord
|
||||
vesktop
|
||||
youtube-to-mpv
|
||||
] ++ lib.optionals isGaming [
|
||||
# ceserver
|
||||
@ -88,7 +88,7 @@ with config.deviceSpecific; {
|
||||
".config/qimgv"
|
||||
".config/rclone"
|
||||
".config/Sonixd"
|
||||
".config/WebCord"
|
||||
".config/vesktop"
|
||||
".config/xarchiver"
|
||||
".local/share/com.github.johnfactotum.Foliate"
|
||||
".local/share/jellyfinmediaplayer"
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
{ pkgs, lib, config, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
self-nixpkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
EDITOR = pkgs.writeShellScript "code-editor" ''
|
||||
source "/etc/profiles/per-user/${config.mainuser}/etc/profile.d/hm-session-vars.sh"
|
||||
@ -10,10 +17,13 @@ let
|
||||
"$@"
|
||||
'';
|
||||
|
||||
ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace;
|
||||
ext-nixpkgs = pkgs.vscode-extensions;
|
||||
pkgs-ext = import self-nixpkgs {
|
||||
inherit (pkgs) system;
|
||||
config.allowUnfree = true;
|
||||
overlays = [ inputs.nix-vscode-marketplace.overlays.default ];
|
||||
};
|
||||
|
||||
continue-ver = lib.getVersion ext-nixpkgs.continue.continue;
|
||||
continue-ver = lib.getVersion pkgs-ext.vscode-extensions.continue.continue;
|
||||
in
|
||||
{
|
||||
environment.sessionVariables = {
|
||||
@ -35,177 +45,184 @@ in
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
enableExtensionUpdateCheck = false;
|
||||
enableUpdateCheck = false;
|
||||
extensions = [
|
||||
ext-vscode.aaron-bond.better-comments
|
||||
# ext-vscode.alefragnani.bookmarks
|
||||
# ext-vscode.alefragnani.project-manager
|
||||
# ext-vscode.alexisvt.flutter-snippets
|
||||
ext-vscode.christian-kohler.path-intellisense
|
||||
ext-vscode.codezombiech.gitignore
|
||||
ext-nixpkgs.continue.continue
|
||||
# ext-vscode.dart-code.dart-code
|
||||
# ext-vscode.dart-code.flutter
|
||||
ext-vscode.eamodio.gitlens
|
||||
ext-vscode.enkia.tokyo-night
|
||||
# ext-vscode.felixangelov.bloc
|
||||
ext-vscode.fill-labs.dependi
|
||||
ext-vscode.github.vscode-github-actions
|
||||
ext-vscode.github.vscode-pull-request-github
|
||||
ext-vscode.gruntfuggly.todo-tree
|
||||
ext-vscode.irongeek.vscode-env
|
||||
ext-vscode.jebbs.plantuml
|
||||
ext-vscode.jnoortheen.nix-ide
|
||||
# ext-vscode.lucax88x.codeacejumper
|
||||
# ext-vscode.marcelovelasquez.flutter-tree
|
||||
ext-vscode.mhutchie.git-graph
|
||||
ext-vscode.mkhl.direnv
|
||||
ext-vscode.ms-azuretools.vscode-docker
|
||||
ext-nixpkgs.ms-python.python
|
||||
ext-vscode.ms-python.isort
|
||||
ext-vscode.ms-python.vscode-pylance
|
||||
ext-nixpkgs.ms-vscode.cpptools
|
||||
ext-vscode.ms-vscode.hexeditor
|
||||
ext-nixpkgs.ms-vscode-remote.remote-containers
|
||||
ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later
|
||||
ext-vscode.pkief.material-icon-theme
|
||||
ext-vscode.streetsidesoftware.code-spell-checker
|
||||
ext-vscode.streetsidesoftware.code-spell-checker-russian
|
||||
ext-vscode.ultram4rine.vscode-choosealicense
|
||||
ext-vscode.usernamehw.errorlens
|
||||
ext-vscode.yzhang.markdown-all-in-one
|
||||
# Rust
|
||||
ext-vscode.jscearcy.rust-doc-viewer
|
||||
ext-vscode.polypus74.trusty-rusty-snippets
|
||||
ext-nixpkgs.rust-lang.rust-analyzer
|
||||
ext-vscode.tamasfe.even-better-toml
|
||||
ext-vscode.vadimcn.vscode-lldb
|
||||
# Golang
|
||||
ext-vscode.golang.go
|
||||
# Zig
|
||||
ext-vscode.ziglang.vscode-zig
|
||||
];
|
||||
# mutableExtensionsDir = false;
|
||||
userSettings = {
|
||||
"continue.telemetryEnabled" = false;
|
||||
"dart.checkForSdkUpdates" = false;
|
||||
"dart.debugSdkLibraries" = true;
|
||||
"dart.flutterCreateOrganization" = "com.ataraxiadev";
|
||||
"dart.flutterCreatePlatforms" = [ "linux,web,windows" ];
|
||||
"dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter";
|
||||
"dart.openDevTools" = "flutter";
|
||||
"dart.runPubGetOnNestedProjects" = "below";
|
||||
"dart.showTodos" = true;
|
||||
"editor.fontFamily" = "'VictorMono Nerd Font Medium'";
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.fontSize" = 16;
|
||||
"editor.guides.bracketPairs" = "active";
|
||||
"editor.quickSuggestions" = {
|
||||
"other" = true;
|
||||
"comments" = false;
|
||||
"strings" = true;
|
||||
};
|
||||
"files.autoSave" = "afterDelay";
|
||||
"files.exclude" = {
|
||||
"**/.classpath" = true;
|
||||
"**/.project" = true;
|
||||
"**/.settings" = true;
|
||||
"**/.factorypath" = true;
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"files.trimTrailingWhitespace" = true;
|
||||
"files.watcherExclude" = {
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"git-graph.repository.sign.commits" = true;
|
||||
"git-graph.repository.sign.tags" = true;
|
||||
"git.autofetch" = false;
|
||||
"git.enableCommitSigning" = true;
|
||||
"go.useLanguageServer" = true;
|
||||
"gopls" = {
|
||||
"ui.semanticTokens" = true;
|
||||
"formatting.gofumpt" = true;
|
||||
"ui.diagnostic.staticcheck" = true;
|
||||
};
|
||||
"license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>";
|
||||
"license.default" = "mit";
|
||||
"license.extension" = ".md";
|
||||
"license.year" = "auto";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
|
||||
"nix.serverPath" = "${pkgs.nil}/bin/nil";
|
||||
# "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
|
||||
"nix.serverSettings" = {
|
||||
"nil" = {
|
||||
"formatting" = {
|
||||
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
|
||||
};
|
||||
# "nix" = {
|
||||
# "maxMemoryMB" = 4096;
|
||||
# "flake" = {
|
||||
# "autoEvalInputs" = true;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
"nixd" = {
|
||||
"formatting" = {
|
||||
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
|
||||
};
|
||||
# "options" = {
|
||||
# "nixos" = {
|
||||
# "expr" = "";
|
||||
# };
|
||||
# "home-manager" = {
|
||||
# "expr" = "";
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
"rust-analyzer.check.command" = "clippy";
|
||||
"search.exclude" = {
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"security.workspace.trust.untrustedFiles" = "open";
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
"terminal.integrated.defaultProfile.linux" = "zsh";
|
||||
"terminal.integrated.fontFamily" = "FiraCode Nerd Font";
|
||||
"terminal.integrated.fontWeight" = "500";
|
||||
"terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh";
|
||||
"terminal.integrated.scrollback" = 100000;
|
||||
"todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!";
|
||||
"update.mode" = "none";
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"window.titleBarStyle" = "custom";
|
||||
"workbench.colorTheme" = "Tokyo Night";
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"zig.path" = "zig";
|
||||
"zig.zls.path" = "zls";
|
||||
"zig.initialSetupDone" = true;
|
||||
"[dart]" = {
|
||||
"editor.formatOnSave" = true;
|
||||
"editor.formatOnType" = true;
|
||||
"editor.rulers" = [
|
||||
80
|
||||
profiles.default = {
|
||||
enableExtensionUpdateCheck = false;
|
||||
enableUpdateCheck = false;
|
||||
extensions =
|
||||
let
|
||||
ext-market = pkgs-ext.vscode-marketplace;
|
||||
ext-nixpkgs = pkgs-ext.vscode-extensions;
|
||||
in
|
||||
[
|
||||
ext-market.aaron-bond.better-comments
|
||||
# ext-market.alefragnani.bookmarks
|
||||
# ext-market.alefragnani.project-manager
|
||||
# ext-market.alexisvt.flutter-snippets
|
||||
ext-market.christian-kohler.path-intellisense
|
||||
ext-market.codezombiech.gitignore
|
||||
ext-nixpkgs.continue.continue
|
||||
# ext-market.dart-code.dart-code
|
||||
# ext-market.dart-code.flutter
|
||||
ext-market.eamodio.gitlens
|
||||
ext-market.enkia.tokyo-night
|
||||
# ext-market.felixangelov.bloc
|
||||
ext-market.fill-labs.dependi
|
||||
ext-market.github.vscode-github-actions
|
||||
ext-market.github.vscode-pull-request-github
|
||||
ext-market.gruntfuggly.todo-tree
|
||||
ext-market.irongeek.vscode-env
|
||||
ext-market.jebbs.plantuml
|
||||
ext-market.jnoortheen.nix-ide
|
||||
# ext-market.lucax88x.codeacejumper
|
||||
# ext-market.marcelovelasquez.flutter-tree
|
||||
ext-market.mhutchie.git-graph
|
||||
ext-market.mkhl.direnv
|
||||
ext-market.ms-azuretools.vscode-docker
|
||||
ext-nixpkgs.ms-python.python
|
||||
ext-market.ms-python.isort
|
||||
ext-market.ms-python.vscode-pylance
|
||||
ext-nixpkgs.ms-vscode.cpptools
|
||||
ext-market.ms-vscode.hexeditor
|
||||
ext-nixpkgs.ms-vscode-remote.remote-containers
|
||||
ext-nixpkgs.ms-vscode-remote.remote-ssh # FIX later
|
||||
ext-market.pkief.material-icon-theme
|
||||
ext-market.streetsidesoftware.code-spell-checker
|
||||
ext-market.streetsidesoftware.code-spell-checker-russian
|
||||
ext-market.ultram4rine.vscode-choosealicense
|
||||
ext-market.usernamehw.errorlens
|
||||
ext-market.yzhang.markdown-all-in-one
|
||||
# Rust
|
||||
ext-market.jscearcy.rust-doc-viewer
|
||||
ext-market.polypus74.trusty-rusty-snippets
|
||||
ext-nixpkgs.rust-lang.rust-analyzer
|
||||
ext-market.tamasfe.even-better-toml
|
||||
ext-market.vadimcn.vscode-lldb
|
||||
# Golang
|
||||
ext-market.golang.go
|
||||
# Zig
|
||||
ext-market.ziglang.vscode-zig
|
||||
];
|
||||
# mutableExtensionsDir = false;
|
||||
userSettings = {
|
||||
"continue.telemetryEnabled" = false;
|
||||
"dart.checkForSdkUpdates" = false;
|
||||
"dart.debugSdkLibraries" = true;
|
||||
"dart.flutterCreateOrganization" = "com.ataraxiadev";
|
||||
"dart.flutterCreatePlatforms" = [ "linux,web,windows" ];
|
||||
"dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter";
|
||||
"dart.openDevTools" = "flutter";
|
||||
"dart.runPubGetOnNestedProjects" = "below";
|
||||
"dart.showTodos" = true;
|
||||
"editor.fontFamily" = "'VictorMono Nerd Font Medium'";
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.fontSize" = 16;
|
||||
"editor.guides.bracketPairs" = "active";
|
||||
"editor.quickSuggestions" = {
|
||||
"other" = true;
|
||||
"comments" = false;
|
||||
"strings" = true;
|
||||
};
|
||||
"files.autoSave" = "afterDelay";
|
||||
"files.exclude" = {
|
||||
"**/.classpath" = true;
|
||||
"**/.project" = true;
|
||||
"**/.settings" = true;
|
||||
"**/.factorypath" = true;
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"files.trimTrailingWhitespace" = true;
|
||||
"files.watcherExclude" = {
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"git-graph.repository.sign.commits" = true;
|
||||
"git-graph.repository.sign.tags" = true;
|
||||
"git.autofetch" = false;
|
||||
"git.enableCommitSigning" = true;
|
||||
"go.useLanguageServer" = true;
|
||||
"gopls" = {
|
||||
"ui.semanticTokens" = true;
|
||||
"formatting.gofumpt" = true;
|
||||
"ui.diagnostic.staticcheck" = true;
|
||||
};
|
||||
"license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>";
|
||||
"license.default" = "mit";
|
||||
"license.extension" = ".md";
|
||||
"license.year" = "auto";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
|
||||
"nix.serverPath" = "${pkgs.nil}/bin/nil";
|
||||
# "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
|
||||
"nix.serverSettings" = {
|
||||
"nil" = {
|
||||
"formatting" = {
|
||||
"command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
|
||||
};
|
||||
# "nix" = {
|
||||
# "maxMemoryMB" = 4096;
|
||||
# "flake" = {
|
||||
# "autoEvalInputs" = true;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
"nixd" = {
|
||||
"formatting" = {
|
||||
"command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
|
||||
};
|
||||
# "options" = {
|
||||
# "nixos" = {
|
||||
# "expr" = "";
|
||||
# };
|
||||
# "home-manager" = {
|
||||
# "expr" = "";
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
"rust-analyzer.check.command" = "clippy";
|
||||
"search.exclude" = {
|
||||
"**/.direnv" = true;
|
||||
};
|
||||
"security.workspace.trust.untrustedFiles" = "open";
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
"terminal.integrated.defaultProfile.linux" = "zsh";
|
||||
"terminal.integrated.fontFamily" = "FiraCode Nerd Font";
|
||||
"terminal.integrated.fontWeight" = "500";
|
||||
"terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh";
|
||||
"terminal.integrated.scrollback" = 100000;
|
||||
"todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!";
|
||||
"update.mode" = "none";
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"window.titleBarStyle" = "custom";
|
||||
"workbench.colorTheme" = "Tokyo Night";
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"zig.path" = "zig";
|
||||
"zig.zls.path" = "zls";
|
||||
"zig.initialSetupDone" = true;
|
||||
"[dart]" = {
|
||||
"editor.formatOnSave" = true;
|
||||
"editor.formatOnType" = true;
|
||||
"editor.rulers" = [
|
||||
80
|
||||
];
|
||||
"editor.selectionHighlight" = false;
|
||||
"editor.suggest.snippetsPreventQuickSuggestions" = false;
|
||||
"editor.suggestSelection" = "first";
|
||||
"editor.tabCompletion" = "onlySnippets";
|
||||
"editor.wordBasedSuggestions" = "off";
|
||||
};
|
||||
"[nix]" = {
|
||||
"editor.tabSize" = 2;
|
||||
"editor.detectIndentation" = true;
|
||||
};
|
||||
"[rust]" = {
|
||||
"editor.defaultFormatter" = "rust-lang.rust-analyzer";
|
||||
"editor.formatOnSave" = true;
|
||||
};
|
||||
"python.analysis.extraPaths" = [
|
||||
"/home/${config.mainuser}/.vscode/extensions/continue.continue"
|
||||
"/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
|
||||
];
|
||||
"editor.selectionHighlight" = false;
|
||||
"editor.suggest.snippetsPreventQuickSuggestions" = false;
|
||||
"editor.suggestSelection" = "first";
|
||||
"editor.tabCompletion" = "onlySnippets";
|
||||
"editor.wordBasedSuggestions" = "off";
|
||||
};
|
||||
"[nix]" = {
|
||||
"editor.tabSize" = 2;
|
||||
"editor.detectIndentation" = true;
|
||||
};
|
||||
"[rust]" = {
|
||||
"editor.defaultFormatter" = "rust-lang.rust-analyzer";
|
||||
"editor.formatOnSave" = true;
|
||||
};
|
||||
"python.analysis.extraPaths" = [
|
||||
"/home/${config.mainuser}/.vscode/extensions/continue.continue"
|
||||
"/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -56,15 +56,6 @@ with lib; {
|
||||
'';
|
||||
});
|
||||
|
||||
hyprland = prev.hyprland.overrideAttrs (oa: {
|
||||
patches = (oa.patches or []) ++ [
|
||||
../patches/hyprland-tablet.patch
|
||||
];
|
||||
});
|
||||
maa-assistant-arknights = prev.maa-assistant-arknights.overrideAttrs (_: {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
|
||||
});
|
||||
|
||||
neatvnc = prev.neatvnc.overrideAttrs (oa: {
|
||||
patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ];
|
||||
});
|
||||
|
||||
@ -34,8 +34,8 @@ let
|
||||
in {
|
||||
virtualisation.oci-containers.containers.media-caddy = {
|
||||
autoStart = true;
|
||||
# Tags: release-4938bf1, release-2.9.1, release
|
||||
image = "ghcr.io/hotio/caddy@sha256:beabf74742cb6771e8f5bbd76d046bc06cb3fa59699ffb7712701a5cfa097cc1";
|
||||
# Tags: release-adcfd40, release-2.9.1, release
|
||||
image = "ghcr.io/hotio/caddy@sha256:4be6d22747a07849808e134f53b82dbc39b9e520f077faff682423ddc75e4c8b";
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "100";
|
||||
|
||||
@ -11,8 +11,8 @@ in {
|
||||
TZ = "Europe/Moscow";
|
||||
};
|
||||
extraOptions = [ "--pod=media-stack" ];
|
||||
# Tags: 0.22.1433, version-v0.22.1433, v0.22.1433-ls679
|
||||
image = "docker.io/linuxserver/jackett@sha256:26ac30423b9808e0716dcde7791841296beacd95e820cfbfc4d50666ea0d1fb8";
|
||||
# Tags: 0.22.1730, version-v0.22.1730, v0.22.1730-ls727
|
||||
image = "docker.io/linuxserver/jackett@sha256:e05f37aca02259c8d558fc60510347bfec6f345dbb96032587c545ca90a71836";
|
||||
volumes = [
|
||||
"${nas-path}/configs/jackett:/config"
|
||||
];
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
in {
|
||||
virtualisation.oci-containers.containers.jellyfin = {
|
||||
autoStart = true;
|
||||
# Tags: 10.10.5, version-10.10.5ubu2404, 10.10.5ubu2404-ls52
|
||||
image = "docker.io/linuxserver/jellyfin@sha256:7cdcd4b6b60765290af7a2740960ce30c1f5548313ae60f7e23f6995ed4d147e";
|
||||
# Tags: 10.10.6, version-10.10.6ubu2404, 10.10.6ubu2404-ls57
|
||||
image = "docker.io/linuxserver/jellyfin@sha256:3ade631e7085ce6d8ce4b477191152ab51316f0293f23be7531508324cae7b37";
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "100";
|
||||
|
||||
@ -10,8 +10,8 @@ in {
|
||||
TZ = "Europe/Moscow";
|
||||
};
|
||||
extraOptions = [ "--pod=media-stack" ];
|
||||
# Tags: 2.9.6, version-2.9.6.4552, 2.9.6.4552-ls30
|
||||
image = "docker.io/linuxserver/lidarr@sha256:c3aae1e32f7e2b76c6aa0e546a16f3feb570455882a5c9d51c8aec9e53328d66";
|
||||
# Tags: 2.10.3, version-2.10.3.4602, 2.10.3.4602-ls36
|
||||
image = "docker.io/linuxserver/lidarr@sha256:4c3d6942aa0ae3a7da5a4d6a59ee96e43777d834b4234f539bbb5d10a2db2900";
|
||||
volumes = [
|
||||
"${nas-path}/configs/lidarr/config:/config"
|
||||
"${nas-path}/configs/lidarr/custom-services.d:/custom-services.d"
|
||||
|
||||
@ -4,8 +4,8 @@ let
|
||||
in {
|
||||
virtualisation.oci-containers.containers.medusa = {
|
||||
autoStart = true;
|
||||
# Tags: 1.0.22, version-v1.0.22, v1.0.22-ls211
|
||||
image = "docker.io/linuxserver/medusa@sha256:397636cc7e421ee284d4fb8d9b07874ce41155b419b3e8419dce389fcdb465a7";
|
||||
# Tags: 1.0.22, version-v1.0.22, v1.0.22-ls216
|
||||
image = "docker.io/linuxserver/medusa@sha256:78fa244f473e5e791d1c01db61300e33dd5ebc9ab9def206b53bc2621d212f71";
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "100";
|
||||
|
||||
@ -7,8 +7,8 @@ let
|
||||
in {
|
||||
virtualisation.oci-containers.containers.qbittorrent = {
|
||||
autoStart = true;
|
||||
# Tags: 5.0.3, version-5.0.3-r0, 5.0.3-r0-ls380
|
||||
image = "docker.io/linuxserver/qbittorrent@sha256:308d768672fb9e86e800a73504c439176aabe5977bcdf8b99f7561bb603d9b6e";
|
||||
# Tags: 5.0.4, version-5.0.4-r0, 5.0.4-r0-ls387
|
||||
image = "docker.io/linuxserver/qbittorrent@sha256:dc9e13d2edab18cc7c42367526182b2798f9f0f4c590559337f954fb4e3bdc35";
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "100";
|
||||
|
||||
@ -11,8 +11,8 @@ in {
|
||||
TZ = "Europe/Moscow";
|
||||
};
|
||||
extraOptions = [ "--pod=media-stack" ];
|
||||
# Tags: 4.0.13, version-4.0.13.2932, 4.0.13.2932-ls271
|
||||
image = "docker.io/linuxserver/sonarr@sha256:28d9dcbc846aed74bd47dc90305e016183443ddc3dfa3e8bcac268fc653a6e5e";
|
||||
# Tags: 4.0.14, version-4.0.14.2939, 4.0.14.2939-ls277
|
||||
image = "docker.io/linuxserver/sonarr@sha256:7342ef32dd9cd6d13638765cfb8034edd4c80b0584f427159fd7f5ddeef5399d";
|
||||
volumes = [
|
||||
"${nas-path}/configs/sonarr:/config"
|
||||
"${nas-path}:/data"
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
in {
|
||||
virtualisation.oci-containers.containers.spdf = {
|
||||
autoStart = true;
|
||||
# Tags: latest-fat, 0.41.0-fat
|
||||
image = "docker.io/stirlingtools/stirling-pdf@sha256:e791d48580806f6dade7c9774b7137d40ebbf1f35b86c592877d32eae2cbf0ad";
|
||||
# Tags: latest-fat, 0.45.0-fat
|
||||
image = "docker.io/stirlingtools/stirling-pdf@sha256:d3e0d26655d48970d5aa414ce57c5f91c59e3a7ed485729654aa142460151d14";
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "100";
|
||||
|
||||
@ -31,6 +31,38 @@
|
||||
catppuccin.zsh-syntax-highlighting.enable = true;
|
||||
programs.zsh.syntaxHighlighting.enable = true;
|
||||
|
||||
catppuccin.vscode = {
|
||||
enable = true;
|
||||
flavor = cfg.flavor;
|
||||
settings = {
|
||||
accent = cfg.accent;
|
||||
boldKeywords = false;
|
||||
italicComments = false;
|
||||
italicKeywords = false;
|
||||
extraBordersEnabled = false;
|
||||
workbenchMode = "flat";
|
||||
bracketMode = "dimmed";
|
||||
colorOverrides = {
|
||||
${cfg.flavor} = {
|
||||
base = "#1c1c2d";
|
||||
mantle = "#191925";
|
||||
crust = "#151511";
|
||||
};
|
||||
};
|
||||
customUIColors = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.vscode.profiles.default.userSettings = {
|
||||
"gopls.ui.semanticTokens" = lib.mkForce true;
|
||||
"editor.semanticHighlighting.enabled" = lib.mkForce true;
|
||||
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
|
||||
"window.titleBarStyle" = lib.mkForce "custom";
|
||||
"workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
|
||||
"workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.extraConfig = ''
|
||||
exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize}
|
||||
'';
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
(import ./gitea.nix { inherit cfg; gitea = "gitea"; })
|
||||
# Deprecated on catppuccin-nix
|
||||
(import ./gtk.nix { inherit cfg; })
|
||||
(import ./vscode.nix { inherit cfg; })
|
||||
];
|
||||
|
||||
home-manager.users.${config.mainuser} = {
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ cfg }: { config, lib, pkgs, inputs, ... }: {
|
||||
home-manager.users.${config.mainuser} = {
|
||||
programs.vscode = {
|
||||
extensions = let
|
||||
ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace;
|
||||
in [
|
||||
ext-vscode.alexdauenhauer.catppuccin-noctis
|
||||
ext-vscode.catppuccin.catppuccin-vsc-icons
|
||||
(inputs.catppuccin-vsc.packages.${pkgs.system}.catppuccin-vsc.override {
|
||||
accent = cfg.accent;
|
||||
boldKeywords = false;
|
||||
italicComments = false;
|
||||
italicKeywords = false;
|
||||
extraBordersEnabled = false;
|
||||
workbenchMode = "flat";
|
||||
bracketMode = "dimmed";
|
||||
colorOverrides = {
|
||||
mocha = {
|
||||
base = "#1c1c2d";
|
||||
mantle = "#191925";
|
||||
crust = "#151511";
|
||||
};
|
||||
};
|
||||
customUIColors = {
|
||||
"statusBar.foreground" = "accent";
|
||||
};
|
||||
})
|
||||
];
|
||||
userSettings = {
|
||||
"editor.semanticHighlighting.enabled" = lib.mkForce true;
|
||||
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
|
||||
"window.titleBarStyle" = lib.mkForce "custom";
|
||||
"workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
|
||||
"workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -251,31 +251,34 @@ in {
|
||||
bind=${modifier}ALT,g,movetoworkspace,name:Games
|
||||
bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers
|
||||
'' ''
|
||||
windowrulev2=workspace name:Email silent,class:^(geary)$
|
||||
windowrulev2=workspace name:Steam silent,class:^(steam)$
|
||||
windowrulev2=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
|
||||
windowrulev2=workspace name:Music silent,title:^(Spotify)$
|
||||
windowrulev2=tile,title:^(Spotify)$
|
||||
windowrulev2=workspace name:Messengers silent,class:^(org.telegram.desktop)$
|
||||
windowrule=opaque,firefox
|
||||
windowrule=opaque,chromium-browser
|
||||
windowrule=opaque,mpv
|
||||
windowrule=workspace name:Email silent,class:^(geary)$
|
||||
windowrule=workspace name:Steam silent,class:^(steam)$
|
||||
windowrule=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
|
||||
windowrule=workspace name:Music silent,title:^(Spotify)$
|
||||
windowrule=tile,title:^(Spotify)$
|
||||
windowrule=workspace name:Messengers silent,class:^(org.telegram.desktop)$
|
||||
windowrule=opaque,class:^(firefox)$
|
||||
windowrule=opaque,class:^(Chromium-browser)$
|
||||
windowrule=opaque,class:^(mpv)$
|
||||
|
||||
windowrule=float,Waydroid
|
||||
windowrule=size 1600 900,Waydroid
|
||||
windowrule=center,Waydroid
|
||||
windowrule=opaque,Waydroid
|
||||
windowrule=opaque,qemu
|
||||
windowrule=float,class:^(Waydroid)$
|
||||
windowrule=size 1600 900,class:^(Waydroid)$
|
||||
windowrule=center,class:^(Waydroid)$
|
||||
windowrule=opaque,class:^(Waydroid)$
|
||||
windowrule=opaque,class:.*(qemu).*
|
||||
|
||||
windowrule=opaque,steam_app.*
|
||||
windowrule=float,steam_app.*
|
||||
windowrule=opaque,class:^(steam)$
|
||||
windowrule=float,class:^(steam)$
|
||||
|
||||
windowrule=opaque,virt-manager
|
||||
windowrulev2=opaque,class:^(.*winbox64.exe)$
|
||||
windowrulev2=tile,class:^(.*winbox64.exe)$
|
||||
windowrulev2=opaque,class:^(starrail.exe)$
|
||||
windowrule=opaque,class:^(gamescope)$
|
||||
windowrule=float,class:^(gamescope)$
|
||||
|
||||
windowrule=opaque,.*jellyfin.*
|
||||
windowrule=opaque,class:.*(virt-manager).*
|
||||
windowrule=opaque,class:^(.*winbox64.exe)$
|
||||
windowrule=tile,class:^(.*winbox64.exe)$
|
||||
windowrule=opaque,class:^(starrail.exe)$
|
||||
|
||||
windowrule=opaque,class:.*(jellyfin).*
|
||||
'' ''
|
||||
env=GDK_BACKEND=wayland,x11
|
||||
env=QT_QPA_PLATFORM=wayland;xcb
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user