kdb424/nixFlake
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

feat: Update Mac

Browse source
This commit is contained in:
Kyle Brown 2024-08-04 06:40:03 -07:00
parent 2817b8c3ff
commit 4773f54908
9 changed files with 372 additions and 197 deletions
common/networking
zerotier.nix
flake.lock
home-manager
machines
cubert.nix
modules
common.nix
kitty
default.nixmac.nix
lunarvim.nixmac.nix
hosts/cubert
default.nix

3
common/networking/zerotier.nix
View file

@ -23,5 +23,8 @@
192.168.194.200 kif.far
192.168.194.189 morbo.far
192.168.194.251 homeassistant.far
192.168.194.241 grapheneos.far
192.168.194.182 trueremote.far
192.168.194.242 truehome.far
'';
}

299
flake.lock generated
View file

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1716699938,
"narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=",
"lastModified": 1721441154,
"narHash": "sha256-LHZtBq31ViF1lkZ8Hnp2Y0ypUMIhVzgp2ZCVCOmO0Do=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "842306255856d7f5677c113e699101eb253e2e3f",
"rev": "d3fed6f02e05aee529c95efd402ebb259463f1a6",
"type": "github"
},
"original": {
@ -22,6 +22,39 @@
"type": "github"
}
},
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722347739,
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@ -75,11 +108,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"lastModified": 1720809814,
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github"
},
"original": {
@ -123,15 +156,15 @@
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
@ -143,11 +176,11 @@
]
},
"locked": {
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"lastModified": 1722082646,
"narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
"type": "github"
},
"original": {
@ -158,18 +191,17 @@
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
@ -187,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1717923950,
"narHash": "sha256-k7WYdsUm4oeFlAC2JLKXDIxp1pS7/mrUyN7ztEF5DGM=",
"lastModified": 1722416168,
"narHash": "sha256-m4CoX6bQzCg6atdfx2cstBEfadnKArnTwwv48OI4BD0=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "a5143ff8b6be9201f6b7aabe209a4c2a4a832ae3",
"rev": "70497f8b17f0bdafddc197b125f54cd5f73162cf",
"type": "github"
},
"original": {
@ -246,22 +278,6 @@
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -285,11 +301,11 @@
]
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
@ -321,11 +337,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -352,7 +368,10 @@
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
@ -364,11 +383,11 @@
]
},
"locked": {
"lastModified": 1717664902,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"type": "github"
},
"original": {
@ -444,11 +463,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1722407237,
"narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "58cef3796271aaeabaed98884d4abaab5d9d162d",
"type": "github"
},
"original": {
@ -465,11 +484,11 @@
]
},
"locked": {
"lastModified": 1717525419,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
"lastModified": 1722119539,
"narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
"rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
"type": "github"
},
"original": {
@ -486,11 +505,11 @@
]
},
"locked": {
"lastModified": 1714981474,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"lastModified": 1715930644,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github"
},
"original": {
@ -515,11 +534,11 @@
]
},
"locked": {
"lastModified": 1717181720,
"narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"lastModified": 1721330371,
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github"
},
"original": {
@ -530,19 +549,21 @@
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"systems": "systems_2",
"xdph": "xdph"
},
"locked": {
"lastModified": 1717946608,
"narHash": "sha256-AyETolm28rPHCot2kXq6z7xtG0p4VdV0rg2lTrT0BIY=",
"lastModified": 1722375236,
"narHash": "sha256-jQBjzVx5+9cutwS+pK70OkiybLd0mN5pp/mOvvTQu7o=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "4168b8c17b12b90873fab1ca73c2981b53f48bf5",
"rev": "3b9b5346b830554aa7470ccf1202a7f3be72d1b4",
"type": "github"
},
"original": {
@ -565,11 +586,11 @@
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
@ -579,6 +600,35 @@
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324361,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -590,16 +640,16 @@
]
},
"locked": {
"lastModified": 1716473782,
"narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
"lastModified": 1722098849,
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "87d5d984109c839482b88b4795db073eb9ed446f",
"repo": "hyprutils",
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"repo": "hyprutils",
"type": "github"
}
},
@ -615,11 +665,11 @@
]
},
"locked": {
"lastModified": 1717784906,
"narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
@ -636,11 +686,11 @@
]
},
"locked": {
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"lastModified": 1722082646,
"narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
"type": "github"
},
"original": {
@ -656,11 +706,11 @@
]
},
"locked": {
"lastModified": 1717919703,
"narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=",
"lastModified": 1722136042,
"narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6",
"rev": "c0ca47e8523b578464014961059999d8eddd4aae",
"type": "github"
},
"original": {
@ -671,11 +721,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -687,43 +737,43 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1717530100,
"narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=",
"lastModified": 1722221733,
"narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a2e1d0414259a144ebdc048408a807e69e0565af",
"rev": "12bf09802d77264e441f48e25459c10c93eada2e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -735,11 +785,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -760,14 +810,15 @@
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1717922156,
"narHash": "sha256-C/TgTnKY4iWXnBmKocV9KeV+OtZGCh+1Pcw26Elx7JM=",
"lastModified": 1722431209,
"narHash": "sha256-qBxvnoQuzhCHTej5JMw1EpjavufRgpMNP9klpO7mbI4=",
"owner": "pta2002",
"repo": "nixvim",
"rev": "8a462dc9570bce1de5a7dd1beabd83f95958315b",
"rev": "8945b3b5e336a42972448e2f07ed5bc465a40c83",
"type": "github"
},
"original": {
@ -776,9 +827,31 @@
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722144272,
"narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=",
"owner": "NuschtOS",
"repo": "search",
"rev": "16565307c267ec219c2b5d3494ba66df08e7d403",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixpkgs"
@ -786,11 +859,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1717664902,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"type": "github"
},
"original": {
@ -839,7 +912,7 @@
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": [
@ -847,11 +920,11 @@
]
},
"locked": {
"lastModified": 1717866166,
"narHash": "sha256-iOeRZXIhFpQJdxzNJ3nUAANyDfLqCslRhjGhLD2RstM=",
"lastModified": 1722295291,
"narHash": "sha256-3XpT9GMw50NCGT1Gd2YAwEjrEcFtDqnuQ7sRUcuU/Pc=",
"owner": "danth",
"repo": "stylix",
"rev": "ca3247ed8cfbf369f3fe1b7a421579812a95c101",
"rev": "feb2973dfa8232c07efbd2b48f11a5cfa2276570",
"type": "github"
},
"original": {
@ -913,11 +986,11 @@
]
},
"locked": {
"lastModified": 1717850719,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {
@ -943,11 +1016,11 @@
]
},
"locked": {
"lastModified": 1716290197,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"lastModified": 1722365976,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
"type": "github"
},
"original": {

3
home-manager/machines/cubert.nix
View file

@ -28,8 +28,9 @@
../modules/mac.nix
../modules/commonGUI.nix
];
stylix = {
autoEnable = true;
image = pkgs.fetchurl {
url = "https://w.wallhaven.cc/full/1p/wallhaven-1poo61.jpg";
sha256 = "sha256-PFlo9gszKxsM73jdIP+IB6Hv+AoQlryVXxd++1oZN+c=";

53
home-manager/modules/common.nix
View file

@ -7,7 +7,6 @@
imports = [
./git.nix
./tmux.nix
# ./lunarvim.nix
./vim.nix
./zsh
];
@ -28,72 +27,70 @@
yadm
# builtin replacements
htop # modern top
bottom # even more top
colordiff # gimme my colours
du-dust # modern du
eza # modern ls
fd # way faster find
fzf # fuzzy finding
htop # modern top
ripgrep # faster grep
tealdeer # tldr, but rusty
thefuck # Can't type? fuck
zoxide # cd is just too slow
fzf # fuzzy finding
tealdeer # tldr, but rusty
# multiplexers
tmate # here's what I see
# misc tools
tree # I don't even know what to grep
p7zip # gotta extract 'em all
yt-dlp # yoink yt
mkvtoolnix # the only container that matters
hyperfine # benchmark
neofetch # Check what system I'm on
screen # multiplexer
unzip # sometimes 7z ain't gonna cut it
killall # rip processes
magic-wormhole # p2p send one off files
neofetch # Check what system I'm on
p7zip # gotta extract 'em all
screen # multiplexer
tree # I don't even know what to grep
unzip # sometimes 7z ain't gonna cut it
yt-dlp # yoink yt
# tui apps
#ncdu_2
# networking
gping # ping with TUI
gping # ping with tui
imagemagick # wal dep
iperf # local speed checks
nmap # where in my network is it again...
wget # generic "gimme"
speedtest-cli # ISP speed check
rsync # OUR files
imagemagick # wal dep
picocom # microcontrollers
rsync # our files
speedtest-cli # isp speed check
wget # generic "gimme"
# docs
pandoc
gnumake
pandoc
# Useful utils
grex # regex made easy
git-cliff # useful commit messages
grex # regex made easy
# nix tools
nix-prefetch-github
alejandra # nix code formatter
nix-prefetch-github
]
++ lib.optionals stdenv.isDarwin [
coreutils # provides `dd` with --status=progress
wifi-password
time # GNU time
wifi-password
]
++ lib.optionals stdenv.isLinux [
iputils # provides `ping`, `ifconfig`, ...
libuuid # `uuidgen` (already pre-installed on mac)
ispell # doom emacs
iotop # disk top
iftop # network top
bmon # bandwidth monitor
bandwhich # bandwidth per process monitor
bmon # bandwidth monitor
iftop # network top
iotop # disk top
iputils # provides `ping`, `ifconfig`, ...
ispell # doom emacs
libuuid # `uuidgen` (already pre-installed on mac)
mkvtoolnix # the only container that matters
];
}

7
home-manager/modules/kitty/default.nix Normal file
View file

@ -0,0 +1,7 @@
{...}: {
programs.kitty.enable = true;
programs.kitty = {
shellIntegration.enableZshIntegration
};
}

144
home-manager/modules/kitty/mac.nix Normal file
View file

@ -0,0 +1,144 @@
{...}: {
programs.alacritty.settings = {
decorations = "none";
# window = [
# {
# option_as_alt = "Both";
# }
# ];
# Mac rebinds
keyboard.bindings = [
{
key = "A";
mods = "Command";
chars = "\\x01";
}
{
key = "B";
mods = "Command";
chars = "\\x02";
}
{
key = "C";
mods = "Command";
chars = "\\x03";
}
{
key = "D";
mods = "Command";
chars = "\\x04";
}
{
key = "E";
mods = "Command";
chars = "\\x05";
}
{
key = "F";
mods = "Command";
chars = "\\x06";
}
{
key = "G";
mods = "Command";
chars = "\\x07";
}
{
key = "H";
mods = "Command";
chars = "\\x08";
}
{
key = "I";
mods = "Command";
chars = "\\x09";
}
{
key = "J";
mods = "Command";
chars = "\\x0A";
}
{
key = "K";
mods = "Command";
chars = "\\x0B";
}
{
key = "L";
mods = "Command";
chars = "\\x0C";
}
{
key = "M";
mods = "Command";
chars = "\\x0D";
}
{
key = "N";
mods = "Command";
chars = "\\x0E";
}
{
key = "O";
mods = "Command";
chars = "\\x0F";
}
{
key = "P";
mods = "Command";
chars = "\\x10";
}
{
key = "Q";
mods = "Command";
chars = "\\x11";
}
{
key = "R";
mods = "Command";
chars = "\\x12";
}
{
key = "S";
mods = "Command";
chars = "\\x13";
}
{
key = "T";
mods = "Command";
chars = "\\x14";
}
{
key = "U";
mods = "Command";
chars = "\\x15";
}
{
key = "V";
mods = "Command";
chars = "\\x16";
}
{
key = "W";
mods = "Command";
chars = "\\x17";
}
{
key = "X";
mods = "Command";
chars = "\\x18";
}
{
key = "Y";
mods = "Command";
chars = "\\x19";
}
{
key = "Z";
mods = "Command";
chars = "\\x1A";
}
];
};
}

52
home-manager/modules/lunarvim.nix
View file

@ -1,52 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
home.packages = with pkgs; [
lunarvim
];
home.file.".config/lvim/config.lua".text = ''
-- vim options
vim.opt.shiftwidth = 2
vim.opt.tabstop = 2
vim.opt.relativenumber = false
-- general
lvim.log.level = "info"
lvim.format_on_save = {
enabled = true,
pattern = "*.lua",
timeout = 1000,
}
-- lvim.keys.normal_mode["<S-l>"] = ":BufferLineCycleNext<CR>"
-- lvim.keys.normal_mode["<S-h>"] = ":BufferLineCyclePrev<CR>"
-- -- Use which-key to add extra bindings with the leader-key prefix
-- lvim.builtin.which_key.mappings["W"] = { "<cmd>noautocmd w<cr>", "Save without formatting" }
-- lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope projects<CR>", "Projects" }
-- -- Change theme settings
-- lvim.colorscheme = "lunar"
lvim.builtin.alpha.active = true
lvim.builtin.alpha.mode = "dashboard"
lvim.builtin.terminal.active = true
lvim.builtin.nvimtree.setup.view.side = "left"
lvim.builtin.nvimtree.setup.renderer.icons.show.git = true
-- Automatically install missing parsers when entering buffer
lvim.builtin.treesitter.auto_install = true
lvim.transparent_window = false
lvim.plugins = {
{
"RRethy/nvim-base16",
config = vim.cmd('colorscheme base16-${config.lib.stylix.scheme.slug}'),
}
}
'';
}

3
home-manager/modules/mac.nix
View file

@ -1,6 +1,6 @@
{pkgs, ...}: {
imports = [
./alacritty/mac.nix
./kitty/mac.nix
];
home.packages = with pkgs; [
@ -9,5 +9,6 @@
unrar
pywal
comma # Unfortunate hack
kitty
];
}

5
hosts/cubert/default.nix
View file

@ -11,9 +11,10 @@ in {
];
stylix = {
autoEnable = true;
image = pkgs.fetchurl {
url = "https://git.kdb424.xyz/kdb424/wallpapers/raw/branch/main/wallhaven-zmomkv.jpg";
sha256 = "sha256-vQIFAK9gzFl3DvDbyuM+MIvSW3OLL9IR1qn0hgsqnVU=";
url = "https://git.kdb424.xyz/kdb424/wallpapers/raw/branch/main/wallhaven-kwk9o6.jpg";
sha256 = "sha256-x2oFkDrt+96gd603hXC1T/FxpJJIuiI8xrww4REdzLE=";
};
};