diff options
| -rw-r--r-- | flake.nix | 25 | ||||
| -rw-r--r-- | machines/betsy/configuration.nix | 155 | ||||
| -rw-r--r-- | machines/betsy/hardware-configuration.nix | 73 | ||||
| -rw-r--r-- | modules/nixos/services.nix | 4 |
4 files changed, 255 insertions, 2 deletions
@@ -271,6 +271,31 @@ ]; # specialArgs = { inherit inputs; }; }; + betsy = nixpkgs.lib.nixosSystem { # this is my work laptop + modules = [ + ./machines/betsy/configuration.nix + # lix-module.nixosModules.default + + ./modules/nixos/hyprland.nix + + ./modules/nixos/bluetooth.nix + ./modules/nixos/nix-common.nix + ./modules/nixos/environment.nix + ./modules/nixos/tailscale.nix + ./modules/nixos/system-packages.nix + ./modules/nixos/services.nix + + ./modules/users/defin.nix + ./modules/users/root.nix + + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.defin = import ./home-manager/default.nix; + home-manager.extraSpecialArgs = { inherit inputs; }; + } + ]; + }; doretta = nixpkgs.lib.nixosSystem { # this is my build server modules = [ ./machines/doretta/configuration.nix diff --git a/machines/betsy/configuration.nix b/machines/betsy/configuration.nix new file mode 100644 index 0000000..8a00b9f --- /dev/null +++ b/machines/betsy/configuration.nix @@ -0,0 +1,155 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + kernelPackages = pkgs.linuxPackages_latest; # use latest kernel + # binfmt.emulatedSystems = ["aarch64-linux"]; + }; + hardware.onlykey.enable = true; + + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + + nixpkgs = { + # texlive.combined.scheme-medium; + system = "x84_64-linux"; + config.allowUnfree = true; + }; + + # Use the GRUB 2 boot loader. + # boot.loader.grub.enable = true; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + networking.hostName = "betsy"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = lib.mkDefault "US/Mountain"; + services.automatic-timezoned.enable = true; + # 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"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound. + hardware.pulseaudio.enable = false; + # OR + services.pipewire = { + enable = true; + pulse.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.defin = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + firefox + tree + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + curl + acpi # for battery utils + helix + nil + ]; + + # 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; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? + +} + diff --git a/machines/betsy/hardware-configuration.nix b/machines/betsy/hardware-configuration.nix new file mode 100644 index 0000000..96227a1 --- /dev/null +++ b/machines/betsy/hardware-configuration.nix @@ -0,0 +1,73 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/de96335a-a8ad-45a4-95af-40b745eb4059"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/33A0-8A9D"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" "umask=0077" ]; + }; + + fileSystems."/" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@root" "compress-force=zstd:5" "noatime" ]; + }; + + fileSystems."/home" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@home" "compress-force=zstd:5" "noatime" ]; + }; + + fileSystems."/nix" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@nix" "compress-force=zstd:5" "noatime" ]; + }; + + fileSystems."/persist" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@persist" "compress-force=zstd:5" "noatime" ]; + }; + + fileSystems."/swap" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@swap" "compress-force=zstd:5" "noatime" ]; + }; + + fileSystems."/var/log" = + {label = "nixos"; + fsType = "btrfs"; + options = [ "subvol=@log" "compress-force=zstd:5" "noatime" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wwp0s20f0u5c2.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index d0ec1fe..f7c22ba 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -15,7 +15,7 @@ displayManager = { sddm = { - enable = true; + # enable = true; autoNumlock = true; }; # defaultSession = "plasmawayland"; @@ -24,7 +24,7 @@ # localtimed.enable = true; # Enable the Plasma 6 Desktop Environment. - desktopManager.plasma6.enable = true; + # desktopManager.plasma6.enable = true; # Enable the X11 windowing system. xserver.enable = true; |