Compare commits

..

7 Commits

20 changed files with 458 additions and 495 deletions

366
flake.lock generated
View File

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736877444, "lastModified": 1743475805,
"narHash": "sha256-K25atZ9alRsGb6TW+rRcpJTbtP5tnb3qusd762B2qWw=", "narHash": "sha256-H3T9CQ1qBwtEW8M+v5noSpRej6YNJRC5cpU0fO4oH/0=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "a1f0ce3bfbe9f0cc81e8b7def5e652a021e95c98", "rev": "d57ccce285ce6fc5e970420c31b49d9cef62d0bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739103745, "lastModified": 1743265529,
"narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,15 +57,16 @@
"ataraxiasjel-nur": { "ataraxiasjel-nur": {
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv",
"devenv-root": "devenv-root",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1739288283, "lastModified": 1742205455,
"narHash": "sha256-/tEGehxzK9czlWqlED8lJF9V54jIAYHw7nGuFDkciFI=", "narHash": "sha256-mAxK0G/pqq4d8ADdGUpY9sBdrstzHjz/7MxQxnD2qH8=",
"owner": "AtaraxiaSjel", "owner": "AtaraxiaSjel",
"repo": "nur", "repo": "nur",
"rev": "06d4603876e16cfe6fc41f9b44162be02a8b5d54", "rev": "0281ee4c5528f7200ecd2ad58d90d724133739fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +230,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1739283129, "lastModified": 1743801669,
"narHash": "sha256-GXJllf1wY7tOF6uei9S3PnSEghFbnJP1vkxM0kkMOoI=", "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "d4e258e29075a86a82dacaf4f5e0985935ae4658", "rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,38 +243,20 @@
"type": "github" "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": { "chaotic": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian", "jovian": "jovian",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1739541414, "lastModified": 1743703189,
"narHash": "sha256-F3HAp7k9/ZCvD1642D5Q3jbP35jjOmyBAfTli9yc2oU=", "narHash": "sha256-5s1zBM+pmpxvHInRbVScsueETRxVAi4EvDl4V3FzKjI=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "946e012ae9ce4d3da5ff51b6e8f7bfbe8864db34", "rev": "d3d2a0d76c2d85a49f30cb50956b0e8d93ee6ec6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,7 +290,7 @@
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_9",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -346,6 +329,18 @@
"type": "github" "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": { "devenv_2": {
"inputs": { "inputs": {
"cachix": "cachix_2", "cachix": "cachix_2",
@ -427,11 +422,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739634831, "lastModified": 1743598667,
"narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=", "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "fa5746ecea1772cf59b3f34c5816ab3531478142", "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +444,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1739342042, "lastModified": 1742452566,
"narHash": "sha256-oi6joJyRviczLJeN8TEI1XVKVb+E/UCnMTtdIn/6fhg=", "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "2d0149540591393c61dfd29f6883ba712d24e04f", "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,22 +473,6 @@
"type": "github" "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-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -608,11 +587,11 @@
"flake-compat_9": { "flake-compat_9": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +667,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1743550720,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,11 +709,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1743550720,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -877,11 +856,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1731533236,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -958,11 +937,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739381933, "lastModified": 1743648554,
"narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -978,11 +957,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739676861, "lastModified": 1743869639,
"narHash": "sha256-X86ptHMNVuu1Z9leL0YV2E/oxD2IgPYrYANPcvFYpNo=", "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "eb44c1601ed99896525e983bc9b15eb8b4d5879e", "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1007,11 +986,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738664950, "lastModified": 1742215578,
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1059,17 +1038,17 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_10",
"pre-commit-hooks": "pre-commit-hooks_3", "pre-commit-hooks": "pre-commit-hooks_3",
"systems": "systems_3", "systems": "systems_3",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1739665242, "lastModified": 1743809433,
"narHash": "sha256-iY4DtNDebYHt0uuN0EWWeNQ8K/SYix8KeUe2tcFzW0A=", "narHash": "sha256-tCOlE2zMXfd+KNG5ETr2VxhbniDMD7jBbD0JQhYBrlc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf", "rev": "8ba20fcae124591718bddadd94c5e8c381d02097",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1090,11 +1069,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738422629, "lastModified": 1743549251,
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "narHash": "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "rev": "4ab17ccac08456cb5e00e8bd323de2efd30612be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1187,11 +1166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739048914, "lastModified": 1741191527,
"narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "a7334904d591f38757c46fbe2ab68651877d9099", "rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1212,11 +1191,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739048933, "lastModified": 1742984269,
"narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "narHash": "sha256-uz9FaCIbga/gQ5ZG1Hb4HVVjTWT1qjjCAFlCXiaefxg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "rev": "7248194a2ce0106ae647b70d0526a96dc9d6ad60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1237,11 +1216,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739049028, "lastModified": 1739870480,
"narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "04146df74a8d5ec0b579657307be01f1e241125f", "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1274,11 +1253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739364465, "lastModified": 1743660830,
"narHash": "sha256-LhyeVj5plHO3/3QV7SzOSOnvl0sehOjE4h6LHaiiJqU=", "narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "3dab95e02b5eeb9aec44a161bbed2b16b3d03aac", "rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1375,7 +1354,7 @@
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nix": "nix_4", "nix": "nix_4",
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1669478601, "lastModified": 1669478601,
@ -1429,11 +1408,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739614676, "lastModified": 1742038403,
"narHash": "sha256-iDX6hXrO0J79hY3MqwU7t8b95j8DbqwdOug/Xdz4g6E=", "narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "6255ffad7785bf04c7cff222f440de576c63363f", "rev": "876d83ac35fc52145674282f87898824182edc48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1445,15 +1424,15 @@
"nix-direnv": { "nix-direnv": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_14", "nixpkgs": "nixpkgs_13",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1739583861, "lastModified": 1742186154,
"narHash": "sha256-IOWna75ou7OGQwFRZ+5VOYECPlCmk0kq5WoGMvlQj+o=", "narHash": "sha256-KXoeTXrilpJ+nCjutA1s0fK7Pxe174NptwMXSRb1lBc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-direnv", "repo": "nix-direnv",
"rev": "2e82170f0689000d50ba5409fb139863f59ffd92", "rev": "69a5b2175e278115e1dd6354e5db42c1f6319dec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1471,11 +1450,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1736592044, "lastModified": 1743836696,
"narHash": "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=", "narHash": "sha256-qd5SlOzyBHk3BGtL3sBGw22JonJ9Go3P32O1YURRlNk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-fast-build", "repo": "nix-fast-build",
"rev": "906af17fcd50c84615a4660d9c08cf89c01cef7d", "rev": "2fadd8696095bde39531e3815deea894a00b9b4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1578,11 +1557,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739071773, "lastModified": 1741619381,
"narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1593,18 +1572,17 @@
}, },
"nix-vscode-marketplace": { "nix-vscode-marketplace": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_9",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1739670916, "lastModified": 1743817938,
"narHash": "sha256-Tdzu06QlI8DsYdXNe96c9eu0clj9Wkd1cKo6em/0xPU=", "narHash": "sha256-4mqj8t6YBymdfORyGaYB1HwL2mxgCyuHp3U5RSHdC/Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "370af219cf4ad7660e3ad4577849fb0478edb33c", "rev": "2a7a2b80740dd1dbb8b4e1d5b2ae6ad9b7fbd5e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1678,7 +1656,7 @@
"nix_4": { "nix_4": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_11",
"nixpkgs-regression": "nixpkgs-regression_4" "nixpkgs-regression": "nixpkgs-regression_4"
}, },
"locked": { "locked": {
@ -1718,11 +1696,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737057290, "lastModified": 1742568034,
"narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1777,23 +1755,26 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1738452942, "lastModified": 1743296961,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" "repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" "repo": "nixpkgs.lib",
"type": "github"
} }
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1739709408, "lastModified": 1743872463,
"narHash": "sha256-D5kCBeD25UG+pV1gh8TTixzM1sVwv+E/QQQYKxAtcsA=", "narHash": "sha256-lFvdG84YZKiNQcQA/KxCS3nH3SHNGFNbo1N2/GAUO4I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3dcb8103396d6303e6e46dd3ebeab2ce97bfbc0", "rev": "aa44c348cbcbdada46a649642eb622bf605de3cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1901,11 +1882,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1739484910, "lastModified": 1743703532,
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1917,27 +1898,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1702272962, "lastModified": 1743583204,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1947,7 +1912,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1657693803, "lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
@ -1963,7 +1928,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1669378442, "lastModified": 1669378442,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
@ -1979,7 +1944,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
@ -1995,13 +1960,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_15": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1739446958, "lastModified": 1743583204,
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2011,13 +1976,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_16": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1735834308, "lastModified": 1740695751,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65", "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2061,15 +2026,15 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1725983898, "lastModified": 1741513245,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -2109,11 +2074,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1743583204,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2125,11 +2090,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1743583204,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2141,16 +2106,16 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1739446958, "lastModified": 1702272962,
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -2262,11 +2227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737465171, "lastModified": 1742649964,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2277,17 +2242,17 @@
}, },
"prismlauncher": { "prismlauncher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_10", "flake-compat": "flake-compat_9",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs_16" "nixpkgs": "nixpkgs_15"
}, },
"locked": { "locked": {
"lastModified": 1736610087, "lastModified": 1742036351,
"narHash": "sha256-ceYrz2mBJuf7pnUWbIvZBhh6SFiDLk6GWRdamGTUNY4=", "narHash": "sha256-bUnTyLMWVCVtjHKgle2D340ExlxEq5gnf6S48Svaw4w=",
"owner": "AtaraxiaSjel", "owner": "AtaraxiaSjel",
"repo": "PrismLauncher", "repo": "PrismLauncher",
"rev": "79a719295fe04e553be858f5320219be86444177", "rev": "e5059cfac0b3da39366b95ecd6e93d691e99e130",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2306,7 +2271,6 @@
"base16-tokyonight-scheme": "base16-tokyonight-scheme", "base16-tokyonight-scheme": "base16-tokyonight-scheme",
"cassowary": "cassowary", "cassowary": "cassowary",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"catppuccin-vsc": "catppuccin-vsc",
"chaotic": "chaotic", "chaotic": "chaotic",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
@ -2322,7 +2286,7 @@
"nix-fast-build": "nix-fast-build", "nix-fast-build": "nix-fast-build",
"nix-vscode-marketplace": "nix-vscode-marketplace", "nix-vscode-marketplace": "nix-vscode-marketplace",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_15", "nixpkgs": "nixpkgs_14",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"prismlauncher": "prismlauncher", "prismlauncher": "prismlauncher",
@ -2333,11 +2297,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739305728, "lastModified": 1742296961,
"narHash": "sha256-ZYZ6xYhvWcVvbIazMFEUPPkJFkjIa0tmdUFlbuZfcOM=", "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "f63e4761a9f73ddfc04a3e198f77e5e8825d0136", "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2354,11 +2318,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739262228, "lastModified": 1743756170,
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2374,11 +2338,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739438633, "lastModified": 1743041209,
"narHash": "sha256-7nTfMqYkc7WQwmB6m2zo2m2DEmNqrfyE+Pdisr7cTTI=", "narHash": "sha256-ANo3g355dNIF0Rtv3eLrJPu1h58Pn6O6mK0oBrcBq8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "54aae80b7526d234658632d251e9bf278b58b7ef", "rev": "7a4dc5c1112b2cde72ab05f70f522cfecb9c48d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2491,11 +2455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154270, "lastModified": 1743748085,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2550,11 +2514,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634991, "lastModified": 1741934139,
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -36,7 +36,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
catppuccin-vsc.url = "github:catppuccin/vscode";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";

View File

@ -61,20 +61,16 @@
deviceSpecific.vpn.sing-box.config = "ataraxia-singbox"; deviceSpecific.vpn.sing-box.config = "ataraxia-singbox";
# Mount # Mount
# TODO: fix sops fileSystems = {
sops.secrets.files-veracrypt.sopsFile = secretsDir + /amd-workstation/misc.yaml; "/media/files" = {
services.cryptmount.files-veracrypt = {
what = "/dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a";
where = "/media/files";
fsType = "ntfs"; fsType = "ntfs";
cryptType = "tcrypt"; device = "/dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a";
passwordFile = config.sops.secrets.files-veracrypt.path; options = [
mountOptions = [ "nofail"
"uid=${toString config.users.users.${config.mainuser}.uid}" "uid=${toString config.users.users.${config.mainuser}.uid}"
"gid=${toString config.users.groups.users.gid}" "gid=${toString config.users.groups.users.gid}"
]; ];
}; };
fileSystems = {
"/media/win-sys" = { "/media/win-sys" = {
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/disk/by-partuuid/4fba33e7-6b47-4e3b-b18b-882a58032673"; device = "/dev/disk/by-partuuid/4fba33e7-6b47-4e3b-b18b-882a58032673";

View File

@ -1,21 +1,21 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
systemd.services = let # systemd.services = let
service = user: group: { # service = user: group: {
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; # wants = [ "network-online.target" ];
after = [ "network-online.target" ]; # after = [ "network-online.target" ];
path = [ pkgs.nix-index-update ]; # path = [ pkgs.nix-index-update ];
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
ExecStart = lib.getExe pkgs.nix-index-update; # ExecStart = lib.getExe pkgs.nix-index-update;
User = user; # User = user;
Group = group; # Group = group;
}; # };
}; # };
in { # in {
"nix-index-update-root" = service "root" "root"; # "nix-index-update-root" = service "root" "root";
"nix-index-update-${config.mainuser}" = service config.mainuser "users"; # "nix-index-update-${config.mainuser}" = service config.mainuser "users";
}; # };
home-manager.users.${config.mainuser} = { home-manager.users.${config.mainuser} = {
programs.nix-index = { programs.nix-index = {
enable = true; enable = true;

View File

@ -60,7 +60,7 @@ with config.deviceSpecific; {
tidal-dl tidal-dl
tor-browser-bundle-bin tor-browser-bundle-bin
ungoogled-chromium ungoogled-chromium
webcord-vencord vesktop
youtube-to-mpv youtube-to-mpv
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
# ceserver # ceserver
@ -88,7 +88,7 @@ with config.deviceSpecific; {
".config/qimgv" ".config/qimgv"
".config/rclone" ".config/rclone"
".config/Sonixd" ".config/Sonixd"
".config/WebCord" ".config/vesktop"
".config/xarchiver" ".config/xarchiver"
".local/share/com.github.johnfactotum.Foliate" ".local/share/com.github.johnfactotum.Foliate"
".local/share/jellyfinmediaplayer" ".local/share/jellyfinmediaplayer"

View File

@ -1,4 +1,11 @@
{ pkgs, lib, config, inputs, ... }: {
pkgs,
lib,
config,
inputs,
self-nixpkgs,
...
}:
let let
EDITOR = pkgs.writeShellScript "code-editor" '' EDITOR = pkgs.writeShellScript "code-editor" ''
source "/etc/profiles/per-user/${config.mainuser}/etc/profile.d/hm-session-vars.sh" 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; pkgs-ext = import self-nixpkgs {
ext-nixpkgs = pkgs.vscode-extensions; 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 in
{ {
environment.sessionVariables = { environment.sessionVariables = {
@ -35,56 +45,62 @@ in
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscode; package = pkgs.vscode;
profiles.default = {
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = [ extensions =
ext-vscode.aaron-bond.better-comments let
# ext-vscode.alefragnani.bookmarks ext-market = pkgs-ext.vscode-marketplace;
# ext-vscode.alefragnani.project-manager ext-nixpkgs = pkgs-ext.vscode-extensions;
# ext-vscode.alexisvt.flutter-snippets in
ext-vscode.christian-kohler.path-intellisense [
ext-vscode.codezombiech.gitignore 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-nixpkgs.continue.continue
# ext-vscode.dart-code.dart-code # ext-market.dart-code.dart-code
# ext-vscode.dart-code.flutter # ext-market.dart-code.flutter
ext-vscode.eamodio.gitlens ext-market.eamodio.gitlens
ext-vscode.enkia.tokyo-night ext-market.enkia.tokyo-night
# ext-vscode.felixangelov.bloc # ext-market.felixangelov.bloc
ext-vscode.fill-labs.dependi ext-market.fill-labs.dependi
ext-vscode.github.vscode-github-actions ext-market.github.vscode-github-actions
ext-vscode.github.vscode-pull-request-github ext-market.github.vscode-pull-request-github
ext-vscode.gruntfuggly.todo-tree ext-market.gruntfuggly.todo-tree
ext-vscode.irongeek.vscode-env ext-market.irongeek.vscode-env
ext-vscode.jebbs.plantuml ext-market.jebbs.plantuml
ext-vscode.jnoortheen.nix-ide ext-market.jnoortheen.nix-ide
# ext-vscode.lucax88x.codeacejumper # ext-market.lucax88x.codeacejumper
# ext-vscode.marcelovelasquez.flutter-tree # ext-market.marcelovelasquez.flutter-tree
ext-vscode.mhutchie.git-graph ext-market.mhutchie.git-graph
ext-vscode.mkhl.direnv ext-market.mkhl.direnv
ext-vscode.ms-azuretools.vscode-docker ext-market.ms-azuretools.vscode-docker
ext-nixpkgs.ms-python.python ext-nixpkgs.ms-python.python
ext-vscode.ms-python.isort ext-market.ms-python.isort
ext-vscode.ms-python.vscode-pylance ext-market.ms-python.vscode-pylance
ext-nixpkgs.ms-vscode.cpptools ext-nixpkgs.ms-vscode.cpptools
ext-vscode.ms-vscode.hexeditor ext-market.ms-vscode.hexeditor
ext-nixpkgs.ms-vscode-remote.remote-containers ext-nixpkgs.ms-vscode-remote.remote-containers
ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later ext-nixpkgs.ms-vscode-remote.remote-ssh # FIX later
ext-vscode.pkief.material-icon-theme ext-market.pkief.material-icon-theme
ext-vscode.streetsidesoftware.code-spell-checker ext-market.streetsidesoftware.code-spell-checker
ext-vscode.streetsidesoftware.code-spell-checker-russian ext-market.streetsidesoftware.code-spell-checker-russian
ext-vscode.ultram4rine.vscode-choosealicense ext-market.ultram4rine.vscode-choosealicense
ext-vscode.usernamehw.errorlens ext-market.usernamehw.errorlens
ext-vscode.yzhang.markdown-all-in-one ext-market.yzhang.markdown-all-in-one
# Rust # Rust
ext-vscode.jscearcy.rust-doc-viewer ext-market.jscearcy.rust-doc-viewer
ext-vscode.polypus74.trusty-rusty-snippets ext-market.polypus74.trusty-rusty-snippets
ext-nixpkgs.rust-lang.rust-analyzer ext-nixpkgs.rust-lang.rust-analyzer
ext-vscode.tamasfe.even-better-toml ext-market.tamasfe.even-better-toml
ext-vscode.vadimcn.vscode-lldb ext-market.vadimcn.vscode-lldb
# Golang # Golang
ext-vscode.golang.go ext-market.golang.go
# Zig # Zig
ext-vscode.ziglang.vscode-zig ext-market.ziglang.vscode-zig
]; ];
# mutableExtensionsDir = false; # mutableExtensionsDir = false;
userSettings = { userSettings = {
@ -139,7 +155,7 @@ in
"nix.serverSettings" = { "nix.serverSettings" = {
"nil" = { "nil" = {
"formatting" = { "formatting" = {
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"]; "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
}; };
# "nix" = { # "nix" = {
# "maxMemoryMB" = 4096; # "maxMemoryMB" = 4096;
@ -150,7 +166,7 @@ in
}; };
"nixd" = { "nixd" = {
"formatting" = { "formatting" = {
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"]; "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
}; };
# "options" = { # "options" = {
# "nixos" = { # "nixos" = {
@ -209,4 +225,5 @@ in
}; };
}; };
}; };
};
} }

View File

@ -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: { neatvnc = prev.neatvnc.overrideAttrs (oa: {
patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ]; patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ];
}); });

View File

@ -34,8 +34,8 @@ let
in { in {
virtualisation.oci-containers.containers.media-caddy = { virtualisation.oci-containers.containers.media-caddy = {
autoStart = true; autoStart = true;
# Tags: release-4938bf1, release-2.9.1, release # Tags: release-adcfd40, release-2.9.1, release
image = "ghcr.io/hotio/caddy@sha256:beabf74742cb6771e8f5bbd76d046bc06cb3fa59699ffb7712701a5cfa097cc1"; image = "ghcr.io/hotio/caddy@sha256:4be6d22747a07849808e134f53b82dbc39b9e520f077faff682423ddc75e4c8b";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -11,8 +11,8 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
# Tags: 0.22.1433, version-v0.22.1433, v0.22.1433-ls679 # Tags: 0.22.1730, version-v0.22.1730, v0.22.1730-ls727
image = "docker.io/linuxserver/jackett@sha256:26ac30423b9808e0716dcde7791841296beacd95e820cfbfc4d50666ea0d1fb8"; image = "docker.io/linuxserver/jackett@sha256:e05f37aca02259c8d558fc60510347bfec6f345dbb96032587c545ca90a71836";
volumes = [ volumes = [
"${nas-path}/configs/jackett:/config" "${nas-path}/configs/jackett:/config"
]; ];

View File

@ -11,8 +11,8 @@ let
in { in {
virtualisation.oci-containers.containers.jellyfin = { virtualisation.oci-containers.containers.jellyfin = {
autoStart = true; autoStart = true;
# Tags: 10.10.5, version-10.10.5ubu2404, 10.10.5ubu2404-ls52 # Tags: 10.10.6, version-10.10.6ubu2404, 10.10.6ubu2404-ls57
image = "docker.io/linuxserver/jellyfin@sha256:7cdcd4b6b60765290af7a2740960ce30c1f5548313ae60f7e23f6995ed4d147e"; image = "docker.io/linuxserver/jellyfin@sha256:3ade631e7085ce6d8ce4b477191152ab51316f0293f23be7531508324cae7b37";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -10,8 +10,8 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
# Tags: 2.9.6, version-2.9.6.4552, 2.9.6.4552-ls30 # Tags: 2.10.3, version-2.10.3.4602, 2.10.3.4602-ls36
image = "docker.io/linuxserver/lidarr@sha256:c3aae1e32f7e2b76c6aa0e546a16f3feb570455882a5c9d51c8aec9e53328d66"; image = "docker.io/linuxserver/lidarr@sha256:4c3d6942aa0ae3a7da5a4d6a59ee96e43777d834b4234f539bbb5d10a2db2900";
volumes = [ volumes = [
"${nas-path}/configs/lidarr/config:/config" "${nas-path}/configs/lidarr/config:/config"
"${nas-path}/configs/lidarr/custom-services.d:/custom-services.d" "${nas-path}/configs/lidarr/custom-services.d:/custom-services.d"

View File

@ -4,8 +4,8 @@ let
in { in {
virtualisation.oci-containers.containers.medusa = { virtualisation.oci-containers.containers.medusa = {
autoStart = true; autoStart = true;
# Tags: 1.0.22, version-v1.0.22, v1.0.22-ls211 # Tags: 1.0.22, version-v1.0.22, v1.0.22-ls216
image = "docker.io/linuxserver/medusa@sha256:397636cc7e421ee284d4fb8d9b07874ce41155b419b3e8419dce389fcdb465a7"; image = "docker.io/linuxserver/medusa@sha256:78fa244f473e5e791d1c01db61300e33dd5ebc9ab9def206b53bc2621d212f71";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -7,8 +7,8 @@ let
in { in {
virtualisation.oci-containers.containers.qbittorrent = { virtualisation.oci-containers.containers.qbittorrent = {
autoStart = true; autoStart = true;
# Tags: 5.0.3, version-5.0.3-r0, 5.0.3-r0-ls380 # Tags: 5.0.4, version-5.0.4-r0, 5.0.4-r0-ls387
image = "docker.io/linuxserver/qbittorrent@sha256:308d768672fb9e86e800a73504c439176aabe5977bcdf8b99f7561bb603d9b6e"; image = "docker.io/linuxserver/qbittorrent@sha256:dc9e13d2edab18cc7c42367526182b2798f9f0f4c590559337f954fb4e3bdc35";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -11,8 +11,8 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
# Tags: 4.0.13, version-4.0.13.2932, 4.0.13.2932-ls271 # Tags: 4.0.14, version-4.0.14.2939, 4.0.14.2939-ls277
image = "docker.io/linuxserver/sonarr@sha256:28d9dcbc846aed74bd47dc90305e016183443ddc3dfa3e8bcac268fc653a6e5e"; image = "docker.io/linuxserver/sonarr@sha256:7342ef32dd9cd6d13638765cfb8034edd4c80b0584f427159fd7f5ddeef5399d";
volumes = [ volumes = [
"${nas-path}/configs/sonarr:/config" "${nas-path}/configs/sonarr:/config"
"${nas-path}:/data" "${nas-path}:/data"

View File

@ -3,8 +3,8 @@
in { in {
virtualisation.oci-containers.containers.spdf = { virtualisation.oci-containers.containers.spdf = {
autoStart = true; autoStart = true;
# Tags: latest-fat, 0.41.0-fat # Tags: latest-fat, 0.45.0-fat
image = "docker.io/stirlingtools/stirling-pdf@sha256:e791d48580806f6dade7c9774b7137d40ebbf1f35b86c592877d32eae2cbf0ad"; image = "docker.io/stirlingtools/stirling-pdf@sha256:d3e0d26655d48970d5aa414ce57c5f91c59e3a7ed485729654aa142460151d14";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -31,6 +31,38 @@
catppuccin.zsh-syntax-highlighting.enable = true; catppuccin.zsh-syntax-highlighting.enable = true;
programs.zsh.syntaxHighlighting.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 = '' wayland.windowManager.hyprland.extraConfig = ''
exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize} exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize}
''; '';

View File

@ -25,7 +25,6 @@
(import ./gitea.nix { inherit cfg; gitea = "gitea"; }) (import ./gitea.nix { inherit cfg; gitea = "gitea"; })
# Deprecated on catppuccin-nix # Deprecated on catppuccin-nix
(import ./gtk.nix { inherit cfg; }) (import ./gtk.nix { inherit cfg; })
(import ./vscode.nix { inherit cfg; })
]; ];
home-manager.users.${config.mainuser} = { home-manager.users.${config.mainuser} = {

View File

@ -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}";
};
};
};
}

View File

@ -251,31 +251,34 @@ in {
bind=${modifier}ALT,g,movetoworkspace,name:Games bind=${modifier}ALT,g,movetoworkspace,name:Games
bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers
'' '' '' ''
windowrulev2=workspace name:Email silent,class:^(geary)$ windowrule=workspace name:Email silent,class:^(geary)$
windowrulev2=workspace name:Steam silent,class:^(steam)$ windowrule=workspace name:Steam silent,class:^(steam)$
windowrulev2=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam) windowrule=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
windowrulev2=workspace name:Music silent,title:^(Spotify)$ windowrule=workspace name:Music silent,title:^(Spotify)$
windowrulev2=tile,title:^(Spotify)$ windowrule=tile,title:^(Spotify)$
windowrulev2=workspace name:Messengers silent,class:^(org.telegram.desktop)$ windowrule=workspace name:Messengers silent,class:^(org.telegram.desktop)$
windowrule=opaque,firefox windowrule=opaque,class:^(firefox)$
windowrule=opaque,chromium-browser windowrule=opaque,class:^(Chromium-browser)$
windowrule=opaque,mpv windowrule=opaque,class:^(mpv)$
windowrule=float,Waydroid windowrule=float,class:^(Waydroid)$
windowrule=size 1600 900,Waydroid windowrule=size 1600 900,class:^(Waydroid)$
windowrule=center,Waydroid windowrule=center,class:^(Waydroid)$
windowrule=opaque,Waydroid windowrule=opaque,class:^(Waydroid)$
windowrule=opaque,qemu windowrule=opaque,class:.*(qemu).*
windowrule=opaque,steam_app.* windowrule=opaque,class:^(steam)$
windowrule=float,steam_app.* windowrule=float,class:^(steam)$
windowrule=opaque,virt-manager windowrule=opaque,class:^(gamescope)$
windowrulev2=opaque,class:^(.*winbox64.exe)$ windowrule=float,class:^(gamescope)$
windowrulev2=tile,class:^(.*winbox64.exe)$
windowrulev2=opaque,class:^(starrail.exe)$
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=GDK_BACKEND=wayland,x11
env=QT_QPA_PLATFORM=wayland;xcb env=QT_QPA_PLATFORM=wayland;xcb

File diff suppressed because one or more lines are too long