Remove commented out code, useless comments
This commit is contained in:
@@ -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, ... }:
|
{ config, lib, pkgs, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.plymouth.enable = true;
|
boot.plymouth.enable = true;
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager = {
|
networkmanager = {
|
||||||
enable = true; # Easiest to use and most distros use this by default.
|
enable = true;
|
||||||
wifi.backend = "iwd";
|
wifi.backend = "iwd";
|
||||||
};
|
};
|
||||||
hostName = "nixos-laptop";
|
hostName = "nixos-laptop";
|
||||||
@@ -40,10 +34,8 @@
|
|||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "Europe/Madrid";
|
time.timeZone = "Europe/Madrid";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n= {
|
i18n= {
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
inputMethod = {
|
inputMethod = {
|
||||||
@@ -60,20 +52,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services = {
|
services = {
|
||||||
# xserver = {
|
|
||||||
# enable = true;
|
|
||||||
# xkb = {
|
|
||||||
# layout = "us";
|
|
||||||
# variant = "";
|
|
||||||
# };
|
|
||||||
# windowManager = {
|
|
||||||
# i3.enable = true;
|
|
||||||
# dwm.enable = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
|
|
||||||
greetd = {
|
greetd = {
|
||||||
@@ -87,10 +66,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
blueman.enable = true;
|
blueman.enable = true;
|
||||||
|
# printing.enable = true; # CUPS
|
||||||
# printing.enable = true; # Enable CUPS to print documents.
|
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
|
|
||||||
auto-cpufreq.enable = true;
|
auto-cpufreq.enable = true;
|
||||||
thermald.enable = true;
|
thermald.enable = true;
|
||||||
|
|
||||||
@@ -113,8 +90,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
pulseaudio.enable = false;
|
pulseaudio.enable = false;
|
||||||
|
|
||||||
# System76 Devices
|
|
||||||
system76.enableAll = true;
|
system76.enableAll = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -132,23 +107,6 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
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 = {
|
nix.settings = {
|
||||||
substituters = ["https://hyprland.cachix.org"];
|
substituters = ["https://hyprland.cachix.org"];
|
||||||
@@ -159,7 +117,7 @@
|
|||||||
nix.gc = {
|
nix.gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "weekly";
|
||||||
options = "--delete-older-than 20d";
|
options = "--delete-older-than 10d";
|
||||||
};
|
};
|
||||||
nix.optimise = {
|
nix.optimise = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
@@ -169,7 +127,7 @@
|
|||||||
users.users.liamm = {
|
users.users.liamm = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "liamm";
|
description = "liamm";
|
||||||
extraGroups = [ "networkmanager" "wheel" "disk" "power" "video" "davfs2" "input" ]; # Enable ‘sudo’ for the user.
|
extraGroups = [ "networkmanager" "wheel" "disk" "power" "video" "davfs2" "input" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
@@ -181,8 +139,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
nix-ld.enable = true;
|
nix-ld.enable = true;
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
mtr.enable = true;
|
mtr.enable = true;
|
||||||
gnupg.agent = {
|
gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -198,10 +154,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
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
|
fd
|
||||||
file
|
file
|
||||||
ripgrep
|
ripgrep
|
||||||
@@ -226,7 +180,6 @@
|
|||||||
portal = {
|
portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wlr.enable = true;
|
wlr.enable = true;
|
||||||
# gtkUsePortal = true;
|
|
||||||
extraPortals = with pkgs;[
|
extraPortals = with pkgs;[
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
xdg-desktop-portal-wlr
|
xdg-desktop-portal-wlr
|
||||||
@@ -240,9 +193,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
# services.openssh.enable = true;
|
# services.openssh.enable = true;
|
||||||
|
|
||||||
# This option defines the first version of NixOS you have installed on this particular machine
|
# This option defines the first version of NixOS you have installed on this particular machine
|
||||||
|
|||||||
+6
-16
@@ -7,6 +7,8 @@
|
|||||||
imports = [
|
imports = [
|
||||||
# home-manager
|
# home-manager
|
||||||
inputs.ags.homeManagerModules.default
|
inputs.ags.homeManagerModules.default
|
||||||
|
|
||||||
|
# general modules
|
||||||
../../modules/home-manager/dunst.nix
|
../../modules/home-manager/dunst.nix
|
||||||
../../modules/home-manager/tmux.nix
|
../../modules/home-manager/tmux.nix
|
||||||
../../modules/home-manager/fastfetch.nix
|
../../modules/home-manager/fastfetch.nix
|
||||||
@@ -16,14 +18,12 @@
|
|||||||
../../modules/desktop/bluetooth.nix
|
../../modules/desktop/bluetooth.nix
|
||||||
../../modules/desktop/hyprland.nix
|
../../modules/desktop/hyprland.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# You should not change this value, even if you update Home Manager. If you do
|
# 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
|
# want to update the value, then make sure to first check the Home Manager
|
||||||
# release notes.
|
# release notes.
|
||||||
home.stateVersion = "23.11"; # Please read the comment before changing.
|
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;
|
nixpkgs.config.allowUnfree = true;
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
android-studio
|
android-studio
|
||||||
@@ -68,7 +68,6 @@
|
|||||||
protonvpn-gui
|
protonvpn-gui
|
||||||
qbittorrent
|
qbittorrent
|
||||||
signal-desktop
|
signal-desktop
|
||||||
slstatus
|
|
||||||
swww
|
swww
|
||||||
teams-for-linux
|
teams-for-linux
|
||||||
texliveFull
|
texliveFull
|
||||||
@@ -82,15 +81,7 @@
|
|||||||
zoom-us
|
zoom-us
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
home.file = {};
|
||||||
# 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.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "emacsclient";
|
EDITOR = "emacsclient";
|
||||||
@@ -176,8 +167,8 @@
|
|||||||
"user-dirs.dirs".source = ../../modules/non-nix_configs/user-dirs.dirs;
|
"user-dirs.dirs".source = ../../modules/non-nix_configs/user-dirs.dirs;
|
||||||
"user-dirs.locale".source = ../../modules/non-nix_configs/user-dirs.locale;
|
"user-dirs.locale".source = ../../modules/non-nix_configs/user-dirs.locale;
|
||||||
};
|
};
|
||||||
# BEGIN PROGRAMS
|
|
||||||
|
|
||||||
|
# BEGIN PROGRAMS
|
||||||
programs = {
|
programs = {
|
||||||
ags = {
|
ags = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -246,7 +237,6 @@
|
|||||||
obs-studio = {
|
obs-studio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
# swaylock.enable = true;
|
|
||||||
waybar = {
|
waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
@@ -268,7 +258,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
arguments = [
|
arguments = [
|
||||||
"-c"
|
"-c"
|
||||||
"-a emacs"
|
"-a emacs"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
startWithUserSession = "graphical";
|
startWithUserSession = "graphical";
|
||||||
|
|||||||
Reference in New Issue
Block a user