From 850b39c9b6ae662285ecd1724b44a087e3c8496c Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 26 Apr 2024 12:20:53 -0700 Subject: [PATCH] updates and added devenv as a package --- flake.lock | 24 +++++------ flake.nix | 119 +++++++++++++++++++++++++++-------------------------- home.nix | 3 +- 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 2aeb70f..e54dd0d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1714042918, + "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nur": { "locked": { - "lastModified": 1711204334, - "narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=", + "lastModified": 1714153552, + "narHash": "sha256-+3CdMPm0E4fExxj3xZ8nZY/TW/Tc0BczK4DopNdr6gY=", "owner": "nix-community", "repo": "nur", - "rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d", + "rev": "8f0f28c3bf4fb66368ecf10fd742a44c7f816d35", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d4bd6c..3362b7d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "Nix and home-manager configurations for Softinio's macbook"; - + inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nix-darwin = { @@ -13,73 +13,74 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - - outputs = {self, nix-darwin, home-manager, nur, nixpkgs, ...}: + + outputs = { self, nix-darwin, home-manager, nur, nixpkgs, ... }: let homeManagerConfFor = config: { ... }: { nixpkgs.overlays = [ nur.overlay ]; imports = [ config ]; }; - + m3maxConfiguration = { pkgs, ... }: { environment.systemPackages = with pkgs; - [ - home-manager - ]; - - fonts = { - fontDir.enable = true; - fonts = with pkgs; [ - fira-code - ]; - }; - - services.nix-daemon.enable = true; - - nix = { - nixPath = nixpkgs.lib.mkForce [ - "nixpkgs=${nixpkgs}" - ]; - - package = pkgs.nixUnstable; - settings = { - experimental-features = "nix-command flakes repl-flake"; - extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - trusted-users = [ "root" "salar" ]; + [ + home-manager + ]; + + fonts = { + fontDir.enable = true; + fonts = with pkgs; [ + fira-code + ]; }; - distributedBuilds = false; - }; - - programs.fish.enable = true; - - system.configurationRevision = self.rev or self.dirtyRev or null; - - system.stateVersion = 4; - - nixpkgs.hostPlatform = "aarch64-darwin"; - - users = { - users.salar = { - home = /Users/salar; + + services.nix-daemon.enable = true; + + nix = { + nixPath = nixpkgs.lib.mkForce [ + "nixpkgs=${nixpkgs}" + ]; + + package = pkgs.nixUnstable; + settings = { + experimental-features = "nix-command flakes"; + extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + trusted-users = [ "root" "salar" ]; + }; + distributedBuilds = false; + }; + + programs.fish.enable = true; + + system.configurationRevision = self.rev or self.dirtyRev or null; + + system.stateVersion = 4; + + nixpkgs.hostPlatform = "aarch64-darwin"; + + users = { + users.salar = { + home = /Users/salar; + }; }; }; + in + { + darwinConfigurations.salarm3max = nix-darwin.lib.darwinSystem { + system = "aarc64-darwin"; + modules = [ + m3maxConfiguration + home-manager.darwinModules.home-manager + { + home-manager.useUserPackages = true; + home-manager.users.salar = homeManagerConfFor ./home.nix; + } + ]; + specialArgs = { inherit nixpkgs; }; + }; + + darwinPackages = self.darwinConfigurations.salarm3max.pkgs; + + defaultPackage.aarch64-darwin = self.darwinConfigurations.salarm3max.system; }; - in - { - darwinConfigurations.salarm3max = nix-darwin.lib.darwinSystem { - system = "aarc64-darwin"; - modules = [ - m3maxConfiguration - home-manager.darwinModules.home-manager { - home-manager.useUserPackages = true; - home-manager.users.salar = homeManagerConfFor ./home.nix; - } - ]; - specialArgs = { inherit nixpkgs; }; - }; - - darwinPackages = self.darwinConfigurations.salarm3max.pkgs; - - defaultPackage.aarch64-darwin = self.darwinConfigurations.salarm3max.system; - }; } diff --git a/home.nix b/home.nix index c8378a3..4b3385a 100644 --- a/home.nix +++ b/home.nix @@ -31,6 +31,7 @@ curlFull delta deno + devenv discord fd ffmpeg @@ -351,7 +352,7 @@ # Neovim Configuration xdg.configFile."nvim".source = builtins.fetchGit { url = "https://code.softinio.com/softinio/nvim-config"; - rev = "20abfd7ad7a56d7a73d83f6443bb7fe9a72f6b1a"; + rev = "12c5e919e829c067ba795fe7f1e02037cbc0b4e9"; }; }