kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac fixes

Browse source
This commit is contained in:
Aleksandr Lebedev 2024-12-27 23:04:46 +01:00
parent 96cea1bb7b
commit af883624f5
4 changed files with 78 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

138
flake.lock generated
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1733377410, "lastModified": 1735172763,
"narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=", "narHash": "sha256-a6n8RsiAolz6p24Fsr/gTndx9xr9USpKqKK6kzBeXQc=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929", "rev": "3daf0637409689d7a1304cedc50d20542bc47905",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734400729, "lastModified": 1734906446,
"narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a132fa41be7ebe797ad758e84d9df068151a723b", "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734343412, "lastModified": 1735048446,
"narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=", "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19", "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734425854, "lastModified": 1734797603,
"narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +413,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734622215, "lastModified": 1735053786,
"narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,11 +434,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734344598, "lastModified": 1734862405,
"narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "83ecd50915a09dca928971139d3a102377a8d242", "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734364709, "lastModified": 1734906540,
"narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +513,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733684019, "lastModified": 1734906236,
"narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -542,11 +542,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1734639812, "lastModified": 1735318145,
"narHash": "sha256-MbE5G26NM18O9+VnYW5hweAv28o7RJaVFOrZT0gIvr0=", "narHash": "sha256-TBtdzTTdlYLX+KJ3tQw1JQeJ4q8xGzzVD+BGn8YvaWQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "71dc9f6128b8d2e382b2a574d2d5f15e2d907f3a", "rev": "534adad6b1940fcf0929a59be62dc78e5effaccc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -596,11 +596,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733940128, "lastModified": 1734906472,
"narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "3833097e50473a152dd614d4b468886840b4ea78", "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,11 +625,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734364628, "lastModified": 1734906259,
"narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "rev": "0404833ea18d543df44df935ebf1b497310eb046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +650,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734384247, "lastModified": 1734796073,
"narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -675,11 +675,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734384417, "lastModified": 1734793513,
"narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,11 +690,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1734200366, "lastModified": 1734945620,
"narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", "rev": "d000479f4f41390ff7cf9204979660ad5dd16176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,11 +759,11 @@
"umu": "umu" "umu": "umu"
}, },
"locked": { "locked": {
"lastModified": 1734658860, "lastModified": 1735090720,
"narHash": "sha256-72LJNZJ9NyF+VuC2mVdxzXCPW7bNiOP8ZhKZ4zjnmh8=", "narHash": "sha256-Abx/6obaYLgFio8g06pcmMaRPwjKo/bOn1P+gsDMVg0=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "8137dad521d4067c34291ca25209598b87a95d5e", "rev": "95f1cc7ebe63b5a5af6c2d206ffd422739c5959e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -789,11 +789,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1734649271,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +833,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1734119587, "lastModified": 1734649271,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -849,11 +849,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733935885, "lastModified": 1734435836,
"narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", "rev": "4989a246d7a390a859852baddb1013f825435cee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +926,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734567959, "lastModified": 1735331663,
"narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=", "narHash": "sha256-iku/Rn9blbz0LCLq0MvB8ezuB4FCtep9hjP9QzGTt/4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "37608b462772e35220e02bfbd9045d0946564436", "rev": "60e88b870c8477bcb043792025eca4c9bb4974e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -973,11 +973,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1734379367, "lastModified": 1734797603,
"narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1052,11 +1052,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1734531336, "lastModified": 1735253599,
"narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1168,11 +1168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733761991, "lastModified": 1734704479,
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1234,11 +1234,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734422917, "lastModified": 1734907020,
"narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", "rev": "d7f18dda5e511749fa1511185db3536208fb1a63",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
nixos/configuration.nix
View file

@ -154,7 +154,6 @@
kitty-themes kitty-themes
btop btop
solaar solaar
blender
#kde #kde
kdePackages.kate kdePackages.kate
@ -351,7 +350,7 @@
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
package = pkgs.kdePackages.sddm; package = pkgs.kdePackages.sddm;
wayland.enable = true; wayland.enable = false;
}; };
nix = { nix = {
settings = { settings = {

2
nixos/hosts/kylekrein-homepc/default.nix
View file

@ -14,6 +14,8 @@
]; ];
environment.systemPackages = [ environment.systemPackages = [
blender
#inputs.nix-gaming.packages.${pkgs.system}.star-citizen #inputs.nix-gaming.packages.${pkgs.system}.star-citizen
]; ];

7
nixos/hosts/kylekrein-mac/mac-hardware-conf.nix
View file

@ -16,7 +16,7 @@
fileSystems."/" = { fileSystems."/" = {
device = "tmpfs"; device = "tmpfs";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=3G" "mode=755" ]; options = [ "defaults" "size=8G" "mode=755" ];
}; };
fileSystems."/persist" = fileSystems."/persist" =
{ device = "/dev/disk/by-label/nixos"; { device = "/dev/disk/by-label/nixos";
@ -29,6 +29,11 @@
options = [ "bind" ]; options = [ "bind" ];
depends = [ "/persist" ]; depends = [ "/persist" ];
}; };
fileSystems."/tmp" = {
device = "/persist/tmp";
options = [ "bind" ];
depends = [ "/persist" ];
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/EFI\\x20-\\x20NIXOS"; { device = "/dev/disk/by-label/EFI\\x20-\\x20NIXOS";
fsType = "vfat"; fsType = "vfat";