softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates and added devenv as a package

Browse source
This commit is contained in:
Salar Rahmanian 2024-04-26 12:20:53 -07:00
parent cc54218e6c
commit 850b39c9b6
3 changed files with 74 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711133180, "lastModified": 1714042918,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710717205, "lastModified": 1713946171,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711001935, "lastModified": 1714076141,
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20f77aa09916374aa3141cbc605c955626762c9a", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1711204334, "lastModified": 1714153552,
"narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=", "narHash": "sha256-+3CdMPm0E4fExxj3xZ8nZY/TW/Tc0BczK4DopNdr6gY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d", "rev": "8f0f28c3bf4fb66368ecf10fd742a44c7f816d35",
"type": "github" "type": "github"
}, },
"original": { "original": {

119
flake.nix
View file

@ -1,6 +1,6 @@
{ {
description = "Nix and home-manager configurations for Softinio's macbook"; description = "Nix and home-manager configurations for Softinio's macbook";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nix-darwin = { nix-darwin = {
@ -13,73 +13,74 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = {self, nix-darwin, home-manager, nur, nixpkgs, ...}: outputs = { self, nix-darwin, home-manager, nur, nixpkgs, ... }:
let let
homeManagerConfFor = config: { ... }: { homeManagerConfFor = config: { ... }: {
nixpkgs.overlays = [ nur.overlay ]; nixpkgs.overlays = [ nur.overlay ];
imports = [ config ]; imports = [ config ];
}; };
m3maxConfiguration = { pkgs, ... }: { m3maxConfiguration = { pkgs, ... }: {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
[ [
home-manager home-manager
]; ];
fonts = { fonts = {
fontDir.enable = true; fontDir.enable = true;
fonts = with pkgs; [ fonts = with pkgs; [
fira-code 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" ];
}; };
distributedBuilds = false;
}; services.nix-daemon.enable = true;
programs.fish.enable = true; nix = {
nixPath = nixpkgs.lib.mkForce [
system.configurationRevision = self.rev or self.dirtyRev or null; "nixpkgs=${nixpkgs}"
];
system.stateVersion = 4;
package = pkgs.nixUnstable;
nixpkgs.hostPlatform = "aarch64-darwin"; settings = {
experimental-features = "nix-command flakes";
users = { extra-platforms = [ "x86_64-darwin" "aarch64-darwin" ];
users.salar = { trusted-users = [ "root" "salar" ];
home = /Users/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;
};
} }

3
home.nix
View file

@ -31,6 +31,7 @@
curlFull curlFull
delta delta
deno deno
devenv
discord discord
fd fd
ffmpeg ffmpeg
@ -351,7 +352,7 @@
# Neovim Configuration # Neovim Configuration
xdg.configFile."nvim".source = builtins.fetchGit { xdg.configFile."nvim".source = builtins.fetchGit {
url = "https://code.softinio.com/softinio/nvim-config"; url = "https://code.softinio.com/softinio/nvim-config";
rev = "20abfd7ad7a56d7a73d83f6443bb7fe9a72f6b1a"; rev = "12c5e919e829c067ba795fe7f1e02037cbc0b4e9";
}; };
} }