From dea19e0b3b80638a3b43c10db40ba4796a3b6548 Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Thu, 7 Nov 2024 09:59:01 +0100 Subject: [PATCH] Various formatting changes --- .../andreas@nixos-wsl/default.nix | 39 +++++++++++++++++++ .../andreas@th0nkpad-nixos/default.nix | 0 shells/.gitkeep | 0 .../th0nkpad-nixos/configuration.nix | 17 +++----- .../x86_64-linux/th0nkpad-nixos/default.nix | 37 +++++++++--------- 5 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 homes/x86_64-linux/andreas@nixos-wsl/default.nix create mode 100644 homes/x86_64-linux/andreas@th0nkpad-nixos/default.nix create mode 100644 shells/.gitkeep diff --git a/homes/x86_64-linux/andreas@nixos-wsl/default.nix b/homes/x86_64-linux/andreas@nixos-wsl/default.nix new file mode 100644 index 0000000..78afee7 --- /dev/null +++ b/homes/x86_64-linux/andreas@nixos-wsl/default.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (lib.mine) enabled; +in { + imports = [ + ../modules.nix + ]; + mine.home = { + gui-apps = { + hexchat = enabled; + }; + networking = enabled; + sops.secrets.deploy_ed25519 = { + mode = "0400"; + path = "${config.home.homeDirectory}/.ssh/deploy_ed25519"; + }; + tui.neomutt.personalEmail = true; + personal-apps = enabled; + suites.laptop = enabled; + user.settings = { + stylix = { + fonts = { + terminalSize = 10.0; + waybarSize = 12; + }; + image = ../../../systems/x86_64-linux/ironman-laptop/ffvii.jpg; + }; + transparancy.terminalOpacity = 0.85; + }; + waybar.resolution = 768; + }; + home = { + packages = [pkgs.tochd]; + }; +} diff --git a/homes/x86_64-linux/andreas@th0nkpad-nixos/default.nix b/homes/x86_64-linux/andreas@th0nkpad-nixos/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/shells/.gitkeep b/shells/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/systems/x86_64-linux/th0nkpad-nixos/configuration.nix b/systems/x86_64-linux/th0nkpad-nixos/configuration.nix index 67cde09..cd9e7f6 100644 --- a/systems/x86_64-linux/th0nkpad-nixos/configuration.nix +++ b/systems/x86_64-linux/th0nkpad-nixos/configuration.nix @@ -44,29 +44,25 @@ LC_TELEPHONE = "nl_NL.UTF-8"; LC_TIME = "nl_NL.UTF-8"; }; - - # Enable the X11 windowing system. + # Enable the X11 windowing system services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. + # 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"; variant = "intl"; }; - # Configure console keymap console.keyMap = "us-acentos"; - - # Enable CUPS to print documents. + # Enable CUPS to print documents services.printing.enable = true; - - # Enable sound with pipewire. + # Enable sound with pulse (pipewire) hardware.pulseaudio.enable = false; + # Enable realtimekit (pulse requirement) security.rtkit.enable = true; + # Configure pipewire service services.pipewire = { enable = true; alsa.enable = true; @@ -106,5 +102,4 @@ # 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 = "24.05"; # Did you read the comment? - } diff --git a/systems/x86_64-linux/th0nkpad-nixos/default.nix b/systems/x86_64-linux/th0nkpad-nixos/default.nix index 0f3d067..f25ae57 100644 --- a/systems/x86_64-linux/th0nkpad-nixos/default.nix +++ b/systems/x86_64-linux/th0nkpad-nixos/default.nix @@ -3,25 +3,24 @@ { # Snowfall Lib provides a customized `lib` instance with access to your flake's library # as well as the libraries available from your flake's inputs. - lib -, # An instance of `pkgs` with your overlays and packages applied is also available. - pkgs -, # You also have access to your flake's inputs. - inputs -, # Additional metadata is provided by Snowfall Lib. - namespace -, # The namespace used for your flake, defaulting to "internal" if not set. - system -, # The system architecture for this host (eg. `x86_64-linux`). - target -, # The Snowfall Lib target for this system (eg. `x86_64-iso`). - format -, # A normalized name for the system target (eg. `iso`). - virtual -, # A boolean to determine whether this system is a virtual target using nixos-generators. - systems -, # An attribute map of your defined hosts. - + lib, + # An instance of `pkgs` with your overlays and packages applied is also available. + pkgs, + # You also have access to your flake's inputs. + inputs, + # Additional metadata is provided by Snowfall Lib. + # The namespace used for your flake, defaulting to "internal" if not set. + namespace, + # The system architecture for this host (eg. `x86_64-linux`). + system, + # The Snowfall Lib target for this system (eg. `x86_64-iso`). + target, + # A normalized name for the system target (eg. `iso`). + format, + # A boolean to determine whether this system is a virtual target using nixos-generators. + virtual, + # An attribute map of your defined hosts. + systems, # All other arguments come from the system system. config , ...