diff --git a/flake.nix b/flake.nix index 7515f93e..e6859d09 100644 --- a/flake.nix +++ b/flake.nix @@ -50,11 +50,11 @@ # end ANTI CORRUPTION LAYER # PubSolarOS additions - nix-dram.url = "github:dramforever/nix-dram"; + # nix-dram.url = "github:dramforever/nix-dram"; # b12f additions - b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; - b12f-nix-fonts.inputs.nixpkgs.follows = "latest"; + # b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; + # b12f-nix-fonts.inputs.nixpkgs.follows = "latest"; }; outputs = @@ -68,8 +68,8 @@ , agenix , nvfetcher , deploy - , nix-dram - , b12f-nix-fonts + # , nix-dram + # , b12f-nix-fonts , ... } @ inputs: digga.lib.mkFlake @@ -87,8 +87,8 @@ agenix.overlay nvfetcher.overlay deploy.overlay - nix-dram.overlay - b12f-nix-fonts.overlay + # nix-dram.overlay + # b12f-nix-fonts.overlay ./pkgs/default.nix ]; }; @@ -133,9 +133,9 @@ suites = with profiles; rec { base = [ core users.nixos users.root ]; pubsolaros = [ core base-user users.root ]; - anonymous = [ pubsolaros users.nixos ]; - b12f = [ pubsolaros users.ben ]; - biolimo = [ b12f graphical ]; + anonymous = pubsolaros ++ [ users.nixos ]; + b12f = pubsolaros ++ [ users.ben ]; + biolimo = b12f ++ [ graphical ]; }; }; }; diff --git a/hosts/biolimo/configuration.nix b/hosts/biolimo/configuration.nix index 76207fd3..9f4a341a 100644 --- a/hosts/biolimo/configuration.nix +++ b/hosts/biolimo/configuration.nix @@ -15,82 +15,12 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - - - - # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # wget vim - # firefox - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? - + system.stateVersion = "20.09"; # Did you read the comment? } diff --git a/profiles/core/default.nix b/profiles/core/default.nix index f0f8b407..3f56c5c8 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -90,7 +90,7 @@ in }; nix = { - package = pkgs.nix-dram; + # package = pkgs.nix-dram; autoOptimiseStore = true; diff --git a/users/ben/default.nix b/users/ben/default.nix index a0d66f54..693ec661 100644 --- a/users/ben/default.nix +++ b/users/ben/default.nix @@ -32,6 +32,6 @@ in ]; }; - fonts.fonts = lib.attrValues pkgs.b12f.fonts; + # fonts.fonts = lib.attrValues pkgs.b12f.fonts; }; }