Update flake.lock, migrate

This commit is contained in:
NullBite 2024-10-23 20:41:16 +02:00
parent 3276bc97a9
commit 68683fba28
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
6 changed files with 64 additions and 64 deletions

110
flake.lock generated
View File

@ -43,11 +43,11 @@
]
},
"locked": {
"lastModified": 1728326504,
"narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=",
"lastModified": 1729527199,
"narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0",
"rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
"type": "github"
},
"original": {
@ -480,11 +480,11 @@
]
},
"locked": {
"lastModified": 1728726232,
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=",
"lastModified": 1729551526,
"narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7",
"rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github"
},
"original": {
@ -530,11 +530,11 @@
]
},
"locked": {
"lastModified": 1727821604,
"narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=",
"lastModified": 1728669738,
"narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d",
"rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
"type": "github"
},
"original": {
@ -553,11 +553,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1727257269,
"narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=",
"lastModified": 1729679960,
"narHash": "sha256-RoFKwZsx4RHKUwO8LhEZtmI08VBVrWt3TdzoJgx1HJ0=",
"owner": "hyprwm",
"repo": "hypridle",
"rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32",
"rev": "4d2fb9e73eb6b75336ed3eb198e900f94ada24f4",
"type": "github"
},
"original": {
@ -580,11 +580,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1728742719,
"narHash": "sha256-t9xlU0hrWSrQenblkg0Mq1wBx4I6A2IdgoVT3/kAx2I=",
"lastModified": 1729657195,
"narHash": "sha256-Dvz+t4NJFjQZLBwgehzauDsPTGAijWIjr5eS3TRRGmU=",
"ref": "refs/heads/main",
"rev": "c3f7c9bbb52b9ad3d24ccfcc5c552ed16c9985a5",
"revCount": 5331,
"rev": "6e0aadc585c6d9fdaaebfa5853adbf9610897c82",
"revCount": 5368,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -715,11 +715,11 @@
]
},
"locked": {
"lastModified": 1727300645,
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"lastModified": 1728941256,
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github"
},
"original": {
@ -760,11 +760,11 @@
]
},
"locked": {
"lastModified": 1725551787,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=",
"lastModified": 1729224425,
"narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072",
"rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
"type": "github"
},
"original": {
@ -775,11 +775,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1727649413,
"narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
"lastModified": 1729068498,
"narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
"rev": "e337457502571b23e449bf42153d7faa10c0a562",
"type": "github"
},
"original": {
@ -822,11 +822,11 @@
]
},
"locked": {
"lastModified": 1728263287,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
"lastModified": 1729394935,
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
"type": "github"
},
"original": {
@ -844,11 +844,11 @@
]
},
"locked": {
"lastModified": 1728694341,
"narHash": "sha256-JAhLNFbzXqT84eZrEWUsEyS0d0CIhKSm8hzNHrKPJUw=",
"lastModified": 1729644828,
"narHash": "sha256-t56aPUHrGQnx0dS5tTIyVD++fcYApYPBg3ajYlq2awA=",
"owner": "Silveere",
"repo": "nix-minecraft",
"rev": "96894e947b02376c4817d6cdf02bdc9985623bfa",
"rev": "133c4292c6fffd17831f6b747cbfaf465e951a5a",
"type": "github"
},
"original": {
@ -867,11 +867,11 @@
]
},
"locked": {
"lastModified": 1728697384,
"narHash": "sha256-dyO5diBCVROITF9d0MP5opEKDWuGNs7mNJWUevoxbjk=",
"lastModified": 1729647959,
"narHash": "sha256-3effNhs4C9+45qkMDR0cIbp5YAbhdosUFxf5jBetRXk=",
"owner": "infinidoge",
"repo": "nix-minecraft",
"rev": "2888f41c58ea9a09725dafd55f72dd4839b23387",
"rev": "7372dca0c43e1a9829ea7b86fd93bb17ab3b2e41",
"type": "github"
},
"original": {
@ -889,11 +889,11 @@
]
},
"locked": {
"lastModified": 1728588346,
"narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
"lastModified": 1729639198,
"narHash": "sha256-AshdfLU9yWhtYQdR5FnUtoQUlXvFee+vlQwPng4DSNY=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
"rev": "eb326eabbfce607700d0af08cd957fd9d06e48fa",
"type": "github"
},
"original": {
@ -927,11 +927,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1729413321,
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github"
},
"original": {
@ -991,11 +991,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"lastModified": 1729658218,
"narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a",
"type": "github"
},
"original": {
@ -1023,11 +1023,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1728627514,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
"lastModified": 1729449015,
"narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
"rev": "89172919243df199fe237ba0f776c3e3e3d72367",
"type": "github"
},
"original": {
@ -1048,11 +1048,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github"
},
"original": {
@ -1144,11 +1144,11 @@
]
},
"locked": {
"lastModified": 1728700003,
"narHash": "sha256-Ox1pvEHxLK6lAdaKQW21Zvk65SPDag+cD8YA444R/og=",
"lastModified": 1729650555,
"narHash": "sha256-j8Sohst1TbQM6LqQKa/HRMfzsUwMhosuNMj2uOn9JOA=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "fc1e58ebabe0cef4442eedea07556ff0c9eafcfe",
"rev": "10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab",
"type": "github"
},
"original": {
@ -1178,11 +1178,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1728640680,
"narHash": "sha256-JH2+RXJNooFtZIN6ZhaGZWn2KChMrso4H7Fkp1Ujrdo=",
"lastModified": 1729380793,
"narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=",
"owner": "danth",
"repo": "stylix",
"rev": "f95022bb6e74f726a87975aec982a5aa9fad8691",
"rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d",
"type": "github"
},
"original": {

View File

@ -21,7 +21,7 @@ let
};
packages = {
cursors = catppuccin-cursors."${toLower flavor}${toCaps accent}";
kvantum = catppuccin-kvantum.override { variant = toCaps flavor; accent = toCaps accent; };
kvantum = catppuccin-kvantum.override { variant = toLower flavor; accent = toLower accent; };
icons = catppuccin-papirus-folders.override { flavor = toLower flavor; accent = toLower accent; };
gtk = catppuccin-gtk.override { variant = toLower flavor; accents = [ (toLower accent) ]; };
};

View File

@ -34,8 +34,8 @@ in
exec "${pcmanfm-qt}/bin/pcmanfm-qt" "$@"
'';
in [
qt5ct
qt6ct
libsForQt5.qt5ct
kdePackages.qt6ct
swaybg
swayidle
libsForQt5.qtstyleplugin-kvantum
@ -49,9 +49,9 @@ in
nwg-look
nwg-displays
# very consistent
# very consistent (ok it's actually a little better now)
(catppuccin-papirus-folders.override {accent = "mauve"; flavor = "mocha"; })
(pkgs.catppuccin-kvantum.override {accent = "Mauve"; variant = "Mocha"; })
(pkgs.catppuccin-kvantum.override {accent = "mauve"; variant = "mocha"; })
catppuccin-cursors.mochaMauve
arc-theme

View File

@ -39,7 +39,7 @@
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
];

View File

@ -5,7 +5,7 @@
lzip,
plzip,
lzop,
lzma,
xz,
zip,
unzip,
arj,
@ -16,7 +16,7 @@
lha,
unfree ? false }:
let
wrappedPath = lib.makeBinPath ([lzip plzip lzop lzma zip unzip arj rpm cpio p7zip] ++ lib.optionals unfree [unrar lha]);
wrappedPath = lib.makeBinPath ([lzip plzip lzop xz zip unzip arj rpm cpio p7zip] ++ lib.optionals unfree [unrar lha]);
in
stdenvNoCC.mkDerivation {
name = "atool-wrapped";

View File

@ -36,7 +36,7 @@ in
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
font-awesome
noto-fonts-cjk
noto-fonts-cjk-sans
(google-fonts.override { fonts = [ "NovaSquare" ];})
];