steph/os
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://code.steph.tools/steph/os

Browse Source
This commit is contained in:
Steph 2024-11-21 21:06:47 +01:00
commit 390831788d
7 changed files with 125 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
flake.lock generated
View File

@ -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",

9
flake.nix
View File

@ -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
];
};
};

4
home.nix
View File

@ -42,6 +42,7 @@
vscodium
wget
zip
coreutils
# fonts
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
@ -58,5 +59,8 @@
source = "${./git-identity.sh}";
};
home.file.".background-image".source = "${./background-image.jpg}";
home.sessionPath = [
"$HOME/.local/bin"
];
};
}

1
nixos.nix
View File

@ -85,7 +85,6 @@
virtualisation.podman.enable = true;
virtualisation.docker.enable = true;
environment.localBinInPath = true;
environment.systemPackages = with pkgs; [
fprintd
libfprint-2-tod1-vfs0090

2
platforms/darwin/home.nix
View File

@ -3,6 +3,6 @@
home.homeDirectory = "/Users/stephans";
home.packages = with pkgs; [
cyberduck
];
}

2
programs/bash.nix
View File

@ -39,7 +39,7 @@
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:]";

8
programs/firefox.nix
View File

@ -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;
};