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

feat: add fh

Browse source
This commit is contained in:
Felix Schröter 2023-09-13 14:01:04 +02:00
parent 1a7138d093
commit bc1f3c9465
Signed by: felschr
GPG key ID: 671E39E6744C807D
5 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
flake.lock
View file

@ -239,18 +239,20 @@
"fenix": "fenix_2", "fenix": "fenix_2",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"narHash": "sha256-9dWd0syDzoyjnhVoOCazRVA4pAAXud+cxggVlxXzJFg=", "narHash": "sha256-9dWd0syDzoyjnhVoOCazRVA4pAAXud+cxggVlxXzJFg=",
"path": "/nix/store/rg7l0383cxb616879vd42f3fcspcxiwl-source",
"rev": "674317344239e9ec768bcfe5254a16cd907c15d1", "rev": "674317344239e9ec768bcfe5254a16cd907c15d1",
"revCount": 119, "revCount": 119,
"type": "path" "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.3/018a6194-af07-7c06-aefe-4ece2331835b/source.tar.gz"
}, },
"original": { "original": {
"id": "fh", "type": "tarball",
"type": "indirect" "url": "https://flakehub.com/f/DeterminateSystems/fh/0.1.tar.gz"
} }
}, },
"flake-compat": { "flake-compat": {
@ -501,15 +503,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
"rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
"revCount": 519597, "revCount": 490791,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.519597%2Brev-a999c1cc0c9eb2095729d5aa03e0d8f7ed256780/018a3d35-4db5-76c3-aca2-de1920cf506f/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.490791+rev-e5f018cf150e29aac26c61dac0790ea023c46b24/018a8d07-c9a0-7f15-a8ce-f5c7d95cc2c9/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
@ -525,19 +527,6 @@
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz"
} }
}, },
"nixpkgs_2": {
"locked": {
"narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
"rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
"revCount": 490791,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.490791+rev-e5f018cf150e29aac26c61dac0790ea023c46b24/018a8d07-c9a0-7f15-a8ce-f5c7d95cc2c9/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1694601892, "lastModified": 1694601892,
@ -609,7 +598,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"matrix-appservices": "matrix-appservices", "matrix-appservices": "matrix-appservices",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"nvim-kitty-navigator": "nvim-kitty-navigator", "nvim-kitty-navigator": "nvim-kitty-navigator",

8
flake.nix
View file

@ -7,6 +7,11 @@
nixos-hardware.url = nixos-hardware.url =
"https://flakehub.com/f/NixOS/nixos-hardware/0.1.tar.gz"; "https://flakehub.com/f/NixOS/nixos-hardware/0.1.tar.gz";
fh = {
url = "https://flakehub.com/f/DeterminateSystems/fh/0.1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-parts = { flake-parts = {
url = "github:hercules-ci/flake-parts"; url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.nixpkgs-lib.follows = "nixpkgs";
@ -57,7 +62,7 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-parts outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, fh, flake-parts
, flake-utils, home-manager, nur, agenix, deploy-rs, pre-commit-hooks , flake-utils, home-manager, nur, agenix, deploy-rs, pre-commit-hooks
, nvim-kitty-navigator, ... }@inputs: , nvim-kitty-navigator, ... }@inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } { inputs.flake-parts.lib.mkFlake { inherit inputs; } {
@ -95,6 +100,7 @@
inherit (prev) system; inherit (prev) system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit (fh.packages.${prev.system}) fh;
inherit (self.packages.${prev.system}) deconz brlaser; inherit (self.packages.${prev.system}) deconz brlaser;
vimPlugins = prev.vimPlugins vimPlugins = prev.vimPlugins
// final.callPackage ./pkgs/vim-plugins { inherit inputs; }; // final.callPackage ./pkgs/vim-plugins { inherit inputs; };

2
home/felschr-server.nix
View file

@ -7,7 +7,7 @@
./git.nix ./git.nix
]; ];
home.packages = with pkgs; [ ncurses ]; home.packages = with pkgs; [ fh ncurses ];
programs.gpg.enable = true; programs.gpg.enable = true;
services.gpg-agent = { services.gpg-agent = {

2
home/felschr-work.nix
View file

@ -40,6 +40,8 @@ with pkgs; {
''; '';
home.packages = with pkgs; [ home.packages = with pkgs; [
fh
# system # system
gparted gparted
gnome-firmware-updater gnome-firmware-updater

2
home/felschr.nix
View file

@ -46,6 +46,8 @@
''; '';
home.packages = with pkgs; [ home.packages = with pkgs; [
fh
# system # system
gparted gparted
gnome-firmware-updater gnome-firmware-updater