AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: AtaraxiaDev:37317f42ba90fe8135d361eab5a78dffae87bd88
Branches Tags
AtaraxiaDev:master
AtaraxiaDev:dev-v2
...
compare: AtaraxiaDev:2968e708f2e1e7179a7350f106b22e77e676a719
Branches Tags
AtaraxiaDev:master
AtaraxiaDev:dev-v2

10 Commits
37317f42ba ... 2968e708f2

Author SHA1 Message Date
Dmitriy Kholkin
2968e708f2
wip system-wide catppuccin theme 2024-06-18 04:49:58 +03:00
Dmitriy Kholkin
6946b97ae1
change jdks in prismlauncher 2024-06-17 19:50:34 +03:00
Dmitriy Kholkin
84ebca8799
add matrix domain to hosts 2024-06-17 19:49:33 +03:00
Dmitriy Kholkin
ae1634d666
fix zen0kernels.patch 2024-06-17 19:49:15 +03:00
Dmitriy Kholkin
e11b278cf9
update stateVersion 2024-06-17 19:48:55 +03:00
Dmitriy Kholkin
fcd0d05ec8
test ollama 2024-06-17 19:47:18 +03:00
Dmitriy Kholkin
44ad4af238
update flake, add cattpucin 2024-06-17 19:46:51 +03:00
Dmitriy Kholkin
dac83ec981
add packwiz to amd-workstation 2024-06-11 01:48:09 +03:00
Dmitriy Kholkin
c22c0a64d8
change ocis pkg name 2024-06-11 01:47:51 +03:00
Dmitriy Kholkin
76c5026ae3
update stable nixpkgs and my nur 2024-06-11 01:47:38 +03:00
25 changed files with 746 additions and 499 deletions
Show Stats Expand all files Collapse all files

383
flake.lock generated
View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1716664326,
"narHash": "sha256-L7MeDg9Q6Si2Rwxe++BoNdldX9Os/DzqoqGDJod0qyk=",
"lastModified": 1717970544,
"narHash": "sha256-YX43aaegfqjXaZ3S+z0JI7SKOEE1Afqm/I9FBIezJ7A=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "347a50c615c45b3c89c41e774736861b7b41cf71",
"rev": "85c380e4e80fbc21d25165626ad2897cbb11af4d",
"type": "github"
},
"original": {
@ -24,11 +24,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1707077370,
"narHash": "sha256-624Giuo1TfeXQGzcGK9ETW86esNFhFZ5a46DCjT6K5I=",
"lastModified": 1717796213,
"narHash": "sha256-Ex+eSb7tZ428MMJDIF/nqUOtnzjqEIPNaDXJPm9FvuY=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "33a84b608c8a1f871c6ce9c4d2b932dc57078fae",
"rev": "47cbf5b9740ef59ed866874346d3fee3379f8da3",
"type": "github"
},
"original": {
@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716711734,
"narHash": "sha256-ctxQELje8CILFNhWdlT9CSFpfh+uq8P3Sn+NRgn/vbA=",
"lastModified": 1718525922,
"narHash": "sha256-hBXj+7nqwTQt1yMyy7SQhGlOTBII63rESvLE2kTI92M=",
"owner": "AtaraxiaSjel",
"repo": "nur",
"rev": "79e75b98b551d5ee2b38aeafe50e3b40ef75899c",
"rev": "dc3604665992f4cb4f96d3729d5775d1af895207",
"type": "github"
},
"original": {
@ -162,6 +162,39 @@
"type": "github"
}
},
"catppuccin": {
"locked": {
"lastModified": 1718339789,
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
"owner": "catppuccin",
"repo": "nix",
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"catppuccin-vsc": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1716179347,
"narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=",
"owner": "catppuccin",
"repo": "vscode",
"rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "vscode",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
@ -186,15 +219,15 @@
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"utils": "utils"
},
"locked": {
"lastModified": 1715699772,
"narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
"lastModified": 1718194053,
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
"type": "github"
},
"original": {
@ -208,15 +241,15 @@
"cachix": "cachix",
"flake-compat": "flake-compat_5",
"nix": "nix_2",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1717245169,
"narHash": "sha256-+mW3rTBjGU8p1THJN0lX/Dd/8FbnF+3dB+mJuSaxewE=",
"lastModified": 1718297307,
"narHash": "sha256-itCqNMgHdfhL7z+7viDaiSyb1sJ36xKRPpZGoYKMVAc=",
"owner": "cachix",
"repo": "devenv",
"rev": "c3f9f053c077c6f88a3de5276d9178c62baa3fc3",
"rev": "24b3e5dd32e85ab6bd234ff3eed1fc3670bea583",
"type": "github"
},
"original": {
@ -233,7 +266,7 @@
"flake-compat"
],
"nix": "nix",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"poetry2nix": "poetry2nix",
"pre-commit-hooks": [
"devenv",
@ -263,11 +296,11 @@
]
},
"locked": {
"lastModified": 1717177033,
"narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
"lastModified": 1718242063,
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
"owner": "nix-community",
"repo": "disko",
"rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
"type": "github"
},
"original": {
@ -427,11 +460,11 @@
]
},
"locked": {
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@ -466,11 +499,11 @@
]
},
"locked": {
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@ -482,11 +515,11 @@
"flake-registry": {
"flake": false,
"locked": {
"lastModified": 1705308826,
"narHash": "sha256-Z3xTYZ9EcRIqZAufZbci912MUKB0sD+qxi/KTGMFVwY=",
"lastModified": 1717415742,
"narHash": "sha256-HKvoLGZUsBpjkxWkdtctGYj6RH0bl6vcw0OjTOqyzJk=",
"owner": "nixos",
"repo": "flake-registry",
"rev": "9c69f7bd2363e71fe5cd7f608113290c7614dcdd",
"rev": "895a65f8d5acf848136ee8fe8e8f736f0d27df96",
"type": "github"
},
"original": {
@ -547,24 +580,6 @@
"type": "github"
}
},
"flake-utils_10": {
"inputs": {
"systems": "systems_11"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
@ -690,11 +705,11 @@
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -754,11 +769,11 @@
]
},
"locked": {
"lastModified": 1717097707,
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"type": "github"
},
"original": {
@ -783,11 +798,11 @@
]
},
"locked": {
"lastModified": 1716576411,
"narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
"lastModified": 1717181720,
"narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
"rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"type": "github"
},
"original": {
@ -800,6 +815,7 @@
"inputs": {
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"nixpkgs"
@ -808,11 +824,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1717267530,
"narHash": "sha256-sD1AS7l+V4FoWN3TZ6aZ9a0/lkCdG3rwBH4pP1yMpds=",
"lastModified": 1718313803,
"narHash": "sha256-OpXugBH3tF9Jc3Vt0gnqhdQvlNmte7Km1SmyIDo1G3Y=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "0ebb43c1a37e7321e5ed7223ea85ed555cc82735",
"rev": "8055b1c00a102f5419e40f5eddfb6ee8be693f33",
"type": "github"
},
"original": {
@ -850,6 +866,10 @@
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
@ -860,11 +880,11 @@
]
},
"locked": {
"lastModified": 1716473782,
"narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
"lastModified": 1717881852,
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "87d5d984109c839482b88b4795db073eb9ed446f",
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
"type": "github"
},
"original": {
@ -875,7 +895,7 @@
},
"hyprlang_2": {
"inputs": {
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_8",
"systems": "systems_6"
},
"locked": {
@ -901,11 +921,11 @@
"systems": "systems_7"
},
"locked": {
"lastModified": 1716658811,
"narHash": "sha256-tJ/roE0BqzO2Sn73fF+50RpYYrRS5hDCHI8BmiuPMjA=",
"lastModified": 1717919427,
"narHash": "sha256-50HWM67p81v+dhvcOS0UFQiPGh8McUHs40UGqkz6s9I=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "2c57525de840e4edada2cfd2924659b80f513ece",
"rev": "f4abf5902f3f0c51d2aab8a521f7c1b1b08afd64",
"type": "github"
},
"original": {
@ -914,6 +934,31 @@
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1717881334,
"narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
@ -926,11 +971,11 @@
]
},
"locked": {
"lastModified": 1716058375,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
"lastModified": 1717784906,
"narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
"rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"type": "github"
},
"original": {
@ -941,11 +986,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1708968331,
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
"lastModified": 1717932370,
"narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
"rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
"type": "github"
},
"original": {
@ -991,7 +1036,7 @@
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_6",
"nix": "nix_3",
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1669478601,
@ -1060,15 +1105,15 @@
"nix-direnv": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_11",
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1716957285,
"narHash": "sha256-lbmFJ1NKz7XhCXNv8PCZiTtagSEL2EYWjxLnSqq4QDI=",
"lastModified": 1717994481,
"narHash": "sha256-sm2Dd21dT0g7akjySmMN0X3jT0/vN0wvBEjcJE/HzwU=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "1223f170d83efbe3a6f494f073b1d6b2d3dbae94",
"rev": "40db0380eb86cf8479ce8eef63b68b47c77e66c5",
"type": "github"
},
"original": {
@ -1140,7 +1185,7 @@
},
"nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1715483403,
@ -1165,11 +1210,11 @@
]
},
"locked": {
"lastModified": 1717205309,
"narHash": "sha256-FxtY2Y9S/s759GWMT4L7w81hiklTt3no/+jOfiwxAZQ=",
"lastModified": 1718328588,
"narHash": "sha256-dTuHdsZkPJg2YS7S/04d5gLpLqCmKEGuJkRO0yHklgo=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "af34bb2d85bef3d2a27c9044a2d4cc1231d0bc2e",
"rev": "ae25cb00075c72a2a91497814a11a00f567f5f75",
"type": "github"
},
"original": {
@ -1208,7 +1253,7 @@
"nix_3": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_9",
"nixpkgs-regression": "nixpkgs-regression_3"
},
"locked": {
@ -1248,11 +1293,11 @@
]
},
"locked": {
"lastModified": 1716210724,
"narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=",
"lastModified": 1718025593,
"narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94",
"rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
"type": "github"
},
"original": {
@ -1263,11 +1308,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
@ -1291,11 +1336,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1717287887,
"narHash": "sha256-Ma53Y67am2NfsUe1XPK+3tsADSLKn8GnLrwHxsEs9QI=",
"lastModified": 1718334394,
"narHash": "sha256-eDQUMwMfrv/vxSCcgPL4THGG9k5rRy2k2U9cNJk9nzE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b1afe5bcf29143f35d7c796e6cbfcc31fd39eb70",
"rev": "8dbf10c3c93d97ac91bdfe248b5cd7173481c5b6",
"type": "github"
},
"original": {
@ -1387,27 +1432,27 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1716991068,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1716655032,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
@ -1418,6 +1463,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1669378442,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@ -1433,13 +1494,13 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1716715802,
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
"lastModified": 1717868076,
"narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
"type": "github"
},
"original": {
@ -1449,13 +1510,13 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"lastModified": 1718160348,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
"type": "github"
},
"original": {
@ -1465,13 +1526,13 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_14": {
"locked": {
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
"lastModified": 1717112898,
"narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
"rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
"type": "github"
},
"original": {
@ -1514,6 +1575,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1702272962,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
@ -1529,7 +1606,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1692808169,
"narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
@ -1545,7 +1622,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1713361204,
"narHash": "sha256-TA6EDunWTkc5FvDCqU3W2T3SFn0gRZqh6D/hJnM02MM=",
@ -1561,7 +1638,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
@ -1577,7 +1654,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
@ -1593,22 +1670,6 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1669378442,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_3",
@ -1668,7 +1729,6 @@
"prismlauncher",
"flake-compat"
],
"flake-utils": "flake-utils_9",
"gitignore": "gitignore_2",
"nixpkgs": [
"prismlauncher",
@ -1680,11 +1740,11 @@
]
},
"locked": {
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2849da033884f54822af194400f8dff435ada242",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
@ -1698,15 +1758,15 @@
"flake-compat": "flake-compat_9",
"flake-parts": "flake-parts_3",
"libnbtplusplus": "libnbtplusplus",
"nixpkgs": "nixpkgs_13",
"nixpkgs": "nixpkgs_14",
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1716002051,
"narHash": "sha256-7GbTSJ2uMuXjghX83lEzUbbDEwiZFsCnwsqYq1bl0ds=",
"lastModified": 1717816313,
"narHash": "sha256-GCNM9mlbHML1uISUuZquyPbrPfvHT+ZBM+M1u4H5JfM=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "19c85a42f3d2f83348ffbda6e2df7c1fc9c9c409",
"rev": "6b48bb6b93f5fdbd2a96fa07f29f5da9f7a3c4f0",
"type": "github"
},
"original": {
@ -1725,6 +1785,8 @@
"base16": "base16",
"base16-tokyonight-scheme": "base16-tokyonight-scheme",
"cassowary": "cassowary",
"catppuccin": "catppuccin",
"catppuccin-vsc": "catppuccin-vsc",
"deploy-rs": "deploy-rs",
"devenv": "devenv",
"disko": "disko",
@ -1740,7 +1802,7 @@
"nix-fast-build": "nix-fast-build",
"nix-vscode-marketplace": "nix-vscode-marketplace",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_13",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_3",
"prismlauncher": "prismlauncher",
@ -1752,11 +1814,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1717214600,
"narHash": "sha256-6cL574j1SSL9At2oZwGarAv9FcwphI9Pd8im+uQ5/bE=",
"lastModified": 1718251401,
"narHash": "sha256-enzmGqA0Cjwoh3ptVvbFh+ZUxwavM0awYJPK/KnLH3E=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "4118c12978f50c094d2e40146d2b1524012a6dd5",
"rev": "89accb69b1fd641dbafba9619a30b50af318820b",
"type": "gitlab"
},
"original": {
@ -1773,11 +1835,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1716692524,
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
"lastModified": 1718137936,
"narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "962797a8d7f15ed7033031731d0bb77244839960",
"rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
"type": "github"
},
"original": {
@ -1816,21 +1878,6 @@
"type": "github"
}
},
"systems_11": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
@ -1959,11 +2006,11 @@
]
},
"locked": {
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"lastModified": 1717850719,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
"type": "github"
},
"original": {
@ -2013,7 +2060,7 @@
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_9",
"nixpkgs": [
"nixpkgs"
]
@ -2049,11 +2096,11 @@
]
},
"locked": {
"lastModified": 1716290197,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"lastModified": 1717918856,
"narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"rev": "72907822c19afc0983c69d59d299204381623725",
"type": "github"
},
"original": {

4
flake.nix
View File

@ -5,7 +5,7 @@
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
flake-registry = {
url = "github:nixos/flake-registry";
flake = false;
@ -35,6 +35,8 @@
url = "github:AtaraxiaSjel/cassowary";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
catppuccin-vsc.url = "github:catppuccin/vscode";
deploy-rs.url = "github:serokell/deploy-rs";
devenv.url = "github:cachix/devenv";
disko = {

39
machines/AMD-Workstation/default.nix
View File

@ -109,21 +109,56 @@
pkgs.nix-fast-build
pkgs.mitmproxy
pkgs.exercism
pkgs.packwiz
];
xdg.configFile."distrobox/distrobox.conf".text = ''
container_always_pull="1"
container_manager="podman"
'';
home.stateVersion = "23.05";
home.stateVersion = "24.05";
};
persist.state.homeDirectories = [
services.ollama = {
enable = true;
host = "127.0.0.1";
port = 11434;
acceleration = "rocm";
openFirewall = false;
environmentVariables = {
HSA_OVERRIDE_GFX_VERSION = "10.3.0";
OLLAMA_KEEP_ALIVE = "-1";
# OLLAMA_LLM_LIBRARY = "";
};
};
services.open-webui = {
enable = true;
host = "127.0.0.1";
port = 8081;
openFirewall = false;
environment = {
ANONYMIZED_TELEMETRY = "False";
DO_NOT_TRACK = "True";
SCARF_NO_ANALYTICS = "True";
OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
# Disable authentication
WEBUI_AUTH = "False";
};
};
persist.state = {
directories = [
"/var/lib/ollama"
"/var/lib/open-webui"
];
homeDirectories = [
".local/share/winbox"
".local/share/PrismLauncher"
".local/share/distrobox"
".mitmproxy"
".config/exercism"
".llama"
];
};
system.stateVersion = "23.05";
}

2
machines/Dell-Laptop/default.nix
View File

@ -47,7 +47,7 @@
pkgs.moonlight-qt
];
home.stateVersion = "23.05";
home.stateVersion = "24.05";
};
system.stateVersion = "23.05";
}

5
machines/Home-Hypervisor/default.nix
View File

@ -151,6 +151,7 @@ in {
127.0.0.1 s3.ataraxiadev.com
127.0.0.1 wg.ataraxiadev.com
127.0.0.1 vault.ataraxiadev.com
127.0.0.1 matrix.ataraxiadev.com
'';
nix.optimise.automatic = false;
@ -186,7 +187,7 @@ in {
smartmontools
];
xdg.mime.enable = false;
home.stateVersion = "22.11";
home.stateVersion = "24.05";
};
system.stateVersion = "22.11";
system.stateVersion = "24.05";
}

25
patches/zen-kernels.patch
View File

@ -0,0 +1,25 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 072416007e72..89c776e611e5 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "6.9.3"; #zen
+ version = "6.9.2"; #zen
suffix = "zen1"; #zen
- sha256 = "0vgy249zrzm6kn8wqisnbgbq8h6sffmk1zs6cx57annab9w0sb57"; #zen
+ sha256 = "1fsmpryk7an6xqppvilcf3bmxs41mqpc3v4f4c81jgrikg21gxbb"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.9.3"; #lqx
+ version = "6.8.11"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "1wfjw5fq7myvhfb6srina0b7b76a08ib9x8hd8bdfr4zr6al8zq8"; #lqx
+ sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

43
profiles/applications/home-apps.nix Normal file
View File

@ -0,0 +1,43 @@
{ config, pkgs, lib, ... }: {
# TODO: settings?
home-manager.users.${config.mainuser} = {
programs = {
bat = {
enable = true;
# config = {};
extraPackages = with pkgs.bat-extras; [ batdiff batgrep batman batwatch ];
# syntaxes = {};
# themes = {};
};
fzf.enable = true;
fzf.enableZshIntegration = true;
gitui = {
enable = true;
# keyConfig = '''';
};
micro = {
enable = true;
# settings = {};
};
zathura = {
enable = true;
extraConfig = ''
set selection-clipboard clipboard
'';
# mappings = {};
# options = {};
};
zsh.syntaxHighlighting.enable = true;
};
};
defaultApplications = {
pdf = let
home = config.home-manager.users.${config.mainuser};
zathura-pkg = home.programs.zathura.package;
in {
cmd = lib.getExe zathura-pkg;
desktop = "zathura";
};
};
}

75
profiles/applications/kitty.nix
View File

@ -10,43 +10,46 @@ in
home-manager.users.${config.mainuser} = {
programs.kitty = {
enable = true;
font.name = "${thm.fonts.mono.family} ${thm.fontSizes.small.str}";
# font.package = ;
font.name = thm.fonts.mono.family;
font.size = thm.fontSizes.small.int;
shellIntegration.enableZshIntegration = true;
settings = {
foreground = "#${thm.base05-hex}";
background = "#${thm.base00-hex}";
selection_background = "#${thm.base05-hex}";
selection_foreground = "#${thm.base00-hex}";
url_color = "#${thm.base04-hex}";
active_border_color = "#${thm.base03-hex}";
inactive_border_color = "#${thm.base01-hex}";
active_tab_background = "#${thm.base00-hex}";
active_tab_foreground = "#${thm.base05-hex}";
inactive_tab_background = "#${thm.base01-hex}";
inactive_tab_foreground = "#${thm.base04-hex}";
tab_bar_background = "#${thm.base01-hex}";
cursor = "#${thm.base05-hex}";
color0 = "#${thm.base00-hex}";
color1 = "#${thm.base08-hex}";
color2 = "#${thm.base0B-hex}";
color3 = "#${thm.base0A-hex}";
color4 = "#${thm.base0D-hex}";
color5 = "#${thm.base0E-hex}";
color6 = "#${thm.base0C-hex}";
color7 = "#${thm.base05-hex}";
color8 = "#${thm.base03-hex}";
color9 = "#${thm.base08-hex}";
color10 = "#${thm.base0B-hex}";
color11 = "#${thm.base0A-hex}";
color12 = "#${thm.base0D-hex}";
color13 = "#${thm.base0E-hex}";
color14 = "#${thm.base0C-hex}";
color15 = "#${thm.base07-hex}";
color16 = "#${thm.base09-hex}";
color17 = "#${thm.base0F-hex}";
color18 = "#${thm.base01-hex}";
color19 = "#${thm.base02-hex}";
color20 = "#${thm.base04-hex}";
color21 = "#${thm.base06-hex}";
# foreground = "#${thm.base05-hex}";
# background = "#${thm.base00-hex}";
# selection_background = "#${thm.base05-hex}";
# selection_foreground = "#${thm.base00-hex}";
# url_color = "#${thm.base04-hex}";
# active_border_color = "#${thm.base03-hex}";
# inactive_border_color = "#${thm.base01-hex}";
# active_tab_background = "#${thm.base00-hex}";
# active_tab_foreground = "#${thm.base05-hex}";
# inactive_tab_background = "#${thm.base01-hex}";
# inactive_tab_foreground = "#${thm.base04-hex}";
# tab_bar_background = "#${thm.base01-hex}";
# cursor = "#${thm.base05-hex}";
# color0 = "#${thm.base00-hex}";
# color1 = "#${thm.base08-hex}";
# color2 = "#${thm.base0B-hex}";
# color3 = "#${thm.base0A-hex}";
# color4 = "#${thm.base0D-hex}";
# color5 = "#${thm.base0E-hex}";
# color6 = "#${thm.base0C-hex}";
# color7 = "#${thm.base05-hex}";
# color8 = "#${thm.base03-hex}";
# color9 = "#${thm.base08-hex}";
# color10 = "#${thm.base0B-hex}";
# color11 = "#${thm.base0A-hex}";
# color12 = "#${thm.base0D-hex}";
# color13 = "#${thm.base0E-hex}";
# color14 = "#${thm.base0C-hex}";
# color15 = "#${thm.base07-hex}";
# color16 = "#${thm.base09-hex}";
# color17 = "#${thm.base0F-hex}";
# color18 = "#${thm.base01-hex}";
# color19 = "#${thm.base02-hex}";
# color20 = "#${thm.base04-hex}";
# color21 = "#${thm.base06-hex}";
enable_audio_bell = false;
confirm_os_window_close = 0;
};

8
profiles/workspace/mako.nix → profiles/applications/mako.nix
View File

@ -19,10 +19,10 @@
height = 80;
defaultTimeout = 10000;
maxVisible = 10;
backgroundColor = "#${theme.base00-hex}AA";
textColor = "#${theme.base05-hex}";
borderColor = "#${theme.base0D-hex}AA";
progressColor = "over #${theme.base0B-hex}";
# backgroundColor = "#${theme.base00-hex}AA";
# textColor = "#${theme.base05-hex}";
# borderColor = "#${theme.base0D-hex}AA";
# progressColor = "over #${theme.base0B-hex}";
iconPath = "${theme.iconPackage}/share/icons/${theme.iconTheme}";
maxIconSize = 24;
};

6
profiles/applications/packages.nix
View File

@ -5,7 +5,7 @@ with config.deviceSpecific; {
home-manager.users.${config.mainuser} = {
home.packages = with pkgs; [
# --- cli ---
bat
# bat
comma
curl
curlie
@ -32,8 +32,8 @@ with config.deviceSpecific; {
usbutils
zip
# --- tui ---
bottom
micro
# bottom
# micro
ncdu
procs
# --- gui ---

2
profiles/applications/rofi.nix
View File

@ -15,7 +15,7 @@ in
package = pkgs.rofi-wayland;
font = "${thm.fonts.mono.family} ${thm.fontSizes.header.str}";
terminal = config.defaultApplications.term.cmd;
theme = "${themeFile}";
# theme = "${themeFile}";
};
};
}

23
profiles/applications/zathura.nix
View File

@ -1,23 +0,0 @@
{ config, lib, ... }:
let
home = config.home-manager.users.${config.mainuser};
zathura-pkg = home.programs.zathura.package;
in{
defaultApplications = {
pdf = {
cmd = lib.getExe zathura-pkg;
desktop = "zathura";
};
};
home-manager.users.${config.mainuser} = {
programs.zathura = {
enable = true;
extraConfig = ''
set selection-clipboard clipboard
'';
# mappings = {};
# options = {};
};
};
}

4
profiles/overlay.nix
View File

@ -29,7 +29,9 @@ with lib; {
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default;
prismlauncher = inputs.prismlauncher.packages.${system}.prismlauncher.override {
jdks = [ pkgs.temurin-bin ];
};
xray = master.xray;
youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
yt-dlp = master.yt-dlp;

2
profiles/servers/ocis.nix
View File

@ -11,7 +11,7 @@
services.ocis = {
enable = true;
package = pkgs.ocis-next-bin;
package = pkgs.ocis-bin;
configDir = "/var/lib/ocis/config";
baseDataPath = "/var/lib/ocis/data";
settings = {

2
profiles/servers/tinyproxy.nix
View File

@ -28,7 +28,7 @@
rejectPackets = false;
};
};
system.stateVersion = "22.11";
system.stateVersion = "24.11";
};
};
}

2
profiles/themes.nix
View File

@ -66,7 +66,7 @@
cursorPackage = pkgs.bibata-cursors-tokyonight;
# cursorPackage = pkgs.bibata-cursors;
cursorSize = 16;
cursorSize = 24;
cursorTheme = "Bibata-Modern-TokyoNight";
};
};

123
profiles/workspace/catppuccin.nix Normal file
View File

@ -0,0 +1,123 @@
{ config, pkgs, lib, inputs, ... }:
let
thm = config.lib.base16.theme;
# this capitalizes the first letter in a string.
mkUpper =
str:
(lib.toUpper (builtins.substring 0 1 str)) +
(builtins.substring 1 (builtins.stringLength str) str);
accent = config.home-manager.users.${config.mainuser}.catppuccin.accent;
flavor = config.home-manager.users.${config.mainuser}.catppuccin.flavor;
size = "standard"; # "standard" "compact"
tweaks = [ "normal" ]; # "black" "rimless" "normal"
flavorUpper = mkUpper flavor;
accentUpper = mkUpper accent;
sizeUpper = mkUpper size;
gtkTheme = if flavor == "latte" then "Light" else "Dark";
in
{
home-manager.users.${config.mainuser} = rec {
imports = [ inputs.catppuccin.homeManagerModules.catppuccin ];
qt.style.catppuccin.enable = true;
qt.style.catppuccin.apply = true;
services.mako.catppuccin.enable = true;
programs = {
bat.catppuccin.enable = true;
bottom.enable = true;
bottom.catppuccin.enable = true;
fzf.catppuccin.enable = true;
gitui.catppuccin.enable = true;
glamour.catppuccin.enable = true;
kitty.catppuccin.enable = true;
micro.catppuccin.enable = true;
mpv.catppuccin.enable = true;
rofi.catppuccin.enable = true;
zathura.catppuccin.enable = true;
zsh.syntaxHighlighting.enable = true;
zsh.syntaxHighlighting.catppuccin.enable = true;
waybar.catppuccin.enable = true;
waybar.catppuccin.mode = "createLink";
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 = 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 = {
"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 ${flavorUpper}";
"workbench.iconTheme" = lib.mkForce "catppuccin-${flavor}";
};
};
};
wayland.windowManager.hyprland.extraConfig = ''
exec-once=hyprctl setcursor catppuccin-${flavor}-${accent}-cursors ${toString thm.cursorSize}
'';
# GTK
gtk = {
enable = true;
theme = {
name = "Catppuccin-${flavorUpper}-${sizeUpper}-${accentUpper}-${gtkTheme}";
package = pkgs.catppuccin-gtk.override {
inherit tweaks;
accents = [ accent ];
variant = flavor;
};
};
cursorTheme = {
name = "catppuccin-${flavor}-${accent}-cursors";
package = pkgs.catppuccin-cursors.${flavor + accentUpper};
};
iconTheme = {
name = "Papirus-${gtkTheme}";
package = pkgs.catppuccin-papirus-folders.override { inherit accent flavor; };
};
font = {
name = "${thm.fonts.main.family}";
size = thm.fontSizes.normal.int;
};
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = 1;
};
gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1;
};
};
home.sessionVariables.GTK_THEME = gtk.theme.name;
};
themes.base16.extraParams = {
iconTheme = lib.mkForce "Papirus-${gtkTheme}";
iconPackage = lib.mkForce (pkgs.catppuccin-papirus-folders.override { inherit accent flavor; });
cursorPackage = lib.mkForce (pkgs.catppuccin-cursors.${flavor + accentUpper});
cursorTheme = lib.mkForce "catppuccin-${flavor}-${accent}-cursors";
cursorSize = lib.mkForce 24;
};
}

2
profiles/workspace/cursor.nix
View File

@ -9,7 +9,7 @@ in {
home-manager.users.${config.mainuser} = {
home.pointerCursor = {
package = thm.cursorPackage;
name = "Bibata-Modern-TokyoNight";
name = thm.cursorTheme;
size = thm.cursorSize;
gtk.enable = true;
x11.enable = true;

70
profiles/workspace/gtk.nix
View File

@ -1,69 +1,9 @@
{ pkgs, config, inputs, ... }:
let
thm = config.lib.base16.theme;
in {
nixpkgs.overlays = [
(_self: _super: {
generated-gtk-theme =
pkgs.callPackage "${inputs.rycee}/pkgs/materia-theme" {
configBase16 = {
name = "Generated";
kind = "dark";
colors = {
base00.hex.rgb = "${thm.base00-hex}";
base01.hex.rgb = "${thm.base01-hex}";
base02.hex.rgb = "${thm.base02-hex}";
base03.hex.rgb = "${thm.base03-hex}";
base04.hex.rgb = "${thm.base04-hex}";
base05.hex.rgb = "${thm.base05-hex}";
base06.hex.rgb = "${thm.base06-hex}";
base07.hex.rgb = "${thm.base07-hex}";
base08.hex.rgb = "${thm.base08-hex}";
base09.hex.rgb = "${thm.base09-hex}";
base0A.hex.rgb = "${thm.base0A-hex}";
base0B.hex.rgb = "${thm.base0B-hex}";
base0C.hex.rgb = "${thm.base0C-hex}";
base0D.hex.rgb = "${thm.base0D-hex}";
base0E.hex.rgb = "${thm.base0E-hex}";
base0F.hex.rgb = "${thm.base0F-hex}";
};
};
};
})
];
{ pkgs, config, lib, ... }:
{
gtk.iconCache.enable = true;
programs.dconf.enable = true;
services.dbus.packages = with pkgs; [ dconf gcr ];
home-manager.users.${config.mainuser} = {
gtk = {
enable = true;
iconTheme = {
name = "${thm.iconTheme}";
package = thm.iconPackage;
};
# theme = {
# name = "Generated";
# package = pkgs.generated-gtk-theme;
# };
theme = {
name = "RosePine-Main-BL";
package = pkgs.rosepine-gtk-theme;
};
font = {
name = "${thm.fonts.main.family}";
size = thm.fontSizes.normal.int;
};
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = 1;
};
gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1;
};
};
# home.sessionVariables.GTK_THEME = "Generated";
home.sessionVariables.GTK_THEME = "RosePine-Main-BL";
};
persist.state.homeDirectories = [
".config/dconf"
];
persist.state.homeDirectories = [ ".config/dconf" ];
}

4
profiles/workspace/hyprland/default.nix
View File

@ -78,8 +78,8 @@ in with config.deviceSpecific; with lib; {
}
decoration {
rounding=0
active_opacity=0.92
inactive_opacity=0.75
active_opacity=0.95
inactive_opacity=0.85
fullscreen_opacity=1.0
drop_shadow=true
shadow_range=12

41
profiles/workspace/kde.nix Normal file
View File

@ -0,0 +1,41 @@
{ pkgs, lib, config, ... }:
with config.lib.base16.theme; {
services.dbus.packages =
[ pkgs.systemd iconPackage ];
services.udev.packages = [ pkgs.libmtp pkgs.media-player-info ];
qt.enable = true;
environment.sessionVariables = {
KDEDIRS =
"/run/current-system/sw:/run/current-system/sw/share/kservices5:/run/current-system/sw/share/kservicetypes5:/run/current-system/sw/share/kxmlgui5";
};
home-manager.users.${config.mainuser} = {
qt.style.name = "kvantum";
xdg.configFile."kdeglobals".text = lib.generators.toGitINI {
General = {
# ColorScheme = "Generated";
# Name = "Generated";
fixed = "${fonts.mono.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
font = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
menuFont = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
shadeSortColumn = true;
smallestReadableFont =
"${fonts.main.family},${fontSizes.minimal.str},-1,5,57,0,0,0,0,0,Medium";
toolBarFont = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
};
KDE = {
DoubleClickInterval = 400;
ShowDeleteCommand = true;
SingleClick = false;
StartDragDist = 4;
StartDragTime = 500;
WheelScrollLines = 3;
contrast = 4;
# widgetStyle = "Breeze";
};
Icons = { Theme = "${fonts.icon.family}"; };
};
};
}

123
profiles/workspace/kde/default.nix
View File

@ -1,123 +0,0 @@
{ pkgs, lib, config, ... }:
with config.lib.base16.theme; {
services.dbus.packages =
[ pkgs.systemd iconPackage ];
services.udev.packages = [ pkgs.libmtp pkgs.media-player-info ];
qt.enable = false;
environment.sessionVariables = {
KDEDIRS =
"/run/current-system/sw:/run/current-system/sw/share/kservices5:/run/current-system/sw/share/kservicetypes5:/run/current-system/sw/share/kxmlgui5";
};
home-manager.users.${config.mainuser} = {
xdg.configFile."kdeglobals".text = lib.generators.toGitINI {
"Colors:Button" = {
BackgroundAlternate = base01-hex;
BackgroundNormal = base01-hex;
DecorationFocus = base02-hex;
DecorationHover = base02-hex;
ForegroundActive = base05-hex;
ForegroundInactive = base01-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base09-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base03-hex;
};
"Colors:Complementary" = {
BackgroundAlternate = base01-hex;
BackgroundNormal = base03-hex;
DecorationFocus = base02-hex;
DecorationHover = base02-hex;
ForegroundActive = base09-hex;
ForegroundInactive = base01-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base0A-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base02-hex;
};
"Colors:Selection" = {
BackgroundAlternate = base0D-hex;
BackgroundNormal = base0D-hex;
DecorationFocus = base0D-hex;
DecorationHover = base0D-hex;
ForegroundActive = base05-hex;
ForegroundInactive = base05-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base09-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base02-hex;
};
"Colors:Tooltip" = {
BackgroundAlternate = base01-hex;
BackgroundNormal = base00-hex;
DecorationFocus = base02-hex;
DecorationHover = base02-hex;
ForegroundActive = base02-hex;
ForegroundInactive = base01-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base09-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base03-hex;
};
"Colors:View" = {
BackgroundAlternate = base01-hex;
BackgroundNormal = base00-hex;
DecorationFocus = base02-hex;
DecorationHover = base02-hex;
ForegroundActive = base02-hex;
ForegroundInactive = base01-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base09-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base03-hex;
};
"Colors:Window" = {
BackgroundAlternate = base01-hex;
BackgroundNormal = base00-hex;
DecorationFocus = base02-hex;
DecorationHover = base02-hex;
ForegroundActive = base02-hex;
ForegroundInactive = base01-hex;
ForegroundLink = base0D-hex;
ForegroundNegative = base08-hex;
ForegroundNeutral = base09-hex;
ForegroundNormal = base05-hex;
ForegroundPositive = base0B-hex;
ForegroundVisited = base03-hex;
};
General = {
ColorScheme = "Generated";
Name = "Generated";
fixed = "${fonts.mono.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
font = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
menuFont = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
shadeSortColumn = true;
smallestReadableFont =
"${fonts.main.family},${fontSizes.minimal.str},-1,5,57,0,0,0,0,0,Medium";
toolBarFont = "${fonts.main.family},${fontSizes.small.str},-1,5,50,0,0,0,0,0";
};
KDE = {
DoubleClickInterval = 400;
ShowDeleteCommand = true;
SingleClick = false;
StartDragDist = 4;
StartDragTime = 500;
WheelScrollLines = 3;
contrast = 4;
widgetStyle = "Breeze";
};
Icons = { Theme = "${fonts.icon.family}"; };
};
};
}

2
profiles/workspace/misc.nix
View File

@ -44,7 +44,7 @@ with config.deviceSpecific; {
"/var/lib/nixos"
"/var/lib/systemd"
] ++ lib.optionals config.services.postgresql.enable [
config.services.postgresql.dataDir
"/var/lib/postgresql"
] ++ lib.optionals config.services.mysql.enable [
config.services.mysql.dataDir
];

252
profiles/workspace/waybar/default.nix
View File

@ -1,97 +1,227 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
let
thm = config.lib.base16.theme;
in
with config.deviceSpecific; {
home-manager.users.${config.mainuser}.programs.waybar = {
enable = true;
style = builtins.readFile ./style.css;
# style = builtins.readFile ./style.css;
systemd.enable = true;
systemd.target = "hyprland-session.target";
settings = {
mainBar = {
layer = "top";
position = "top";
margin = "10 10 0 8";
modules-left = [ "wlr/workspaces" ];
modules-right = if isLaptop then [
"cpu"
"disk"
"temperature"
"custom/mem"
"backlight"
# margin = "8 8 0 8";
modules-left = [
"hyprland/workspaces"
# "wireplumber"
] ++ lib.optionals isLaptop [
"battery"
"clock"
"tray"
] else [
"cpu"
"disk"
"temperature"
"custom/mem"
"clock"
"tray"
"backlight"
];
modules-center = [ "hyprland/window" ];
modules-right = [
"tray"
"disk"
"cpu"
# "temperature"
"memory"
"clock"
];
backlight = {
device = "intel_backlight";
format = "{percent}% {icon}";
format-icons = [ "" "" "" "" "" "" "" ];
# min-length = 7;
};
battery = {
interval = 60;
states = {
warning = 30;
critical = 15;
};
format = "{icon} {capacity}%";
format-charging = "<span color=\"#e0af68\">󱐌</span> {capacity}%";
format-icons = [
"<span color=\"#f7768e\"> </span>"
"<span color=\"#f7768e\"> </span>"
"<span color=\"#7aa2f7\"> </span>"
"<span color=\"#7aa2f7\"> </span>"
"<span color=\"#7aa2f7\"> </span>"
];
on-update = "$HOME/.config/waybar/scripts/check_battery.sh";
};
clock = {
format = "{:%a, %d %b, %H:%M}";
tooltip-format = "<tt>{calendar}</tt>";
calendar = {
mode = "month";
mode-mon-col = 4;
weeks-pos = "right";
on-scroll = 1;
on-click-right = "mode";
format = {
months = "<span color='#c0caf5'><b>{}</b></span>";
days = "<span color='#c0caf5'><b>{}</b></span>";
weeks = "<span color='#7dcfff'><b>W{}</b></span>";
weekdays = "<span color='#ff9e64'><b>{}</b></span>";
today = "<span color='#f7768e'><b><u>{}</u></b></span>";
};
};
};
cpu = {
interval = 4;
format = "{usage}%";
format = "<span color=\"@base\">      </span>{usage}%";
};
disk = {
interval = 60;
format = "{free}";
format = "<span color=\"#7aa2f7\">      </span>{free}%";
path = "/home";
};
"custom/separator" = {
format = "|";
interval = "once";
tooltip = false;
"hyprland/window" = {
max-length = 64;
};
"wlr/workspaces" = {
"hyprland/workspaces" = {
format = "{icon}";
on-click = "activate";
disable-scroll = true;
format-icons = {
"10" = "0";
"Messengers" = "Msg";
"Music" = "Mus";
};
};
memory = {
format = "<span color=\"#7aa2f7\">     </span>{used}GiB";
interval = 4;
};
temperature = {
# "hwmon-path" = "/sys/class/hwmon/hwmon0/temp1_input";
critical-threshold = 80;
format = "{temperatureC}°C {icon}";
format-icons = [ "" "" "" "" "" ];
tooltip = false;
};
"custom/mem" = {
format = "{} ";
interval = 3;
exec = "${pkgs.procps}/bin/free -h | ${pkgs.gawk}/bin/awk '/Mem:/{printf $7}'";
tooltip = false;
};
backlight = {
device = "intel_backlight";
format = "{percent}% {icon}";
format-icons = [ "" "" "" "" "" "" "" ];
min-length = 7;
};
battery = {
states = {
warning = 30;
critical = 15;
};
format = "{capacity}% {icon}";
format-charging = "{capacity}% ";
format-plugged = "{capacity}% ";
format-alt = "{time} {icon}";
format-icons = [
"" "" "" "" "" "" "" "" "" ""
];
on-update = "$HOME/.config/waybar/scripts/check_battery.sh";
};
clock = {
format = "{:%a, %d %b, %H:%M}";
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
format = "<span color=\"#7aa2f7\">\uf4f5     </span>{temperatureC}°C";
format-critical = "<span color=\"#f7768e\"> </span>{temperatureC}°C";
interval = 4;
};
tray = {
icon-size = 16;
spacing = 0;
icon-size = 12;
spacing = 6;
};
wireplumber = {
scroll-step = 5;
format = "<span color=\"#7aa2f7\">{icon} </span>{volume}%";
format-muted = "<span color=\"#f7768e\">\ueee8   </span>Muted";
format-bluetooth = "<span color=\"#7aa2f7\">\uf282 </span>{volume}%";
on-click-right = "blueman-manager";
format-icons = [ "\uf026 " "\uf027 " "\uf028 " ];
on-click = "pavucontrol";
};
};
};
style = let
accent = "lavender";
in ''
@import "catppuccin.css";
* {
font-family:
"${thm.fonts.mono.family}",
feather;
font-weight: 500;
font-size: 11pt;
color: @text;
}
/* main waybar */
window#waybar {
padding: 0;
margin: 0;
/* background: rgba(26, 27, 38, 0.7); */
background: @base;
}
/* when hovering over modules */
tooltip {
background: @base;
border-radius: 5%;
}
#workspaces button {
padding: 2px;
}
/* Sets active workspace to have a solid line on the bottom */
#workspaces button.active {
border-bottom: 2px solid @${accent};
border-radius: 0;
margin-top: 2px;
transition: all 0.5s ease-in-out;
}
/* More workspace stuff for highlighting on hover */
#workspaces button.focused {
color: @subtext0;
}
#workspaces button.urgent {
color: #f7768e;
}
#workspaces button:hover {
background: @crust;
color: @text;
}
/* Sets background, padding, margins, and borders for (all) modules */
#workspaces,
#clock,
#window,
#temperature,
#disk,
#cpu,
#memory,
#network,
#wireplumber,
#tray,
#backlight,
#battery {
/* background: rgba(26, 27, 38, 0); */
background: @base;
padding: 0 10px;
border: 0;
}
#workspaces {
padding-right: 0px;
}
/* Hide window module when not focused on window or empty workspace */
window#waybar.empty #window {
padding: 0;
margin: 0;
opacity: 0;
}
/* Set up rounding to make these modules look like separate pills */
#tray {
color: @${accent};
border-radius: 12px;
margin-right: 4px;
}
#window {
border-radius: 12px;
}
/* close right side of bar */
#temperature {
border-radius: 12px 0 0 12px;
}
/* close left side of bar */
#battery {
border-radius: 0 12px 12px 0;
}
'';
};
}

3
roles/desktop.nix
View File

@ -14,6 +14,7 @@
email
firefox
gamemode
home-apps
kitty
mangohud
mpv
@ -23,7 +24,6 @@
steam
vscode
waydroid
zathura
# aria2
cursor
@ -44,5 +44,6 @@
vpn
vscode-server
catppuccin
];
}