jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

droid: Update nix-on-droid config

Browse source
This commit is contained in:
Alexander Kobjolke 2025-03-03 22:42:07 +01:00
parent fdc39770f8
commit 75c91e50c1
3 changed files with 71 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

81
flake.lock generated
View file

@ -248,20 +248,21 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-droid" "nixpkgs-droid"
], ],
"nixpkgs-docs": "nixpkgs-docs",
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
"nmd": "nmd_2" "nmd": "nmd_2"
}, },
"locked": { "locked": {
"lastModified": 1688144254, "lastModified": 1720396533,
"narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=", "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
"owner": "t184256", "owner": "t184256",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"rev": "2301e01d48c90b60751005317de7a84a51a87eb6", "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "t184256", "owner": "t184256",
"ref": "release-23.05", "ref": "release-24.05",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"type": "github" "type": "github"
} }
@ -297,35 +298,51 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-droid": { "nixpkgs-docs": {
"locked": { "locked": {
"lastModified": 1704290814, "lastModified": 1705957679,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-droid": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-for-bootstrap": { "nixpkgs-for-bootstrap": {
"locked": { "locked": {
"lastModified": 1686921029, "lastModified": 1720244366,
"narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
"type": "github" "type": "github"
} }
}, },
@ -377,19 +394,25 @@
} }
}, },
"nmd_2": { "nmd_2": {
"flake": false, "inputs": {
"nixpkgs": [
"nix-on-droid",
"nixpkgs-docs"
],
"scss-reset": "scss-reset"
},
"locked": { "locked": {
"lastModified": 1666190571, "lastModified": 1705050560,
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
"owner": "rycee", "owner": "~rycee",
"repo": "nmd", "repo": "nmd",
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
"type": "gitlab" "type": "sourcehut"
}, },
"original": { "original": {
"owner": "rycee", "owner": "~rycee",
"repo": "nmd", "repo": "nmd",
"type": "gitlab" "type": "sourcehut"
} }
}, },
"nmt": { "nmt": {
@ -444,6 +467,22 @@
"stable": "stable" "stable": "stable"
} }
}, },
"scss-reset": {
"flake": false,
"locked": {
"lastModified": 1735394400,
"narHash": "sha256-XjsvC5IkG75OiTTQ2XCtyzL2JeONmUzLuCorlFsxGbQ=",
"owner": "andreymatin",
"repo": "scss-reset",
"rev": "2d71f63f45c7879eb09879d368f2cdd138cd3847",
"type": "github"
},
"original": {
"owner": "andreymatin",
"repo": "scss-reset",
"type": "github"
}
},
"snm": { "snm": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",

5
flake.nix
View file

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
stable.url = "github:NixOS/nixpkgs/nixos-24.11"; stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
@ -19,7 +19,7 @@
}; };
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-23.05"; url = "github:t184256/nix-on-droid/release-24.05";
inputs.nixpkgs.follows = "nixpkgs-droid"; inputs.nixpkgs.follows = "nixpkgs-droid";
}; };
@ -125,6 +125,7 @@
nixOnDroidConfigurations.default = nixOnDroidConfigurations.default =
with inputs; with inputs;
nix-on-droid.lib.nixOnDroidConfiguration { nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import nixpkgs-droid {};
modules = [ modules = [
./hosts/redmi ./hosts/redmi
{ nix.registry.nixpkgs.flake = nixpkgs-droid; } { nix.registry.nixpkgs.flake = nixpkgs-droid; }

11
hosts/redmi/default.nix
View file

@ -4,14 +4,14 @@
# Simply install just the packages # Simply install just the packages
environment.packages = with pkgs; [ environment.packages = with pkgs; [
# User-facing stuff that you really really want to have # User-facing stuff that you really really want to have
vim # or some other editor, e.g. nano or neovim neovim
git git
git-annex git-annex
mosh mosh
openssh openssh
wget wget
helix tmux
# Some common stuff that people expect to have # Some common stuff that people expect to have
#diffutils #diffutils
@ -29,13 +29,18 @@
#xz #xz
#zip #zip
#unzip #unzip
inetutils
]; ];
# Backup etc files instead of failing to activate generation if a file already exists in /etc # Backup etc files instead of failing to activate generation if a file already exists in /etc
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
environment.sessionVariables = {
EDITOR = "${pkgs.neovim}/bin/nvim";
};
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "22.11"; system.stateVersion = "24.05";
# Set up nix for flakes # Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''