From 2638519e7de62bd208525267f8c9cc6d28ae12b4 Mon Sep 17 00:00:00 2001 From: Steph Date: Mon, 18 Nov 2024 08:49:19 +0100 Subject: [PATCH 1/3] Mac config --- programs/firefox.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/firefox.nix b/programs/firefox.nix index dec784f..773206c 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -62,17 +62,17 @@ }; containers = { "Personal" = { - color = "toolbar"; + color = "green"; icon = "circle"; - id = 0; + id = 3; }; "ON2IT" = { - color = "toolbar"; + color = "orange"; icon = "circle"; id = 1; }; "Lekker van Peet" = { - color = "toolbar"; + color = "red"; icon = "circle"; id = 2; }; From 4641f624c2dec4e2b98b6d3211ef06139bda3313 Mon Sep 17 00:00:00 2001 From: Steph Date: Mon, 18 Nov 2024 09:15:19 +0100 Subject: [PATCH 2/3] yes --- home.nix | 6 +++++- nixos.nix | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home.nix b/home.nix index cda5a84..0e8cd40 100644 --- a/home.nix +++ b/home.nix @@ -42,6 +42,7 @@ vscodium wget zip + coreutils # fonts (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) @@ -57,5 +58,8 @@ executable = true; source = "${./git-identity.sh}"; }; + home.sessionPath = [ + "$HOME/.local/bin" + ]; }; -} \ No newline at end of file +} diff --git a/nixos.nix b/nixos.nix index 4164be3..7cbea58 100644 --- a/nixos.nix +++ b/nixos.nix @@ -85,7 +85,6 @@ virtualisation.podman.enable = true; virtualisation.docker.enable = true; - environment.localBinInPath = true; environment.systemPackages = with pkgs; [ fprintd libfprint-2-tod1-vfs0090 From c923756ff7c56da935ffa27aa055aeaa41d63681 Mon Sep 17 00:00:00 2001 From: Steph Date: Mon, 18 Nov 2024 10:49:43 +0100 Subject: [PATCH 3/3] Stupid macos things --- flake.lock | 108 ++++++++++++++++++++++++++++++++++++-- flake.nix | 9 +++- platforms/darwin/home.nix | 4 +- programs/bash.nix | 4 +- 4 files changed, 116 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1f09185..16935ee 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "cl-nix-lite": { + "locked": { + "lastModified": 1717972076, + "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=", + "owner": "hraban", + "repo": "cl-nix-lite", + "rev": "cc920bfb0a6402d3871f470c98d65266126973e4", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "cl-nix-lite", + "type": "github" + } + }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils", @@ -55,6 +70,23 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1697816753, + "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=", + "owner": "hraban", + "repo": "flake-compat", + "rev": "6025bade1336a36014639bc3f67eacc853dab78f", + "type": "github" + }, + "original": { + "owner": "hraban", + "ref": "fixed-output", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -70,6 +102,23 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -91,9 +140,30 @@ "type": "github" } }, + "mac-app-util": { + "inputs": { + "cl-nix-lite": "cl-nix-lite", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1731385712, + "narHash": "sha256-hcPGb+Voh1N+SD3XuwgcwDMA6W/lGkXLCnd3mttoLoA=", + "owner": "hraban", + "repo": "mac-app-util", + "rev": "9ef4d1c14dab18a95691602bf541cd091fdcc2e3", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "mac-app-util", + "type": "github" + } + }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1730070491, @@ -109,6 +179,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1717868076, + "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1718149104, "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", @@ -122,7 +208,7 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1727540905, "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", @@ -159,10 +245,26 @@ "firefox-gnome-theme": "firefox-gnome-theme", "firefox-macos-theme": "firefox-macos-theme", "home": "home", + "mac-app-util": "mac-app-util", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 710ef7e..105b555 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,10 @@ firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; + mac-app-util.url = "github:hraban/mac-app-util"; }; - outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme }@inputs: { + outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util }@inputs: { nixosConfigurations.iota = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -48,7 +49,11 @@ homeConfigurations.stephans = home.lib.homeManagerConfiguration rec { pkgs = nixpkgs.legacyPackages."aarch64-darwin"; extraSpecialArgs = { inherit inputs ; os = "darwin"; }; - modules = [ ./home.nix ./platforms/darwin/home.nix ]; + modules = [ + ./home.nix + ./platforms/darwin/home.nix + mac-app-util.homeManagerModules.default + ]; }; }; diff --git a/platforms/darwin/home.nix b/platforms/darwin/home.nix index 53e9227..c6fa057 100644 --- a/platforms/darwin/home.nix +++ b/platforms/darwin/home.nix @@ -3,6 +3,6 @@ home.homeDirectory = "/Users/stephans"; home.packages = with pkgs; [ - + cyberduck ]; -} \ No newline at end of file +} diff --git a/programs/bash.nix b/programs/bash.nix index 66bad34..d6c574c 100644 --- a/programs/bash.nix +++ b/programs/bash.nix @@ -31,7 +31,7 @@ $NEW_PROMPT_COMMAND" programs.bash.shellAliases = { chmod = "chmod --preserve-root"; chown = "chown --preserve-root"; - ls = "ls -Isnap --color"; + ls = "ls --color=auto"; df = "df -h -x squashfs -x tmpfs -x devtmpfs -x overlay -x revokefs-fuse"; free = "free -h"; toupper = "tr [:lower:] [:upper:]"; @@ -49,4 +49,4 @@ $NEW_PROMPT_COMMAND" NIXPKGS_ALLOW_UNFREE = 1; HISTCONTROL = "ignoreboth:erasedups"; }; -} \ No newline at end of file +}