From e3606cfaaf84bb5a57b969b107b958eb730afdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 2 Oct 2024 13:25:26 +0100 Subject: [PATCH] minimal work mac settings --- flake.nix | 5 +++-- nixos/boxes/cushy/default.nix | 13 +++++++------ nixos/home-manager/default.nix | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index b4c0c894..bda8588a 100644 --- a/flake.nix +++ b/flake.nix @@ -172,13 +172,14 @@ modules = [ lix-module.nixosModules.default (./. + "/nixos/boxes/cushy") - {users.users.cyryl.home = "/Users/Cyryl.Plotnicki";} + {users.users."Cyryl.Plotnicki".home = "/Users/Cyryl.Plotnicki";} home-manager.darwinModules.home-manager { home-manager = { useGlobalPkgs = true; useUserPackages = true; - users."Cyryl\.Plotnicki" = { + users."Cyryl.Plotnicki" = { + home.username = "Cyryl.Plotnicki"; home.homeDirectory = "/Users/Cyryl.Plotnicki"; programs.zsh.loginExtra = '' eval "$(/opt/homebrew/bin/brew shellenv)" diff --git a/nixos/boxes/cushy/default.nix b/nixos/boxes/cushy/default.nix index 9b04a3ce..7d14ca80 100644 --- a/nixos/boxes/cushy/default.nix +++ b/nixos/boxes/cushy/default.nix @@ -7,16 +7,13 @@ ... }: { imports = [ - ../../git - ../../helix - ../../mercurial - ../../vim - ../../zsh + ]; services.nix-daemon.enable = true; nix.settings.experimental-features = "nix-command flakes"; + nix.settings.ssl-cert-file = "/etc/nix/ca_cert.pem"; programs.zsh.enable = true; # default shell on catalina system.stateVersion = 4; @@ -36,6 +33,8 @@ }) ]; + + homebrew.enable = true; homebrew.casks = [ "caffeine" @@ -56,10 +55,12 @@ "texinfo" "wget" ]; - home-manager.users."Cyryl\.Plotnicki" = {...}: { + home-manager.users."Cyryl.Plotnicki" = {...}: { imports = [ ../../home-manager/programs/kitty.nix ]; + programs.kitty.settings.hide_window_decorations = lib.mkForce false; + home.sessionPath = ["$HOME/bin"]; home.packages = with pkgs; []; programs = { diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix index aca07f0d..8ce5108f 100644 --- a/nixos/home-manager/default.nix +++ b/nixos/home-manager/default.nix @@ -8,7 +8,7 @@ username = "cyryl"; in { home = { - inherit username; + username = lib.mkDefault username; sessionVariables = { LC_ALL = "en_GB.UTF-8"; LANG = "en_GB.UTF-8";