diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 6cb29ffa..5495b292 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -95,3 +95,6 @@ [branch] autosetuprebase = always +[user] + email = IvanMalison@gmail.com + name = Ivan Malison diff --git a/nixos/flake.nix b/nixos/flake.nix index 0acc2b69..14d47f91 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -19,6 +19,11 @@ nix.registry.nixpkgs.flake = nixpkgs; nixpkgs.overlays = [ taffybar.overlay xmonad.overlay xmonad-contrib.overlay ]; }); + piHardware = ({ ... }: { + imports = [ + nixos-hardware.nixosModules.raspberry-pi-4 + ]; + }); in { nixosConfigurations = { @@ -27,7 +32,8 @@ modules = [ tweaks ./machines/ryzen-shine.nix ]; }; biskcomp = nixpkgs.lib.nixosSystem { - modules = [ tweaks ./machines/biskcomp.nix ]; + system = "aarch64-linux"; + modules = [ tweaks piHardware ./machines/biskcomp.nix ]; }; }; }; diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix index eab5c304..f4c7b6a2 100644 --- a/nixos/machines/biskcomp.nix +++ b/nixos/machines/biskcomp.nix @@ -1,9 +1,8 @@ { imports = [ - ../raspberry-pi.nix ../jellyfin.nix - - # ../internet-computer.nix + ../internet-computer.nix + ../raspberry-pi.nix ]; networking.hostName = "biskcomp"; diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index af6eff23..bd1cbaeb 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -2,7 +2,6 @@ { imports = [ - ./base.nix ]; @@ -31,17 +30,6 @@ networking.interfaces.eth0.useDHCP = true; networking.interfaces.wlan0.useDHCP = true; - # Enable the X11 windowing system. - services.xserver = { - exportConfiguration = true; - layout = "us"; - enable = true; - desktopManager = { - plasma5.enable = true; - }; - displayManager.sddm.enable = true; - }; - powerManagement.cpuFreqGovernor = "ondemand"; fileSystems."/" = { @@ -50,8 +38,6 @@ options = [ "noatime" ]; }; - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ raspberrypi-eeprom ];