diff --git a/.gitignore b/.gitignore index 260dba0..603d261 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,5 @@ config/mpv/shaders # locks **/*-lock.json config/spicetify/Backup -nixos/hardware-configuration.nix +# nixos/hardware-configuration.nix result diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fd809c0..8deeda0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -110,16 +110,10 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - alacritty - bat cargo celluloid - duf - exa - fd firefox flatpak - fzf gcc git glib @@ -134,29 +128,14 @@ gnomeExtensions.go-to-last-workspace gnomeExtensions.hibernate-status-button gnomeExtensions.just-perfection - imv - jq - lazygit luajitPackages.luarocks - mpv - neovim - neovim - nodePackages.pnpm - nodejs - python3 - ripgrep rustc - sd - signal-desktop - starship - tealdeer - tmux tree-sitter wget wl-clipboard xdg-utils - zellij zsh + starship ]; diff --git a/nixos/configuration.nix.old b/nixos/configuration.nix.old new file mode 100644 index 0000000..825910d --- /dev/null +++ b/nixos/configuration.nix.old @@ -0,0 +1,219 @@ +# 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, lib, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Santiago"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "es_CL.UTF-8"; + LC_IDENTIFICATION = "es_CL.UTF-8"; + LC_MEASUREMENT = "es_CL.UTF-8"; + LC_MONETARY = "es_CL.UTF-8"; + LC_NAME = "es_CL.UTF-8"; + LC_NUMERIC = "es_CL.UTF-8"; + LC_PAPER = "es_CL.UTF-8"; + LC_TELEPHONE = "es_CL.UTF-8"; + LC_TIME = "es_CL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.sddm.theme = "catppuccin-macchiato"; + systemd.services.sddm.serviceConfig.TimeoutStartSec = lib.mkForce "5s"; + # services.xserver.displayManager.gdm.wayland = true; + # services.xserver.desktopManager.gnome.enable = true; + # enable sway window manager + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + extraSessionCommands = '' + export MOZ_ENABLE_WAYLAND=1 + ''; + }; + programs.waybar.enable = true; + + services.dbus.enable = true; + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + }; + + # Configure keymap in X11 + services.xserver = { + layout = "latam"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "la-latin1"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.aleidk = { + isNormalUser = true; + description = "aleidk"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + ]; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + alacritty + bat + bemenu + cargo + duf + exa + fd + flatpak + fzf + gcc + git + glib + gnome.gnome-software + gnome.gnome-tweaks + gnomeExtensions.hibernate-status-button + grim + grim #screenshots + hyprland + hyprpaper + jq + lazygit + luajitPackages.luarocks + mako + mako + neovim + nodejs + ripgrep + rustc + sd + slurp + slurp # screenshot + starship + swayidle + swaylock-effects + swaycons + tealdeer + tmux + tree-sitter + wget + wl-clipboard + wl-clipboard + xdg-utils + zellij + zsh + brightnessctl + libnotify + autotiling + wdisplays + imv + mpv + celluloid + swappy + signal-desktop + squeekboard + python3 + nodePackages.pnpm + (callPackage ./theme.nix { }).sddm-catppucin-theme + ]; + + # 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; + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # 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? + + services.flatpak.enable = true; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + system.autoUpgrade.enable = true; + + + programs.zsh.enable = true; + + users.defaultUserShell = pkgs.zsh; + environment.shells = with pkgs; [ zsh ]; + + fonts.fonts = with pkgs; [ + (nerdfonts.override { + fonts = [ + "JetBrainsMono" + ]; + } + ) + ]; + +} diff --git a/nixos/flake.lock b/nixos/flake.lock new file mode 100644 index 0000000..b9d5996 --- /dev/null +++ b/nixos/flake.lock @@ -0,0 +1,48 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690476848, + "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1690272529, + "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nixos/flake.nix b/nixos/flake.nix index a09f2e0..a37b8d6 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -8,19 +8,25 @@ # https://nixos-and-flakes.thiscute.world/nixos-with-flakes/nixos-with-flakes-enabled#managing-system-packages-with-flakes inputs = { - nixpkgs.url = "nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, ... }@inputs: { + outputs = inputs@{ self, nixpkgs, home-manager, ... }: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.aleidk = import ./home.nix; + } ]; }; }; diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..0bd2bdf --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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 = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ebce2605-6746-43e4-a4dd-dc72fdc466f2"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-bacdd08a-d075-4546-8b16-77670db803fa".device = "/dev/disk/by-uuid/bacdd08a-d075-4546-8b16-77670db803fa"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3E31-5FDC"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/eb607945-d38f-4b3e-b9c9-eddca8946a36"; } + ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/home.nix b/nixos/home.nix new file mode 100644 index 0000000..e91b650 --- /dev/null +++ b/nixos/home.nix @@ -0,0 +1,49 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the + # paths it should manage. + home.username = "aleidk"; + home.homeDirectory = "/home/aleidk"; + programs.git = { + enable = true; + userName = "aleidk"; + userEmail = "ale.navarro.parra@gmail.com"; + }; + + home.packages = with pkgs; [ + alacritty + bat + duf + exa + fd + fzf + imv + jq + lazygit + mpv + neovim + nodePackages.pnpm + nodejs + python3 + ripgrep + sd + signal-desktop + tealdeer + tmux + zellij + ]; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + home.stateVersion = "23.05"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +}