From 179a0ca446200ab79c27d3f5f01543056b6371ff Mon Sep 17 00:00:00 2001 From: ltadeu6 Date: Thu, 2 Apr 2026 09:17:46 -0300 Subject: [PATCH] flakes --- flake.lock | 49 ++++++++++++++++++ flake.nix | 29 +++++++++++ home/ltadeu6.nix | 111 ++++++++++++++++++++++++++++++++++++++++ nixos/configuration.nix | 74 --------------------------- 4 files changed, 189 insertions(+), 74 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home/ltadeu6.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..cd4a85f --- /dev/null +++ b/flake.lock @@ -0,0 +1,49 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775077333, + "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1775002709, + "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..2f7675e --- /dev/null +++ b/flake.nix @@ -0,0 +1,29 @@ +{ + description = "NixOS configuration with flakes + Home Manager"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + home-manager = { + url = "github:nix-community/home-manager/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, nixpkgs, home-manager, ... }: + let + system = "x86_64-linux"; + in { + nixosConfigurations.Nixos = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./nixos/configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.ltadeu6 = import ./home/ltadeu6.nix; + } + ]; + }; + }; +} diff --git a/home/ltadeu6.nix b/home/ltadeu6.nix new file mode 100644 index 0000000..e05827f --- /dev/null +++ b/home/ltadeu6.nix @@ -0,0 +1,111 @@ +{ config, pkgs, ... }: + +{ + home.username = "ltadeu6"; + home.homeDirectory = "/home/ltadeu6"; + home.stateVersion = "25.11"; + + home.sessionVariables = { + MANPAGER = "most"; + fish_greeting = ""; + XCURSOR_THEME = "Breeze"; + XCURSOR_SIZE = "30"; + HYPRCURSOR_THEME = "Breeze"; + HYPRCURSOR_SIZE = "30"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + }; + + home.packages = with pkgs; [ + tor-browser + texlive.combined.scheme-full + foliate + sshfs + papirus-icon-theme + trash-cli + libreoffice + eza + wofi + killall + python3 + python3Packages.requests + cmake + gnumake + ripgrep + fd + ffmpeg + nixfmt-classic + editorconfig-core-c + man + hyprpicker + networkmanager + prismlauncher + gimp + inkscape + blender + discord-ptb + vscode + direnv + unzip + codex + zip + file-roller + clang-tools + libxml2 + gdtoolkit_4 + bat + alpaca + ispell + cartridges + libvterm + libgccjit + tenacity + gnome-connections + jsbeautifier + tmux + stylelint + html-tidy + shfmt + shellcheck + black + isort + pipenv + jq + wl-clipboard + nodejs + texlab + texliveTeTeX + gnome-boxes + android-studio + sageWithDoc + evince + poppler-utils + ]; + + home.file = { + ".config/hypr/hyprland.conf".source = ../hypr/hyprland.conf; + ".config/hypr/hyprpaper.conf".source = ../hypr/hyprpaper.conf; + + ".config/waybar/config".source = ../waybar/config; + ".config/waybar/style.css".source = ../waybar/style.css; + ".config/waybar/dracula.css".source = ../waybar/dracula.css; + + ".config/waybar/air_control.py" = { + source = ../waybar/air_control.py; + executable = true; + }; + ".config/waybar/launch.sh" = { + source = ../waybar/launch.sh; + executable = true; + }; + ".config/waybar/switch_sink.sh" = { + source = ../waybar/switch_sink.sh; + executable = true; + }; + + ".doom.d/config.el".source = ../doom/config.el; + ".doom.d/init.el".source = ../doom/init.el; + ".doom.d/packages.el".source = ../doom/packages.el; + }; + + programs.home-manager.enable = true; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f0544be..934af54 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -89,14 +89,7 @@ in { console.keyMap = "br-abnt2"; environment.sessionVariables = { - MANPAGER = "most"; - fish_greeting = ""; - XCURSOR_THEME = "Breeze"; OPENAI_API_KEY = secrets.openaiApiKey; - XCURSOR_SIZE = "30"; - HYPRCURSOR_THEME = "Breeze"; - HYPRCURSOR_SIZE = 30; - QT_QPA_PLATFORMTHEME = "qt6ct"; }; programs = { @@ -393,73 +386,6 @@ in { "storage" ]; shell = pkgs.fish; - packages = with pkgs; [ - tor-browser - texlive.combined.scheme-full - foliate - sshfs - papirus-icon-theme - trash-cli - libreoffice - eza - wofi - killall - python3 - python3Packages.requests - cmake - gnumake - ripgrep - fd - ffmpeg - nixfmt-classic - editorconfig-core-c - # spotify - man - hyprpicker - networkmanager - prismlauncher - gimp - inkscape - # (blender.override { cudaSupport = true; }) - blender - discord-ptb - vscode - direnv - unzip - codex - zip - file-roller - clang-tools - libxml2 - gdtoolkit_4 - bat - alpaca - ispell - cartridges - libvterm - libgccjit - tenacity - gnome-connections - jsbeautifier - tmux - stylelint - html-tidy - shfmt - shellcheck - black - isort - pipenv - jq - wl-clipboard - nodejs - texlab - texliveTeTeX - gnome-boxes - android-studio - sageWithDoc - evince - poppler-utils - ]; }; system.autoUpgrade.enable = true;