From 105d869bbb2c5f106b9bd96320235f36cc968aba Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sat, 2 Mar 2024 17:17:52 +0100 Subject: [PATCH] Add franz configuration --- flake.lock | 21 +++++++++++++++++++ flake.nix | 19 +++++++++++++++++ home/franz.nix | 14 +++++++++++++ hosts/franz/default.nix | 46 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 home/franz.nix create mode 100644 hosts/franz/default.nix diff --git a/flake.lock b/flake.lock index 64f752d..a1d94ea 100644 --- a/flake.lock +++ b/flake.lock @@ -79,6 +79,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709286488, + "narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=", + "owner": "nix-community", + "repo": "disko", + "rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils_3", @@ -678,6 +698,7 @@ "root": { "inputs": { "arkenfox": "arkenfox", + "disko": "disko", "firefox-addons": "firefox-addons", "flatpaks": "flatpaks", "hardware": "hardware", diff --git a/flake.nix b/flake.nix index d508517..c5ebd5e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,12 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; + + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nh = { url = "github:viperml/nh"; inputs.nixpkgs.follows = "nixpkgs"; @@ -83,6 +89,12 @@ ./hosts/ludwig ]; }; + franz = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs vars;}; + modules = [ + ./hosts/franz + ]; + }; }; # Standalone home-manager configuration entrypoint @@ -103,6 +115,13 @@ ./home/ludwig.nix ]; }; + "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs outputs vars;}; + modules = [ + ./home/franz.nix + ]; + }; # "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration { # pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance # extraSpecialArgs = {inherit inputs outputs vars;}; diff --git a/home/franz.nix b/home/franz.nix new file mode 100644 index 0000000..d8ad647 --- /dev/null +++ b/home/franz.nix @@ -0,0 +1,14 @@ +{ + inputs, + outputs, + ... +}: let +in { + imports = [ + ./global + ./features/coding + inputs.nix-colors.homeManagerModules.default + ]; + + colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; +} diff --git a/hosts/franz/default.nix b/hosts/franz/default.nix new file mode 100644 index 0000000..60d8e2f --- /dev/null +++ b/hosts/franz/default.nix @@ -0,0 +1,46 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + inputs.hardware.nixosModules.common-pc-ssd + inputs.disko.nixosModules.default + + ./hardware-configuration.nix + ./disko.nix + + ../common/global + + ../common/optional/systemd-boot.nix + ../common/optional/gnome-keyring.nix + ../common/optional/docker.nix + ]; + + nix.extraOptions = '' + download-speed = 4000 + ''; + + nixpkgs = { + overlays = [ + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + ]; + config = { + allowUnfree = true; + }; + }; + + networking.hostName = "franz"; + + programs = { + dconf.enable = true; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.11"; +}