rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-18 17:11:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

flake cleanup and iso tweaks

Browse source
This commit is contained in:
Rouven Seifert 2023-05-05 16:17:31 +02:00
parent 5cdb4af753
commit 6be5f6a151
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
6 changed files with 31 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682977601, "lastModified": 1683196088,
"narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=", "narHash": "sha256-MO4i1ceO2WqwyEn/iggDyMOWMVUb0oIicRpfY4MgNko=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6", "rev": "6abb775e75a7f25451781dc704cfe03f27ad7496",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682980127, "lastModified": 1683186212,
"narHash": "sha256-gR9nRwiq1TGtc83SpDnaBcjnEbnOJks4oDDhduGVEZQ=", "narHash": "sha256-yX8IvlTZk/RoNWS7GuOWv4C3rnR/supXfK9hw1O5biY=",
"owner": "therealr5", "owner": "therealr5",
"repo": "purge", "repo": "purge",
"rev": "82a64f778ee5edb2af95236077afef237a150104", "rev": "b5c626728aced5c7b5243f6c6ace69be39197d00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +272,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683019282, "lastModified": 1683186719,
"narHash": "sha256-MfX/KiPTRllSzeRu3sBdLR2SpbNASL7LLxhUKbes6NQ=", "narHash": "sha256-BWSTeVPlqjkQ5J5M5WAeNKqUhHwVQXddfQaQek8qWRU=",
"owner": "therealr5", "owner": "therealr5",
"repo": "trucksimulatorbot-images", "repo": "trucksimulatorbot-images",
"rev": "a2b6a62af5ff0a9bbf25200b9a296ccf12c8df2c", "rev": "b7952feb4f1620e9f5f984d8f08aa4679d9b0177",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
flake.nix
View file

@ -1,13 +1,24 @@
{ {
description = "My nix setup"; description = "My nix setup";
inputs = { inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
impermanence.url = "github:nix-community/impermanence";
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware = {
url = "github:nixos/nixos-hardware";
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs = { inputs = {
@ -15,27 +26,8 @@
}; };
}; };
impermanence = { nix-colors.url = "github:Misterio77/nix-colors";
url = "github:nix-community/impermanence"; hyprland.url = "github:hyprwm/Hyprland/";
};
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-colors = {
url = "github:Misterio77/nix-colors";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland/";
};
purge = { purge = {
url = "github:therealr5/purge"; url = "github:therealr5/purge";

1
hosts/falkenstein-1/default.nix
View file

@ -38,6 +38,7 @@
wget wget
htop-vim htop-vim
comma comma
hx
]; ];
programs.git = { programs.git = {
enable = true; enable = true;

1
hosts/iso/default.nix
View file

@ -10,6 +10,7 @@
keyMap = "dvorak"; keyMap = "dvorak";
}; };
programs.git.enable = true; programs.git.enable = true;
services.fwupd.enable = true;
# in case we need to rescue a zfs machine # in case we need to rescue a zfs machine
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;

1
hosts/nuc/default.nix
View file

@ -40,6 +40,7 @@
wget wget
htop-vim htop-vim
comma comma
helix
]; ];
programs.git = { programs.git = {
enable = true; enable = true;

4
pkgs/jmri/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, lib, ant, jdk, ... }: { stdenv, fetchFromGitHub, lib, ant, jdk, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jmri"; pname = "jmri";
version = "v5.3.5"; version = "5.3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jmri"; owner = "jmri";
repo = "jmri"; repo = "jmri";
rev = version; rev = "v${version}";
hash = "sha256-q3p9G16KhUjC3uUazNFDzAeKFIWu2BTds/Q1yhtSqPc="; hash = "sha256-q3p9G16KhUjC3uUazNFDzAeKFIWu2BTds/Q1yhtSqPc=";
}; };