diff --git a/configuration.nix b/configuration.nix index 192d4e2..440e36b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,15 +1,15 @@ # 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 - ]; + config, + pkgs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; nix = { package = pkgs.nixFlakes; @@ -65,7 +65,7 @@ # Enable the KDE Plasma Desktop Environment. services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.videoDrivers = [ "amdgpu" ]; + services.xserver.videoDrivers = ["amdgpu"]; # Configure keymap in X11 services.xserver = { @@ -101,7 +101,7 @@ users.users.tristand = { isNormalUser = true; description = "Tristan Druyen"; - extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; + extraGroups = ["networkmanager" "wheel" "libvirtd"]; shell = pkgs.fish; }; @@ -134,17 +134,16 @@ # programs.mtr.enable = true; programs.gnupg.agent = { enable = true; - enableSSHSupport = 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 = [ 22 80 443 ]; + networking.firewall.allowedTCPPorts = [22 80 443]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -156,5 +155,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 = "23.05"; # Did you read the comment? - } diff --git a/doom.d/init.el b/doom.d/init.el index 75b3e83..efa9e0b 100644 --- a/doom.d/init.el +++ b/doom.d/init.el @@ -32,7 +32,7 @@ doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode) ; 🙂 + ;;(emoji +unicode) ; 🙂 hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra ;;indent-guides ; highlighted indent columns diff --git a/flake.nix b/flake.nix index 97c88ef..968f082 100644 --- a/flake.nix +++ b/flake.nix @@ -19,28 +19,31 @@ }; outputs = { - self, home-manager, nixpkgs, tuxedo-nixos, nix-doom-emacs + self, + home-manager, + nixpkgs, + tuxedo-nixos, + nix-doom-emacs, }: { nixosConfigurations = { nixos-pulse = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix - { _module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule; } - ./home.nix - home-manager.nixosModules.home-manager - { + {_module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule;} + ./home.nix + home-manager.nixosModules.home-manager + { home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true; - } - tuxedo-nixos.nixosModules.default - { - hardware.tuxedo-control-center.enable = true; - hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default; - } + } + tuxedo-nixos.nixosModules.default + { + hardware.tuxedo-control-center.enable = true; + hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default; + } ]; }; }; }; } - diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 9678e24..e58743a 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,33 +1,37 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "uas" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "amdgpu" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "uas" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd" "amdgpu"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0"; + fsType = "ext4"; + }; boot.initrd.luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B471-B193"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/B471-B193"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";} + ]; # 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 @@ -49,5 +53,4 @@ systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.hip}" ]; - } diff --git a/home.nix b/home.nix index 35e236e..9214b48 100644 --- a/home.nix +++ b/home.nix @@ -1,12 +1,11 @@ -{ nix-doom-emacs-module, ... }: -{ - home-manager.users.tristand = { pkgs, ... }: { +{nix-doom-emacs-module, ...}: { + home-manager.users.tristand = {pkgs, ...}: { imports = [ nix-doom-emacs-module ]; nix = { - settings.experimental-features = [ "nix-command" "flakes" ]; + settings.experimental-features = ["nix-command" "flakes"]; }; programs.doom-emacs = { @@ -18,7 +17,7 @@ programs.git = { enable = true; - userName = "Tristan Druyen"; + userName = "Tristan Druyen"; userEmail = "tristan@vault81.de"; aliases = { ci = "commit"; @@ -49,6 +48,8 @@ thunderbird ]; home.stateVersion = "23.05"; + services.emacs = { + enable = true; + }; }; } -