felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-10-31 17:52:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: felix:c49a17ad8890b25e55b16aa7a443e5c2741a1712
Branches Tags
felix:master
felix:nixos-23.11
..
compare: felix:cf9345bb3d5f63213fde4c0ad0793ae70d006a03
Branches Tags
felix:master
felix:nixos-23.11

No commits in common. "c49a17ad8890b25e55b16aa7a443e5c2741a1712" and "cf9345bb3d5f63213fde4c0ad0793ae70d006a03" have entirely different histories.
c49a17ad88 ... cf9345bb3d

4 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

41
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752718651, "lastModified": 1752113600,
"narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "rev": "79264292b7e3482e5702932949de9cbb69fedf6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,12 +91,17 @@
} }
}, },
"framework-plymouth": { "framework-plymouth": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1752437979, "lastModified": 1744254441,
"narHash": "sha256-Of/7i/+NH++eA2yQxtVBy5zb1ZMYTakeHrnEFj6ecNI=", "narHash": "sha256-zpbqouGFxu0fdECX54jHPyjYEX+04kZRWZFZ4IKL58c=",
"owner": "j-pap", "owner": "j-pap",
"repo": "framework-plymouth", "repo": "framework-plymouth",
"rev": "a2f08a434cf7202301ae1a14862b88e9e52387e6", "rev": "6aa8efd36bd79660ced9b8a82495afdb0c8c1166",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +227,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1752666637, "lastModified": 1752048960,
"narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +242,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752620740, "lastModified": 1752162966,
"narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +299,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1752687322, "lastModified": 1751984180,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +356,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544651, "lastModified": 1751606940,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461", "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -36,6 +36,7 @@
framework-plymouth = { framework-plymouth = {
url = "github:j-pap/framework-plymouth"; url = "github:j-pap/framework-plymouth";
inputs.nixpkgs.follows = "nixpkgs";
}; };
# own flakes # own flakes

8
machines/configurations.nix
View file

@ -1,13 +1,12 @@
{ self, ... }: { self, ... }:
let let
inherit (self.inputs) inherit (self.inputs)
disko
framework-plymouth
nixos-hardware
nixpkgs nixpkgs
nixpkgs-unstable nixpkgs-unstable
passworts
sops-nix sops-nix
nixos-hardware
passworts
disko
; ;
nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem; nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem;
overlay-unstable = final: _prev: { overlay-unstable = final: _prev: {
@ -32,7 +31,6 @@ let
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-unstable overlay-unstable
framework-plymouth.overlays.default
(import ../overlays) (import ../overlays)
(import ../pkgs) (import ../pkgs)
]; ];

4
machines/workman/boot.nix
View file

@ -1,6 +1,6 @@
{ {
config, config,
pkgs, inputs,
... ...
}: }:
{ {
@ -18,7 +18,7 @@
plymouth = { plymouth = {
enable = true; enable = true;
theme = "framework"; theme = "framework";
themePackages = [ pkgs.framework-plymouth ]; themePackages = [ inputs.framework-plymouth.packages.${config.nixpkgs.system}.default ];
}; };
}; };
} }