diff --git a/birne/configuration.nix b/birne/configuration.nix deleted file mode 100644 index 1c8bec8..0000000 --- a/birne/configuration.nix +++ /dev/null @@ -1,83 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - - - - - - ]; - - # setup the NIX_PATH so modules from the repo found - nix.nixPath = [ - "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - "/var/src/fruitbasket" - ]; - - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - networking.hostName = "birne"; # Define your hostname. - networking.networkmanager.enable = true; - # enable the networkmanager applet - programs.nm-applet.enable = true; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; - networking.nameservers = [ "9.9.9.9" "1.1.1.1" ]; - - # allow brightness control - services.illum.enable = true; - - # Define the print user account - users.users.print = { - createHome = true; - isNormalUser = true; - extraGroups = [ "video" "audio" "networkmanager" ]; - group = "users"; - home = "/home/print"; - shell = pkgs.fish; - password = "print"; - }; - services.openssh.extraConfig = "DenyUsers print"; - - services.xserver.displayManager.autoLogin = { - enable = true; - user = "print"; - }; - - # TODO: systemd-service for clearing the Downloads folder @midnight - # TODO: chmod 500 Desktop - - # 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? - -} - diff --git a/flake.nix b/flake.nix index 7680158..dee6a4a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,17 +4,11 @@ sops-nix.url = github:Mic92/sops-nix; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, sops-nix, ... }@inputs: - let - overlays = [ - ]; - in { - nixosConfigurations.brine = nixpkgs.lib.nixosSystem { + outputs = { self, nixpkgs, sops-nix, ... }@inputs: { + nixosConfigurations.birne = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; modules = [ ./hosts/birne/configuration.nix - ( _: { nixpkgs.overlays = overlays; } ) ]; }; }; diff --git a/hosts/birne/configuration.nix b/hosts/birne/configuration.nix index c12d4b9..69a1d8b 100644 --- a/hosts/birne/configuration.nix +++ b/hosts/birne/configuration.nix @@ -7,47 +7,26 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware-configuration.nix - ../../modules/base.nix - ../../autoupdate.nix - ../../desktop.nix - ../../printing.nix + ../../modules/base.nix + ../../modules/autoupdate.nix + ../../modules/desktop.nix + ../../modules/printing.nix ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # wifi? - # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_16.boradcom_sta; - networking.hostName = "birne"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Set your time zone. time.timeZone = "Europe/Busingen"; - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. networking.useDHCP = false; networking.interfaces.enp1s0.useDHCP = true; - # 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; - nixpkgs.config.allowUnfree = true; nix = { package = pkgs.nixUnstable; # or versioned attributes like nix_2_4 @@ -55,9 +34,6 @@ experimental-features = nix-command flakes ''; }; - # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; # Enable CUPS to print documents. # services.printing.enable = true; @@ -66,18 +42,12 @@ # sound.enable = true; # hardware.pulseaudio.enable = true; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzkd0rNKREUk3wUOYvbEIUeAe1xsttxaNsfgOJWF2kL felix@tycho" - ]; - - # 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. - # }; + users.users.printer = { + isNormalUser = true; + password = "printer"; + extraGroups = []; + }; # List packages installed in system profile. To search, run: # $ nix search wget @@ -85,35 +55,10 @@ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget git - # firefox + 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.11"; # Did you read the comment? + system.stateVersion = "21.11"; } diff --git a/tomate/.gitkeep b/hosts/tomate/.gitkeep similarity index 100% rename from tomate/.gitkeep rename to hosts/tomate/.gitkeep diff --git a/modules/desktop.nix b/modules/desktop.nix index 0899a6f..5833acb 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -2,16 +2,18 @@ { # enable XFCE as lightweight desktop environment - services.xserver.desktopManager.xfce.enable = true; - services.xserver.displayManager.defaultSession = "xfce"; + services = { + xserver.enable = true; + xserver.desktopManager.xfce.enable = true; + xserver.displayManager.defaultSession = "xfce"; - # Configure keymap in X11 - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e,ctrl:nocaps,compose:prsc"; - - # enable touchpad support - services.xserver.libinput.enable = true; + # Configure keymap in X11 + xserver.layout = "de"; + xserver.xkbOptions = "eurosign:e,ctrl:nocaps,compose:prsc"; + # enable touchpad support + xserver.libinput.enable = true; + }; # enable sound sound.enable = true; sound.mediaKeys.enable = true;