Dekker1/dotfiles
1
0
Fork 0
Code Actions

Update configuration to use nix yabai and skhd configurations

Browse Source
This commit is contained in:
Jip J. Dekker 2023-12-26 22:34:16 +11:00
parent 7cf4a42ccf
commit 75ecd06bfe
6 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
darwin/default.nix
View File

@ -37,4 +37,16 @@ let user = "dekker1"; in
environment.systemPackages = with pkgs; [
] ++ (import ../shared/packages.nix { inherit pkgs; });
# Setup MacOS specific services
services = {
yabai = {
enable = true;
extraConfig = (builtins.readFile ./config/yabairc);
};
skhd = {
enable = true;
skhdConfig = (builtins.readFile ./config/skhdrc);
};
};
}

10
darwin/files.nix
View File

@ -5,12 +5,4 @@ let
xdg_dataHome = "${config.users.users.${user}.home}/.local/share";
xdg_stateHome = "${config.users.users.${user}.home}/.local/state";
in
{
".config/skhd/skhdrc" = {
text = builtins.readFile ../darwin/config/skhdrc;
};
".config/yabai/yabairc" = {
text = builtins.readFile ../darwin/config/yabairc;
executable = true;
};
}
{ }

5
darwin/home-manager.nix
View File

@ -21,10 +21,7 @@ in
cleanup = "zap";
};
casks = pkgs.callPackage ./casks.nix { };
brews = [
"yabai"
"skhd"
];
brews = [ ];
};
# These app IDs are from using the mas CLI app

48
flake.lock generated
View File

@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"lastModified": 1703415240,
"narHash": "sha256-SgsAYwDo2wWHUdZeNKKRRT402sRzQ/rLmzxH/wqMUPw=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"rev": "f454cff5fe84adca9e8aa8d546d2c9879b789950",
"type": "github"
},
"original": {
@ -61,11 +61,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1703026685,
"narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=",
"lastModified": 1703527373,
"narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e",
"rev": "80679ea5074ab7190c4cce478c600057cfb5edae",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1703053523,
"narHash": "sha256-OKnyoBhc6rgtwNAtPZYizrUBSTb7eeWHhNz4k0oGFUQ=",
"lastModified": 1703547671,
"narHash": "sha256-SAIM3L14osK6+o+6JN9IOgSrVnccVb16SDrsv42PA4I=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "1cab02e1d861baafb36bfc0b19284a08251fbad1",
"rev": "b070519b8a647cc56b0366bca5b9312b6250114e",
"type": "github"
},
"original": {
@ -109,11 +109,11 @@
"homebrew-cask-fonts": {
"flake": false,
"locked": {
"lastModified": 1702947819,
"narHash": "sha256-kv2mTDARzk4oc+TPFGnmaXemkuH+8TuHT7CaDEFJtug=",
"lastModified": 1703448672,
"narHash": "sha256-jn8QI4KYRKUzC58I3bqcSvFa3VZykcRx2mc7cstcRbA=",
"owner": "homebrew",
"repo": "homebrew-cask-fonts",
"rev": "6f04e418dc2bbb72fc438b25de315e0d48aff286",
"rev": "cc54a5c9f085c402d479431a26f86eb3f09c1e64",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1703048151,
"narHash": "sha256-+UmfjC3W1MRljd4WKBwKJGcfBa8enMfmz3oqq5Apb+0=",
"lastModified": 1703547454,
"narHash": "sha256-RK8KVUpDjimoEwrwvUGnvQwd8bmE4R3Ep712yV7EmKQ=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "c33912fa092823d7179a158793531082c846bf09",
"rev": "d34d759d15682a975300ba8197823a6586aa10a6",
"type": "github"
},
"original": {
@ -141,11 +141,11 @@
"homebrew-koekeishiya": {
"flake": false,
"locked": {
"lastModified": 1699812011,
"narHash": "sha256-1pXKOdZz1KADlAU3410afYq97Icxq0At5c9HClwLeFo=",
"lastModified": 1703360664,
"narHash": "sha256-YJom/MrED61sOPJOw4uk7gZN08HCbdtTHdl6hfcCfIk=",
"owner": "koekeishiya",
"repo": "homebrew-formulae",
"rev": "d4c95802ca991ea41512320af412072e775c1eb7",
"rev": "3f1f36449166cb83f93a6cd8f6e723a6a7350a94",
"type": "github"
},
"original": {
@ -195,11 +195,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1703255338,
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {
@ -240,11 +240,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1702830618,
"narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
"lastModified": 1703255338,
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -1,5 +1,5 @@
{
description = "Starter Configuration for NixOS and MacOS";
description = "Dekker1's home manager configuation";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

2
shared/home-manager.nix
View File

@ -75,7 +75,7 @@ in
settings = {
cursor_shape = "underline";
confirm_os_window_close = 0;
shell = "nu";
shell = "/Users/dekker1/.nix-profile/bin/nu";
};
theme = "Night Owl";
};