From 7fd2aa4e04f5db649354acd3f20d13c1efe4f2b2 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Fri, 6 Dec 2024 17:09:06 +0100 Subject: [PATCH] Remove commented out code, useless comments --- hosts/default/configuration.nix | 62 ++++----------------------------- hosts/default/home.nix | 22 ++++-------- 2 files changed, 12 insertions(+), 72 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index cb20916..5f83324 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -1,24 +1,18 @@ -# 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, inputs, ... }: { - imports = - [ # Include the results of the hardware scan. + imports = [ ./hardware-configuration.nix inputs.home-manager.nixosModules.default ]; - # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.plymouth.enable = true; networking = { networkmanager = { - enable = true; # Easiest to use and most distros use this by default. + enable = true; wifi.backend = "iwd"; }; hostName = "nixos-laptop"; @@ -40,10 +34,8 @@ # networking.firewall.allowedUDPPorts = [ ... ]; }; - # Set your time zone. time.timeZone = "Europe/Madrid"; - # Select internationalisation properties. i18n= { defaultLocale = "en_US.UTF-8"; inputMethod = { @@ -60,20 +52,7 @@ }; }; - # Enable the X11 windowing system. services = { - # xserver = { - # enable = true; - # xkb = { - # layout = "us"; - # variant = ""; - # }; - # windowManager = { - # i3.enable = true; - # dwm.enable = true; - # }; - # }; - libinput.enable = true; greetd = { @@ -87,10 +66,8 @@ }; blueman.enable = true; - - # printing.enable = true; # Enable CUPS to print documents. + # printing.enable = true; # CUPS gvfs.enable = true; - auto-cpufreq.enable = true; thermald.enable = true; @@ -113,8 +90,6 @@ ]; }; pulseaudio.enable = false; - - # System76 Devices system76.enableAll = true; }; @@ -132,23 +107,6 @@ ]; nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [ - (final: prev: { - dwm = prev.dwm.overrideAttrs (old: {url = "github:Liam-Malone/dwm";}); - }) - (final: prev: { - dmenu = prev.dmenu.overrideAttrs (old: {url = "github:Liam-Malone/dmenu";}); - }) - (final: prev: { - slstatus = prev.slstatus.overrideAttrs (old: {url = "github:Liam-Malone/slstatus";}); - }) - ]; - # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - # "steam" - # "steam-original" - # "steam-run" - # ]; - nix.settings = { substituters = ["https://hyprland.cachix.org"]; @@ -159,7 +117,7 @@ nix.gc = { automatic = true; dates = "weekly"; - options = "--delete-older-than 20d"; + options = "--delete-older-than 10d"; }; nix.optimise = { automatic = true; @@ -169,7 +127,7 @@ users.users.liamm = { isNormalUser = true; description = "liamm"; - extraGroups = [ "networkmanager" "wheel" "disk" "power" "video" "davfs2" "input" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "networkmanager" "wheel" "disk" "power" "video" "davfs2" "input" ]; }; programs = { @@ -181,8 +139,6 @@ }; nix-ld.enable = true; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. mtr.enable = true; gnupg.agent = { enable = true; @@ -198,10 +154,8 @@ }; }; - # 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. + vim fd file ripgrep @@ -226,7 +180,6 @@ portal = { enable = true; wlr.enable = true; - # gtkUsePortal = true; extraPortals = with pkgs;[ xdg-desktop-portal-gtk xdg-desktop-portal-wlr @@ -240,9 +193,6 @@ }; }; - # List services that you want to enable: - - # Enable the OpenSSH daemon. # services.openssh.enable = true; # This option defines the first version of NixOS you have installed on this particular machine diff --git a/hosts/default/home.nix b/hosts/default/home.nix index d67e7ff..6869b29 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -7,6 +7,8 @@ imports = [ # home-manager inputs.ags.homeManagerModules.default + + # general modules ../../modules/home-manager/dunst.nix ../../modules/home-manager/tmux.nix ../../modules/home-manager/fastfetch.nix @@ -16,14 +18,12 @@ ../../modules/desktop/bluetooth.nix ../../modules/desktop/hyprland.nix ]; + # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. home.stateVersion = "23.11"; # Please read the comment before changing. - # The home.packages option allows you to install Nix packages into your - # environment. - nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [ android-studio @@ -68,7 +68,6 @@ protonvpn-gui qbittorrent signal-desktop - slstatus swww teams-for-linux texliveFull @@ -82,15 +81,7 @@ zoom-us ]; - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - }; + home.file = {}; home.sessionVariables = { EDITOR = "emacsclient"; @@ -176,8 +167,8 @@ "user-dirs.dirs".source = ../../modules/non-nix_configs/user-dirs.dirs; "user-dirs.locale".source = ../../modules/non-nix_configs/user-dirs.locale; }; - # BEGIN PROGRAMS + # BEGIN PROGRAMS programs = { ags = { enable = true; @@ -246,7 +237,6 @@ obs-studio = { enable = true; }; - # swaylock.enable = true; waybar = { enable = true; systemd.enable = true; @@ -268,7 +258,7 @@ enable = true; arguments = [ "-c" - "-a emacs" + "-a emacs" ]; }; startWithUserSession = "graphical";