diff --git a/.dotter/global.toml b/.dotter/global.toml index aa00ade..14359f7 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -1,20 +1,20 @@ [default.files] -fish = "~/.config/fish/" -utils = "~/.local/bin/dotutils/" -ideavim = "~/.ideavimrc" -'astronvim/plugins' = "~/.config/nvim/lua/plugins/" -'astronvim/community.lua' = "~/.config/nvim/lua/community.lua" -vimrc = "~/.vimrc" -halig = "~/.config/halig" -"k9smocha.yaml" = "~/.config/k9s/skins/mocha.yaml" -sshconfig = "~/.ssh/config" -gitconfig = "~/.gitconfig" -allowed_signers = "~/.ssh/allowed_signers" -'topgrade.toml' = "~/.config/topgrade.toml" -kitty = "~/.config/kitty" -bat = "~/.config/bat" -'mangohud.conf' = "~/.config/MangoHud/MangoHud.conf" -"gamemode.ini" = "~/.config/gamemode.ini" -"timewarrior.cfg" = "~/.config/timewarrior/timewarrior.cfg" -"tmux.conf" = "~/.tmux.conf" -"atuin.toml" = "~/.config/atuin/config.toml" +"conf.d/fish" = "~/.config/fish/" +"conf.d/utils" = "~/.local/bin/dotutils/" +"conf.d/ideavim" = "~/.ideavimrc" +'conf.d/astronvim/plugins' = "~/.config/nvim/lua/plugins/" +'conf.d/astronvim/community.lua' = "~/.config/nvim/lua/community.lua" +"conf.d/vimrc" = "~/.vimrc" +"conf.d/halig" = "~/.config/halig" +"conf.d/k9smocha.yaml" = "~/.config/k9s/skins/mocha.yaml" +"conf.d/sshconfig" = "~/.ssh/config" +"conf.d/gitconfig" = "~/.gitconfig" +"conf.d/allowed_signers" = "~/.ssh/allowed_signers" +"conf.d/topgrade.toml" = "~/.config/topgrade.toml" +"conf.d/kitty" = "~/.config/kitty" +"conf.d/bat" = "~/.config/bat" +"conf.d/mangohud.conf" = "~/.config/MangoHud/MangoHud.conf" +"conf.d/gamemode.ini" = "~/.config/gamemode.ini" +"conf.d/timewarrior.cfg" = "~/.config/timewarrior/timewarrior.cfg" +"conf.d/tmux.conf" = "~/.tmux.conf" +"conf.d/atuin.toml" = "~/.config/atuin/config.toml" diff --git a/README.md b/README.md index dbc1284..8cecec6 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,10 @@ # dots -This repository contains my dotfiles and a Nix flake that supports multiple hosts (machines) with a shared base and per-host configuration. +# limgrave -## Nix Configuration - -The Nix configuration is located in the `nix/` directory. It uses a shared Home Manager configuration for all hosts, while allowing host-specific NixOS or package settings. - -### Structure - -- `nix/flake.nix`: Entry point, defines hosts and helpers. -- `nix/home/`: Shared Home Manager configuration (packages, shell, GNOME settings). -- `nix/hosts/`: Host-specific NixOS configurations. - -### Adding New Hosts - -#### NixOS Hosts -1. Create a directory in `nix/hosts//`. -2. Add `configuration.nix`, `hardware-configuration.nix`, and `packages.nix` there. -3. Add the host to `nixosConfigurations` in `nix/flake.nix`: - ```nix - limgrave = mkNixos "limgrave" [ - nix-snapd.nixosModules.default - autofirma-nix.nixosModules.default - ]; - ``` - -#### Non-NixOS Hosts (e.g., Ubuntu) -1. Add the host to `homeConfigurations` in `nix/flake.nix`: - ```nix - "catalin@ubuntu" = mkHome "ubuntu" "catalin" [ ]; - ``` - *Note: `mkHome` takes `hostname`, `username`, and additional modules.* - -### Building and Applying - -#### NixOS -Run from the root of the repository: -```bash -sudo nixos-rebuild switch --flake .#hostname -``` - -#### Non-NixOS (Home Manager) -Run from the root of the repository: -```bash -home-manager switch --flake ./nix#user@hostname +```shell +sudo nixos-rebuild switch --flake ~/.dotfiles#limgrave --upgrade # first time +dotter # create dotfiles symlinks +nh os switch ~/.dotfiles/ # after +nh home switch ~/.dotfiles # home manager ``` \ No newline at end of file diff --git a/ansible/main.yml b/ansible/main.yml deleted file mode 100644 index 611e1d9..0000000 --- a/ansible/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- hosts: localhost - gather_facts: true - tasks: - - import_role: - name: packages diff --git a/ansible/requirements.yml b/ansible/requirements.yml deleted file mode 100644 index 052506b..0000000 --- a/ansible/requirements.yml +++ /dev/null @@ -1,2 +0,0 @@ -collections: - - name: kewlfft.aur diff --git a/ansible/roles/packages/tasks/arch.yml b/ansible/roles/packages/tasks/arch.yml deleted file mode 100644 index 76f27da..0000000 --- a/ansible/roles/packages/tasks/arch.yml +++ /dev/null @@ -1,92 +0,0 @@ ---- -- name: Install Arch packages - become: true - ansible.builtin.package: - name: - # gnome - - gnome - - gnome-extra - - gnome-bluetooth-3.0 - - gnome-control-center - - gnome-shell-extensions - - gnome-themes-extra - - gnome-browser-connector - - gnome-tweaks - - # dbs - - postgresql-client - - freetds - - unixodbc - - # work - - azure-cli - - # bluetooth - - bluez - - bluez-utils - - bluez-deprecated-tools - - # containers - - docker - - docker-buildx - - docker-compose - - # gayming - - steam - - steam-native-runtime - - mangohud - - lib32-mangohud - - gamemode - - lib32-gamemode - - mesa - - # utils - - python-virtualenv - - asciinema - - trash-cli - - git - - base-devel - - bubblewrap - - libseccomp - - xz - - shellcheck - - python-pipx - - python-gobject - - # fonts - - noto-fonts-cjk - - noto-fonts-emoji - - noto-fonts - - ttf-liberation - - ttf-inconsolata - - ttf-fira-code - - # misc - - networkmanager - - firefox - - lutris - - nodejs - - npm - - fd - - less - - timew - - man - state: present - -- name: Install aur packages - kewlfft.aur.aur: - name: - - visual-studio-code-bin - - python-pyodbc - - protonut-qt - - jetbrains-toolbox - - snapd - - gnome-shell-extension-dash-to-dock-git - - catppuccin-gtk-theme-mocha - - tree-sitter-git - - neovim-git - - papirus-icon-theme-git - - pop-launcher-git - state: present - tags: - - aur diff --git a/ansible/roles/packages/tasks/curlers.yml b/ansible/roles/packages/tasks/curlers.yml deleted file mode 100644 index 246e773..0000000 --- a/ansible/roles/packages/tasks/curlers.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Execute curl installers - ansible.builtin.shell: "curl -sSfL {{ item }} | bash" - loop: "{{ curl_install_urls }}" - tags: - - curl diff --git a/ansible/roles/packages/tasks/debian.yml b/ansible/roles/packages/tasks/debian.yml deleted file mode 100644 index dd08c78..0000000 --- a/ansible/roles/packages/tasks/debian.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- name: Install Debian packages - ansible.builtin.package: - name: - - rofi-dev - - g++ - - nodejs - - npm - - python3.11-venv - - parallel - - postgresql-client-common - - libnss3-tools - - hwinfo - - rsync - - nmap - - nodejs - - unixodbc - - unixodbc-dev - - freetds-bin - - freetds-common - - freetds-dev - - unzip - state: present - tags: - - debian - -- name: Install Debian GUI packages - ansible.builtin.package: - name: - - rofi-dev - - qalculate-gtk - - snapd - state: present - tags: - - debian - - gui diff --git a/ansible/roles/packages/tasks/flatpak.yml b/ansible/roles/packages/tasks/flatpak.yml deleted file mode 100644 index b97374f..0000000 --- a/ansible/roles/packages/tasks/flatpak.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Install flatpak packages - community.general.flatpak: - name: - - com.github.iwalton3.jellyfin-media-player - - com.stremio.Stremio - - dev.geopjr.Tuba - - org.telegram.desktop - - com.tutanota.Tutanota - - org.gnome.DejaDup - - com.bitwarden.desktop - - com.spotify.Client - - org.qbittorrent.qBittorrent - - app/com.nextcloud.desktopclient.nextcloud/x86_64/stable - - net.lutris.Lutris - - io.github.diegoivanme.flowtime - - org.gnome.Decibels - - net.davidotek.pupgui2 - - dev.vencord.Vesktop - - com.discordapp.Discord - - com.google.Chrome - - rest.insomnia.Insomnia - - com.github.neithern.g4music - method: "user" diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml deleted file mode 100644 index dd202e2..0000000 --- a/ansible/roles/packages/tasks/main.yml +++ /dev/null @@ -1,90 +0,0 @@ -- name: Install CLI os-agnostic packages - become: true - ansible.builtin.package: - name: - - git - - tmux - - python-pip - - fish - - rofi - - automake - - ncdu - - xclip - state: present - tags: - - agnostic - - cli - -- name: Install GUI os-agnostic packages - become: true - ansible.builtin.package: - name: - - mpv - - rofi - state: present - tags: - - agnostic - - gui - -- name: Install Arch packages - when: ansible_os_family == "Archlinux" - ansible.builtin.import_tasks: arch.yml - tags: - - arch - - -- name: Install Debian packages - become: true - when: ansible_os_family == "Debian" - ansible.builtin.import_tasks: debian.yml - - tags: - - debian - -- name: Install RHEL packages - become: true - when: ansible_os_family in ["RedHat", "Nobara"] - ansible.builtin.import_tasks: rhel.yaml - tags: - - rhel - -- name: Curl installers - become: false - ansible.builtin.import_tasks: curlers.yml - vars: - curl_install_urls: - - https://raw.githubusercontent.com/aquaproj/aqua-installer/v3.0.1/aqua-installer - - https://astral.sh/uv/install.sh - - tags: - - curl - -- name: Curl GUI installers - become: false - ansible.builtin.import_tasks: curlers.yml - vars: - curl_install_urls: - - https://sw.kovidgoyal.net/kitty/installer.sh - - https://zed.dev/install.sh | ZED_CHANNEL=preview - tags: - - gui - - curl - - -- name: Install Python packages - ansible.builtin.import_tasks: python.yml - tags: - - python - -- name: Install Flatpak packages - ansible.builtin.import_tasks: flatpak.yml - tags: - - flatpak - - gui - -- name: Install Snap packages - become: true - ansible.builtin.import_tasks: snap.yml - tags: - - snap - - gui diff --git a/ansible/roles/packages/tasks/python.yml b/ansible/roles/packages/tasks/python.yml deleted file mode 100644 index 7cfbd65..0000000 --- a/ansible/roles/packages/tasks/python.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Install pipx packages - community.general.pipx: - name: "{{ item }}" - state: latest - loop: - - yt-dlp - - pdm - - poetry - - halig - - pre-commit - - ruff - - thefuck - - streamlink - - tldr diff --git a/ansible/roles/packages/tasks/rhel.yaml b/ansible/roles/packages/tasks/rhel.yaml deleted file mode 100644 index ce2a288..0000000 --- a/ansible/roles/packages/tasks/rhel.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Install RHEL packages - ansible.builtin.package: - name: - - rofi-devel - - qalculate - - automake - - libtool - - cheat - - gcc-c++ - - neovim - - python3-neovim - state: present diff --git a/ansible/roles/packages/tasks/snap.yml b/ansible/roles/packages/tasks/snap.yml deleted file mode 100644 index ac6fae6..0000000 --- a/ansible/roles/packages/tasks/snap.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Install snaps packages - community.general.snap: - name: - - acestreamplayer diff --git a/7tv_settings_TWITCH-3_6_2025.json b/conf.d/7tv_settings_TWITCH-3_6_2025.json similarity index 100% rename from 7tv_settings_TWITCH-3_6_2025.json rename to conf.d/7tv_settings_TWITCH-3_6_2025.json diff --git a/allowed_signers b/conf.d/allowed_signers similarity index 100% rename from allowed_signers rename to conf.d/allowed_signers diff --git a/astronvim/community.lua b/conf.d/astronvim/community.lua similarity index 100% rename from astronvim/community.lua rename to conf.d/astronvim/community.lua diff --git a/astronvim/plugins/astrocore.lua b/conf.d/astronvim/plugins/astrocore.lua similarity index 100% rename from astronvim/plugins/astrocore.lua rename to conf.d/astronvim/plugins/astrocore.lua diff --git a/astronvim/plugins/astrolsp.lua b/conf.d/astronvim/plugins/astrolsp.lua similarity index 100% rename from astronvim/plugins/astrolsp.lua rename to conf.d/astronvim/plugins/astrolsp.lua diff --git a/astronvim/plugins/astroui.lua b/conf.d/astronvim/plugins/astroui.lua similarity index 100% rename from astronvim/plugins/astroui.lua rename to conf.d/astronvim/plugins/astroui.lua diff --git a/astronvim/plugins/catppuccin.lua b/conf.d/astronvim/plugins/catppuccin.lua similarity index 100% rename from astronvim/plugins/catppuccin.lua rename to conf.d/astronvim/plugins/catppuccin.lua diff --git a/astronvim/plugins/grug-far.lua b/conf.d/astronvim/plugins/grug-far.lua similarity index 100% rename from astronvim/plugins/grug-far.lua rename to conf.d/astronvim/plugins/grug-far.lua diff --git a/atuin.toml b/conf.d/atuin.toml similarity index 100% rename from atuin.toml rename to conf.d/atuin.toml diff --git a/bat/themes/Catppuccin-mocha.tmTheme b/conf.d/bat/themes/Catppuccin-mocha.tmTheme similarity index 100% rename from bat/themes/Catppuccin-mocha.tmTheme rename to conf.d/bat/themes/Catppuccin-mocha.tmTheme diff --git a/fish/conf.d/aliases.fish b/conf.d/fish/conf.d/aliases.fish similarity index 100% rename from fish/conf.d/aliases.fish rename to conf.d/fish/conf.d/aliases.fish diff --git a/fish/conf.d/common.fish b/conf.d/fish/conf.d/common.fish similarity index 100% rename from fish/conf.d/common.fish rename to conf.d/fish/conf.d/common.fish diff --git a/fish/conf.d/functions.fish b/conf.d/fish/conf.d/functions.fish similarity index 100% rename from fish/conf.d/functions.fish rename to conf.d/fish/conf.d/functions.fish diff --git a/fish/conf.d/kubectl.fish b/conf.d/fish/conf.d/kubectl.fish similarity index 100% rename from fish/conf.d/kubectl.fish rename to conf.d/fish/conf.d/kubectl.fish diff --git a/fish/conf.d/paths.fish b/conf.d/fish/conf.d/paths.fish similarity index 100% rename from fish/conf.d/paths.fish rename to conf.d/fish/conf.d/paths.fish diff --git a/freetds.conf b/conf.d/freetds.conf similarity index 100% rename from freetds.conf rename to conf.d/freetds.conf diff --git a/gamemode.ini b/conf.d/gamemode.ini similarity index 100% rename from gamemode.ini rename to conf.d/gamemode.ini diff --git a/gitconfig b/conf.d/gitconfig similarity index 100% rename from gitconfig rename to conf.d/gitconfig diff --git a/halig/halig.yml b/conf.d/halig/halig.yml similarity index 100% rename from halig/halig.yml rename to conf.d/halig/halig.yml diff --git a/ideavim b/conf.d/ideavim similarity index 100% rename from ideavim rename to conf.d/ideavim diff --git a/k9smocha.yaml b/conf.d/k9smocha.yaml similarity index 100% rename from k9smocha.yaml rename to conf.d/k9smocha.yaml diff --git a/kitty/kitty.conf b/conf.d/kitty/kitty.conf similarity index 100% rename from kitty/kitty.conf rename to conf.d/kitty/kitty.conf diff --git a/mangohud.conf b/conf.d/mangohud.conf similarity index 100% rename from mangohud.conf rename to conf.d/mangohud.conf diff --git a/resticprofile.schema.json b/conf.d/resticprofile.schema.json similarity index 100% rename from resticprofile.schema.json rename to conf.d/resticprofile.schema.json diff --git a/resticprofile.toml b/conf.d/resticprofile.toml similarity index 100% rename from resticprofile.toml rename to conf.d/resticprofile.toml diff --git a/sshconfig b/conf.d/sshconfig similarity index 72% rename from sshconfig rename to conf.d/sshconfig index 97e637c..ed7d333 100644 --- a/sshconfig +++ b/conf.d/sshconfig @@ -119,4 +119,14 @@ Host fuku.dd02 Host fuku.dd01 HostName dd01.fuku User root - IdentityFile ~/.ssh/id_ed25519 \ No newline at end of file + IdentityFile ~/.ssh/id_ed25519 +# --- START CODER JETBRAINS TOOLBOX mbcode.i.mercedes-benz.com +Host coder-jetbrains-toolbox-mbcode.i.mercedes-benz.com--* + ProxyCommand /home/catalin/.local/share/coder-toolbox/mbcode.i.mercedes-benz.com/coder-linux-amd64 --global-config /home/catalin/.local/share/coder-toolbox/mbcode.i.mercedes-benz.com/config --url https://mbcode.i.mercedes-benz.com/ ssh --stdio --network-info-dir /home/catalin/.local/share/coder-toolbox/ssh-network-metrics --usage-app=jetbrains --ssh-host-prefix coder-jetbrains-toolbox-mbcode.i.mercedes-benz.com-- %h + ConnectTimeout 0 + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + LogLevel ERROR + SetEnv CODER_SSH_SESSION_TYPE=JetBrains + +# --- END CODER JETBRAINS TOOLBOX mbcode.i.mercedes-benz.com diff --git a/timewarrior.cfg b/conf.d/timewarrior.cfg similarity index 100% rename from timewarrior.cfg rename to conf.d/timewarrior.cfg diff --git a/tmux.conf b/conf.d/tmux.conf similarity index 100% rename from tmux.conf rename to conf.d/tmux.conf diff --git a/topgrade.toml b/conf.d/topgrade.toml similarity index 100% rename from topgrade.toml rename to conf.d/topgrade.toml diff --git a/conf.d/utils/gs.sh b/conf.d/utils/gs.sh new file mode 100755 index 0000000..1e51c1c --- /dev/null +++ b/conf.d/utils/gs.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -xeuo pipefail + +gamescopeArgs=( + --adaptive-sync # VRR support + --hdr-enabled + --mangoapp # performance overlay + --rt + --steam +) +steamArgs=( + -pipewire-dmabuf + -tenfoot +) +mangoConfig=( + cpu_temp + gpu_temp + ram + vram +) +mangoVars=( + MANGOHUD=1 + MANGOHUD_CONFIG="$(IFS=,; echo "${mangoConfig[*]}")" +) + +export "${mangoVars[@]}" +exec gamescope "${gamescopeArgs[@]}" -- steam "${steamArgs[@]}" \ No newline at end of file diff --git a/utils/patch-eldenring.sh b/conf.d/utils/patch-eldenring.sh similarity index 100% rename from utils/patch-eldenring.sh rename to conf.d/utils/patch-eldenring.sh diff --git a/vimrc b/conf.d/vimrc similarity index 100% rename from vimrc rename to conf.d/vimrc diff --git a/v2/flake.lock b/flake.lock similarity index 57% rename from v2/flake.lock rename to flake.lock index 0e09121..786d640 100644 --- a/v2/flake.lock +++ b/flake.lock @@ -21,43 +21,59 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "v0.7.0", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1770770419, "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..c929e03 --- /dev/null +++ b/flake.nix @@ -0,0 +1,51 @@ +{ + description = "NixOS flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + systems.url = "github:nix-systems/default-linux"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; + home-manager = { + url = "github:nix-community/home-manager/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, nixpkgs, nix-flatpak, systems, home-manager, ... } @ inputs: let + inherit (self) outputs; + lib = nixpkgs.lib // home-manager.lib; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-tree; + forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system}); + pkgsFor = lib.genAttrs (import systems) ( + system: + import nixpkgs { + inherit system; + config.allowUnfree = true; + } + ); + + in { + inherit lib; + + + nixosConfigurations = { + limgrave = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + nix-flatpak.nixosModules.nix-flatpak + ./hosts/limgrave/nixos + ]; + }; + }; + + homeConfigurations = { + "catalin@limgrave" = home-manager.lib.homeManagerConfiguration { + pkgs = pkgsFor.x86_64-linux; + extraSpecialArgs = {inherit inputs;}; + modules = [ + ./hosts/limgrave/home/home.nix + ]; + }; + }; + }; +} \ No newline at end of file diff --git a/greenclip.toml b/greenclip.toml deleted file mode 100644 index 5346073..0000000 --- a/greenclip.toml +++ /dev/null @@ -1,12 +0,0 @@ -[greenclip] - history_file = "~/.cache/greenclip.history" - max_history_length = 50 - max_selection_size_bytes = 0 - trim_space_from_selection = true - use_primary_selection_as_input = false - blacklisted_applications = [] - enable_image_support = true - image_cache_directory = "/tmp/greenclip" - static_history = [ - '''¯\_(ツ)_/¯''', -] diff --git a/hosts/limgrave/home/home.nix b/hosts/limgrave/home/home.nix new file mode 100644 index 0000000..dbb8096 --- /dev/null +++ b/hosts/limgrave/home/home.nix @@ -0,0 +1,62 @@ +{ + inputs, + lib, + config, + pkgs, + ... +}: { + home = { + username = "catalin"; + homeDirectory = "/home/catalin"; + shell.enableFishIntegration = true; + packages = with pkgs; [ + gnomeExtensions.user-themes + gnomeExtensions.caffeine + gnomeExtensions.colosseum + gnomeExtensions.dash-to-dock + gnomeExtensions.clipboard-indicator + gnomeExtensions.emoji-copy + gnomeExtensions.gsconnect + gnomeExtensions.bluetooth-battery-meter + gnome-tweaks + catppuccin-gtk + catppuccin-cursors + catppuccin-papirus-folders + catppuccin-grub + ]; + + }; + dconf = { + enable = true; + settings = { + "org/gnome/desktop/interface".color-scheme = "prefer-dark"; + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = with pkgs.gnomeExtensions; [ + gsconnect.extensionUuid + user-themes.extensionUuid + caffeine.extensionUuid + colosseum.extensionUuid + dash-to-dock.extensionUuid + clipboard-indicator.extensionUuid + emoji-copy.extensionUuid + bluetooth-battery-meter.extensionUuid + ]; + }; + }; + }; + + + programs.gnome-shell = { + enable = true; + extensions = [{ package = pkgs.gnomeExtensions.gsconnect; }]; + }; + programs.home-manager.enable = true; + programs.git.enable = true; + systemd.user.startServices = "sd-switch"; + programs = { + fish.enable = true; + }; + + home.stateVersion = "25.11"; +} \ No newline at end of file diff --git a/hosts/limgrave/nixos/default.nix b/hosts/limgrave/nixos/default.nix new file mode 100644 index 0000000..0ff6831 --- /dev/null +++ b/hosts/limgrave/nixos/default.nix @@ -0,0 +1,151 @@ +{ config, pkgs, flatpaks, lib, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ]; + + boot = { + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + kernelPackages = pkgs.linuxPackages_latest; + initrd.luks.devices."luks-7565ba12-2da3-4933-adec-8d62e81afe52".device = "/dev/disk/by-uuid/7565ba12-2da3-4933-adec-8d62e81afe52"; + }; + + nix = { + settings.experimental-features = [ "nix-command" "flakes" ]; + settings.trusted-users = [ "root" "catalin" ]; + }; + + networking = { + hostName = "limgrave"; + networkmanager.enable = true; + }; + + services = { + xserver.enable = true; + desktopManager.gnome.enable = true; + displayManager.gdm.enable = true; + xserver.xkb = { + layout = "us"; + variant = ""; + }; + printing.enable = true; + pulseaudio.enable = false; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + udev.packages = with pkgs; [ gnome-settings-daemon ]; + sysprof.enable = true; + flatpak = { + enable = true; + packages = import ./flatpaks.nix; + overrides = { + "org.signal.Signal" = { + Environment = { + "SIGNAL_PASSWORD_STORE" = "gnome-libsecret org.signal.Signal"; + }; + }; + }; + }; + + + }; + + programs = { + fish.enable = true; + appimage.enable = true; + appimage.binfmt = true; + dconf.enable = true; + gamescope = { + enable = true; + capSysNice = true; + }; + steam = { + enable = true; + gamescopeSession.enable = true; + remotePlay.openFirewall = true; + package = pkgs.steam.override { + extraLibraries = p: with p; [ (lib.getLib networkmanager) ]; + }; + }; + firefox.enable = true; + nix-ld.enable = true; + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/.dotfiles"; + }; + }; + + + time.timeZone = "Europe/Madrid"; + i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "es_ES.UTF-8"; + LC_IDENTIFICATION = "es_ES.UTF-8"; + LC_MEASUREMENT = "es_ES.UTF-8"; + LC_MONETARY = "es_ES.UTF-8"; + LC_NAME = "es_ES.UTF-8"; + LC_NUMERIC = "es_ES.UTF-8"; + LC_PAPER = "es_ES.UTF-8"; + LC_TELEPHONE = "es_ES.UTF-8"; + LC_TIME = "es_ES.UTF-8"; + }; + + users = { + users.catalin = { + isNormalUser = true; + description = "catalin"; + extraGroups = [ "networkmanager" "wheel" "docker" "nas"]; + shell = pkgs.fish; + packages = with pkgs; [ + flatpak + ]; + }; + groups.nas.gid = 568; + }; + + + security.rtkit.enable = true; + + hardware = { + graphics = { + enable = true; + enable32Bit = true; + }; + }; + + + xdg.portal = { + enable = true; + config = { + common = { + default = [ + "gtk" + ]; + }; + }; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + ]; + }; + virtualisation.docker.enable = true; + + nixpkgs.config.allowUnfree = true; + environment = { + sessionVariables.NIXOS_OZONE_WL = "1"; + systemPackages = import ./packages.nix pkgs; + loginShellInit = '' + [[ "$(tty)" = "/dev/tty1" ]] && ~/.dotfiles/conf.d/utils/gs.sh + ''; + }; + + + system.stateVersion = "25.11"; +} diff --git a/hosts/limgrave/nixos/flatpaks.nix b/hosts/limgrave/nixos/flatpaks.nix new file mode 100644 index 0000000..5afdc11 --- /dev/null +++ b/hosts/limgrave/nixos/flatpaks.nix @@ -0,0 +1,22 @@ +[ + "com.microsoft.Edge" + "dev.vencord.Vesktop" + "chat.revolt.RevoltDesktop" + "org.signal.Signal" + "io.github.hkdb.Aerion" + "io.github.mpobaschnig.Vaults" + "com.bitwarden.desktop" + "com.google.Chrome" + "org.jellyfin.JellyfinDesktop" + "net.lutris.Lutris" + "com.stremio.Stremio" + "org.musicbrainz.Picard" + "org.gimp.GIMP" + "org.qbittorrent.qBittorrent" + "com.tutanota.Tutanota" + "com.usebruno.Bruno" + "com.obsproject.Studio" + "org.kde.kdenlive" + "com.vysp3r.ProtonPlus" + "com.github.IsmaelMartinez.teams_for_linux" +] diff --git a/v2/nixos/hardware-configuration.nix b/hosts/limgrave/nixos/hardware-configuration.nix similarity index 58% rename from v2/nixos/hardware-configuration.nix rename to hosts/limgrave/nixos/hardware-configuration.nix index 907963d..2050838 100644 --- a/v2/nixos/hardware-configuration.nix +++ b/hosts/limgrave/nixos/hardware-configuration.nix @@ -1,8 +1,12 @@ - +# 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, ... }: { - boot.loader.systemd-boot.enable = true; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; @@ -10,27 +14,29 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/07b5dda3-2fcd-494b-893c-72301d637e9a"; + { device = "/dev/mapper/luks-0e11cc3f-cf15-42a3-8356-12780ac991f6"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/04FD-A91D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + boot.initrd.luks.devices."luks-0e11cc3f-cf15-42a3-8356-12780ac991f6".device = "/dev/disk/by-uuid/0e11cc3f-cf15-42a3-8356-12780ac991f6"; - - fileSystems."/mnt/zeruel/nas1" = + fileSystems."/mnt/zeruel/nas1" = { device = "zeruel.fuku:/mnt/pool1/nas1"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; - fileSystems."/mnt/zeruel/dcsi" = - { device = "zeruel.fuku:/mnt/pool1/dcsi"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; + + fileSystems."/mnt/windoze" = + { device = "/dev/disk/by-uuid/46B01460B01458AF"; + fsType = "ntfs-3g"; + options = [ "rw" "uid=1000"]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0362-9D53"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; }; fileSystems."/mnt/windoze2" = @@ -38,18 +44,11 @@ fsType = "ntfs-3g"; options = [ "rw" "uid=1000"]; }; - fileSystems."/mnt/windoze" = - { device = "/dev/disk/by-uuid/46B01460B01458AF"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; + swapDevices = - [ { device = "/dev/disk/by-uuid/03ecd98d-013f-4476-b43a-bcae0bc1de67"; } + [ { device = "/dev/mapper/luks-7565ba12-2da3-4933-adec-8d62e81afe52"; } ]; - networking.useDHCP = lib.mkDefault true; - - # Set your system kind (needed for flakes) - nixpkgs.hostPlatform = "x86_64-linux"; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/v22/pkgs/default.nix b/hosts/limgrave/nixos/packages.nix similarity index 59% rename from v22/pkgs/default.nix rename to hosts/limgrave/nixos/packages.nix index 120834e..f756872 100644 --- a/v22/pkgs/default.nix +++ b/hosts/limgrave/nixos/packages.nix @@ -1,29 +1,14 @@ -pkgs: with pkgs; [ + pkgs: with pkgs; [ + bat + git + neovim + jetbrains-toolbox + coder kitty steam steam-run - python311 - protonup-qt - jellyfin-media-player - spotify - adwaita-icon-theme - fishPlugins.z - fishPlugins.tide - fishPlugins.transient-fish - fishPlugins.done - fishPlugins.colored-man-pages - lutris - ayugram-desktop - restic - bitwarden - pre-commit - cargo - inconsolata - google-chrome - yt-dlp mpv gnumake - stremio kubernetes-helm opentofu kubeseal @@ -34,14 +19,8 @@ pkgs: with pkgs; [ awscli2 kor exiftool - jetbrains-toolbox - chiaki-ng gnome-themes-extra - tela-circle-icon-theme hmcl - rose-pine-gtk-theme - rose-pine-icon-theme - rose-pine-cursor vlc unrar-wrapper atkinson-hyperlegible @@ -51,24 +30,49 @@ pkgs: with pkgs; [ hunspellDicts.en_US sqlite-interactive ffmpeg - filezilla lrcget - picard - gimp yq - qbittorrent p7zip ansible k3sup gamemode lm_sensors appimage-run - coder xcolor - element-desktop samrewritten protontricks nmap terragrunt - discord -] \ No newline at end of file + adwaita-icon-theme + ayugram-desktop + restic + pre-commit + cargo + inconsolata + k9s + kubectl + dotter + atuin + kubecolor + trash-cli + gnomeExtensions.appindicator + bruno + devenv + vim + direnv + marble-shell-theme + colloid-gtk-theme + colloid-icon-theme + sysprof + steam-run + streamlink + twitch-chat-downloader + jq + hmcl + tmux + tor + tor-browser + remmina + yt-dlp + mangohud + ] diff --git a/nix/flake.lock b/nix/flake.lock deleted file mode 100644 index f652dcf..0000000 --- a/nix/flake.lock +++ /dev/null @@ -1,392 +0,0 @@ -{ - "nodes": { - "autofirma-nix": { - "inputs": { - "autofirma-src": "autofirma-src", - "clienteafirma-external-src": "clienteafirma-external-src", - "flake-parts": "flake-parts", - "home-manager": "home-manager", - "jmulticard-src": "jmulticard-src", - "nix-unit": "nix-unit", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762846273, - "narHash": "sha256-TvPVL/CLMstwlnsDrBHw7vMbrxwO1RlxJcQD2Csc/3Q=", - "owner": "nix-community", - "repo": "autofirma-nix", - "rev": "014a7decf4a60dcab532f78469ce83387c9aa40e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "autofirma-nix", - "type": "github" - } - }, - "autofirma-src": { - "flake": false, - "locked": { - "lastModified": 1716805628, - "narHash": "sha256-GQyj3QuWIHTkYwdJ4oKVsG923YG9mCUXfhqdIvEWNMA=", - "owner": "ctt-gob-es", - "repo": "clienteafirma", - "rev": "f8888062394a4ca41c5802beb2524597a5ce465a", - "type": "github" - }, - "original": { - "owner": "ctt-gob-es", - "ref": "v1.8.3", - "repo": "clienteafirma", - "type": "github" - } - }, - "clienteafirma-external-src": { - "flake": false, - "locked": { - "lastModified": 1712248159, - "narHash": "sha256-iS3I6zIxuKG133s/FqDlXZzOZ2ZOJcqZK9X6Tv3+3lc=", - "owner": "ctt-gob-es", - "repo": "clienteafirma-external", - "rev": "f450ac76094ffe387f6590b9ac61b5ada5a501e7", - "type": "github" - }, - "original": { - "owner": "ctt-gob-es", - "ref": "OT_14395", - "repo": "clienteafirma-external", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "autofirma-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762810396, - "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1762787259, - "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "jmulticard-src": { - "flake": false, - "locked": { - "lastModified": 1686816513, - "narHash": "sha256-sCqMK4FvwRHsGIB6iQVyqrx0+EDiUfQSAsPqmDq2Giw=", - "owner": "ctt-gob-es", - "repo": "jmulticard", - "rev": "9983fc690f3b68dc2c8fde19db269766cf0fb387", - "type": "github" - }, - "original": { - "owner": "ctt-gob-es", - "ref": "v1.8", - "repo": "jmulticard", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "autofirma-nix", - "nix-unit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737420293, - "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-snapd": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761703712, - "narHash": "sha256-OKuNVXmHuZ0zi8T0aGWrBJizIfvdTqV1RiV0IN8GPZs=", - "owner": "nix-community", - "repo": "nix-snapd", - "rev": "f7694a0e26d890e285137e1b726b1b44038805c4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-snapd", - "type": "github" - } - }, - "nix-unit": { - "inputs": { - "flake-parts": [ - "autofirma-nix", - "flake-parts" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "autofirma-nix", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1762774186, - "narHash": "sha256-hRADkHjNt41+JUHw2EiSkMaL4owL83g5ZppjYUdF/Dc=", - "owner": "nix-community", - "repo": "nix-unit", - "rev": "1c9ab50554eed0b768f9e5b6f646d63c9673f0f7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-unit", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "autofirma-nix": "autofirma-nix", - "home-manager": "home-manager_2", - "nix-snapd": "nix-snapd", - "nixpkgs": "nixpkgs_2", - "spicetify-nix": "spicetify-nix", - "unstable": "unstable" - } - }, - "spicetify-nix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "systems": "systems" - }, - "locked": { - "lastModified": 1762057664, - "narHash": "sha256-mdEEvepIi8ebpGP1WWOHNvNQyd8rF0mUrKAiU6mwHCk=", - "owner": "Gerg-L", - "repo": "spicetify-nix", - "rev": "4aa6e43d29e3c8acf544aa6782a1963a11369208", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "spicetify-nix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "autofirma-nix", - "nix-unit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762410071, - "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "97a30861b13c3731a84e09405414398fbf3e109f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "unstable": { - "locked": { - "lastModified": 1762361079, - "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/flake.nix b/nix/flake.nix deleted file mode 100644 index cba9f86..0000000 --- a/nix/flake.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - description = "NixOS flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nix-snapd.url = "github:nix-community/nix-snapd"; - nix-snapd.inputs.nixpkgs.follows = "nixpkgs"; - spicetify-nix.url = "github:Gerg-L/spicetify-nix"; - autofirma-nix = { - url = "github:nix-community/autofirma-nix/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - home-manager = { - url = "github:nix-community/home-manager/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - - outputs = { self, nixpkgs, unstable, nix-snapd, home-manager, autofirma-nix, ... }: - let - system = "x86_64-linux"; - lib = nixpkgs.lib; - pkgs-unstable = unstable.legacyPackages.${system}; - pkgs = nixpkgs.legacyPackages.${system}; - - mkNixos = host: modules: lib.nixosSystem { - inherit system; - specialArgs = { inherit pkgs-unstable; }; - modules = [ - ./hosts/${host}/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.catalin = import ./home; - home-manager.extraSpecialArgs = { inherit pkgs-unstable; }; - } - ] ++ modules; - }; - - # Helper for Home Manager configurations (non-NixOS) - mkHome = host: user: modules: home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - ./home - { - home.username = user; - home.homeDirectory = "/home/${user}"; - } - ] ++ modules; - extraSpecialArgs = { inherit pkgs-unstable; }; - }; - in - { - nixosConfigurations = { - limgrave = mkNixos "limgrave" [ - nix-snapd.nixosModules.default - autofirma-nix.nixosModules.default - ]; - }; - - # Home Manager configurations for non-NixOS hosts (e.g., Ubuntu) - homeConfigurations = { - # For non-NixOS usage. Run: home-manager switch --flake ./nix#catalin@ubuntu - "catalin@limgrave" = mkHome "limgrave" "catalin" [ ]; - }; - }; -} diff --git a/nix/home/default.nix b/nix/home/default.nix deleted file mode 100644 index 3f26caf..0000000 --- a/nix/home/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./packages.nix - ]; - - home.stateVersion = "24.11"; - - programs.fish = { - enable = true; - }; - - programs.bash = { - enable = true; - initExtra = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; - - programs.gnome-shell = { - enable = true; - extensions = [{ package = pkgs.gnomeExtensions.gsconnect; }]; - }; - - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = with pkgs.gnomeExtensions; [ - gsconnect.extensionUuid - user-themes.extensionUuid - caffeine.extensionUuid - colosseum.extensionUuid - dash-to-dock.extensionUuid - clipboard-indicator.extensionUuid - emoji-copy.extensionUuid - bluetooth-battery-meter.extensionUuid - ]; - }; - }; - - home.packages = with pkgs; [ - gnomeExtensions.user-themes - gnomeExtensions.caffeine - gnomeExtensions.colosseum - gnomeExtensions.dash-to-dock - gnomeExtensions.clipboard-indicator - gnomeExtensions.emoji-copy - gnomeExtensions.gsconnect - gnomeExtensions.bluetooth-battery-meter - gnome-tweaks - catppuccin-gtk - catppuccin-cursors - catppuccin-papirus-folders - catppuccin-grub - ]; -} diff --git a/nix/home/packages.nix b/nix/home/packages.nix deleted file mode 100644 index 586edce..0000000 --- a/nix/home/packages.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - vim - wget - git - tmux - eza - bat - jq - curl - atuin - leaf - dotter - kubectl - k9s - trashy - krew - pre-commit - devenv - git-cliff - difftastic - unzip - hadolint - docker-compose - delta - bottom - dust - popeye - kubecolor - kubeconform - kube-score - uv - neovim - ncdu - direnv - asciinema - yq - ]; -} diff --git a/nix/hosts/limgrave/configuration.nix b/nix/hosts/limgrave/configuration.nix deleted file mode 100644 index 5241659..0000000 --- a/nix/hosts/limgrave/configuration.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ config, pkgs, pkgs-unstable, ... }: -{ - imports = [ - ./hardware-configuration.nix - ]; - - nixpkgs.config.allowBroken = true; - nix.settings.download-buffer-size = 524288000; - nixpkgs.config.permittedInsecurePackages = [ "electron-33.4.11" "mono-5.20.1.34" ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "ntfs" ]; - - services.snap.enable = false; - - networking.hostName = "limgrave"; - networking.networkmanager.enable = true; - services.mullvad-vpn.enable = true; - - - environment.sessionVariables.MOZ_ENABLE_WAYLAND = 0; - - time.timeZone = "Europe/Madrid"; - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "es_ES.UTF-8"; - LC_IDENTIFICATION = "es_ES.UTF-8"; - LC_MEASUREMENT = "es_ES.UTF-8"; - LC_MONETARY = "es_ES.UTF-8"; - LC_NAME = "es_ES.UTF-8"; - LC_NUMERIC = "es_ES.UTF-8"; - LC_PAPER = "es_ES.UTF-8"; - LC_TELEPHONE = "es_ES.UTF-8"; - LC_TIME = "es_ES.UTF-8"; - }; - - networking.firewall = rec { - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; - allowedUDPPortRanges = allowedTCPPortRanges; - }; - - - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - windowManager.openbox.enable = true; - - xkb = { - layout = "us"; - variant = ""; - }; - }; - - services.printing.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - hardware.graphics.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - users.users.catalin = { - isNormalUser = true; - description = "catalin"; - shell = pkgs.fish; - useDefaultShell = true; - extraGroups = [ "networkmanager" "wheel" "docker" "nas" ]; - packages = with pkgs; [ flatpak ]; - }; - users.groups.nas.gid = 568; - - programs.firefox.enable = true; - # Enable smart card service and eID tooling (AutoFirma stack) - services.pcscd.enable = true; - programs.autofirma = { - enable = true; - firefoxIntegration.enable = true; - }; - - nixpkgs.config.allowUnfree = true; - services.flatpak.enable = true; - programs.nix-ld.enable = true; - - # Merge base packages with host-specific packages - environment.systemPackages = import ./packages.nix pkgs; - - programs = { - fish.enable = true; - steam = { - enable = true; - package = pkgs.steam.override { - extraLibraries = p: with p; [ (lib.getLib networkmanager) ]; - }; - }; - }; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - xdg.portal.config.common.default = "gtk"; - - programs.mtr.enable = true; - programs.dconf.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; - - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 1w"; - }; - - fonts.packages = with pkgs; [ - atkinson-hyperlegible - ]; - - boot.kernel.sysctl."net.ipv4.ip_forward" = 1; - services.openssh.enable = true; - services.tailscale.enable = true; - virtualisation.docker.enable = true; - networking.nameservers = [ "192.168.1.7" "1.1.1.1" ]; - - nix.extraOptions = '' - trusted-users = root catalin - ''; - - system.autoUpgrade.enable = true; - system.stateVersion = "24.11"; -} diff --git a/nix/hosts/limgrave/hardware-configuration.nix b/nix/hosts/limgrave/hardware-configuration.nix deleted file mode 100644 index de095d4..0000000 --- a/nix/hosts/limgrave/hardware-configuration.nix +++ /dev/null @@ -1,82 +0,0 @@ -# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/07b5dda3-2fcd-494b-893c-72301d637e9a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/04FD-A91D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - -# fileSystems."/snap/acestreamplayer/17" = -# { device = "/var/lib/snapd/snaps/acestreamplayer_17.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# -# fileSystems."/snap/core22/1722" = -# { device = "/var/lib/snapd/snaps/core22_1722.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# -# fileSystems."/snap/snapd/23258" = -# { device = "/var/lib/snapd/snaps/snapd_23258.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# - fileSystems."/mnt/zeruel/nas1" = - { device = "zeruel.fuku:/mnt/pool1/nas1"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - - fileSystems."/mnt/zeruel/dcsi" = - { device = "zeruel.fuku:/mnt/pool1/dcsi"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - - fileSystems."/mnt/windoze2" = - { device = "/dev/disk/by-uuid/6084BE5384BE2B82"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; - fileSystems."/mnt/windoze" = - { device = "/dev/disk/by-uuid/46B01460B01458AF"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; - swapDevices = - [ { device = "/dev/disk/by-uuid/03ecd98d-013f-4476-b43a-bcae0bc1de67"; } - ]; - - # 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.br-71a907d8e6fd.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nix/hosts/limgrave/packages.nix b/nix/hosts/limgrave/packages.nix deleted file mode 100644 index 91d7b21..0000000 --- a/nix/hosts/limgrave/packages.nix +++ /dev/null @@ -1,74 +0,0 @@ -pkgs: with pkgs; [ - kitty - steam - steam-run - python311 - protonup-qt - jellyfin-media-player - spotify - adwaita-icon-theme - fishPlugins.z - fishPlugins.tide - fishPlugins.transient-fish - fishPlugins.done - fishPlugins.colored-man-pages - lutris - ayugram-desktop - restic - bitwarden - pre-commit - cargo - inconsolata - google-chrome - yt-dlp - mpv - gnumake - stremio - kubernetes-helm - opentofu - kubeseal - openssl - xclip - resticprofile - gnupg - awscli2 - kor - exiftool - jetbrains-toolbox - chiaki-ng - gnome-themes-extra - tela-circle-icon-theme - hmcl - rose-pine-gtk-theme - rose-pine-icon-theme - rose-pine-cursor - vlc - unrar-wrapper - atkinson-hyperlegible - libreoffice-qt - hunspell - hunspellDicts.es_ES - hunspellDicts.en_US - sqlite-interactive - ffmpeg - filezilla - lrcget - picard - gimp - yq - qbittorrent - p7zip - ansible - k3sup - gamemode - lm_sensors - appimage-run - coder - xcolor - element-desktop - samrewritten - protontricks - nmap - terragrunt - discord -] diff --git a/nix/packages.nix b/nix/packages.nix deleted file mode 100644 index 0d423ca..0000000 --- a/nix/packages.nix +++ /dev/null @@ -1,121 +0,0 @@ -pkgs: with pkgs; [ - vim - wget - kitty - steam - steam-run - vesktop - protonup-qt - jellyfin-media-player - spotify - adwaita-icon-theme - fishPlugins.z - fishPlugins.tide - fishPlugins.transient-fish - fishPlugins.done - fishPlugins.colored-man-pages - lutris - telegram-desktop - leaf - restic - bitwarden - tmux - git - dotter - pre-commit - kubectl - krew - k9s - trashy - cargo - inconsolata - devenv - google-chrome - discord - topgrade - ruff - python311 - yt-dlp - mpv - gnumake - stremio - kubernetes-helm - opentofu - git-cliff - kubeseal - difftastic - unzip - openssl - xclip - jdk - fuse - prismlauncher - resticprofile - gnupg - awscli2 - r2modman - kor - exiftool - samrewritten - jetbrains-toolbox - atuin - hadolint - delta - bottom - bat - dust - eza - jq - popeye - kubecolor - kubeconform - kube-score - uv - chiaki-ng - gnome-themes-extra - tela-circle-icon-theme - docker-compose - neovim - obs-studio - ncdu - hmcl - rose-pine-gtk-theme - rose-pine-icon-theme - rose-pine-cursor - vlc - unrar-wrapper - atkinson-hyperlegible - libreoffice-qt - hunspell - hunspellDicts.es_ES - hunspellDicts.en_US - sqlite-interactive - direnv - ffmpeg - filezilla - lrcget - picard - asciinema - gimp - yq - qbittorrent - afetch - p7zip - ansible - k3sup - gamemode - lm_sensors - appimage-run - firefox-devedition - coder - xcolor - signal-desktop - element-desktop - pavucontrol - zapzap - altus - nexusmods-app - cargo - rustc - samrewritten -] diff --git a/utils/asciify.sh b/utils/asciify.sh deleted file mode 100755 index 0f9e31d..0000000 --- a/utils/asciify.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -ROOT=$(dirname "$(readlink -f "$0")") -tail +3 $ROOT/asciify.txt | rofi -eh 2 -dmenu | cut -f1 -d'|' | xargs | xclip -selection clipboard diff --git a/utils/asciify.txt b/utils/asciify.txt deleted file mode 100644 index a1fe204..0000000 --- a/utils/asciify.txt +++ /dev/null @@ -1,31 +0,0 @@ -EMOTE| TAG -=============================== -¯\\_(ツ)_/¯| shrug -( ͡° ͜ʖ ͡°) | lemmyface -ಠ_ಠ| angry -(╯°□°)╯| more angry -༼ つ ◕_◕ ༽つ| gib -ᕕ( ᐛ )ᕗ | walk -(◉-◉)| nerd -(⌐⊙_⊙)| nerd2 -(ᄒ︹ᄒ)| sad -(῏Ṵ῏) | serious -(⌐■_■)| coolguy -( ႎ _ ႎ | sigh -( ၜ 𝄩 ၜ | kewl -ဨ(ၜ ͜ ၜ)| im listenin -(⨪_⨪)| meh -(⨪ˬ⨪)| :v -(𐨨𐭃𐨨)| hmpf -(৲ဓ―ဓ)৲| surething -(☞゚ヮ゚)☞| mahman -ԅ(≖‿≖ԅ)| creepy look -[̲̅$̲̅(̲̅ ͡° ͜ʖ ͡°̲̅)̲̅$̲̅]| skrilla -[̲̅$̲̅(̲̅ιο̲̅̅)̲̅$̲̅]| dollar -ಥ_ಥ| cryin -(⊙_☉)| derp -ლ(ಠ_ಠლ)| why -(ง •̀_•́)ง| fite me -(👁 ͜ʖ👁)| im looking, respectfully -†| cross - diff --git a/utils/curl2tar.sh b/utils/curl2tar.sh deleted file mode 100755 index 27fae06..0000000 --- a/utils/curl2tar.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -eou pipefail - -curl -L $1 | tar xvzf - diff --git a/utils/dlm.sh b/utils/dlm.sh deleted file mode 100755 index 135aa66..0000000 --- a/utils/dlm.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -# Download files using yt-dlp -x - -# Usage: dlm.sh [URL1 ... URLn] - -# Dependencies: yt-dlp - -# Check if yt-dlp is installed -if ! command -v yt-dlp &> /dev/null; then - echo "yt-dlp is not installed" - exit 1 -fi - -# Check if URLs are provided -if [ "$#" -eq 0 ]; then - echo "No URLs provided" - exit 1 -fi - -# Download files using yt-dlp -x and save them without the youtube id -yt-dlp -x --audio-format mp3 --output "%(title)s.%(ext)s" "$@" - -# Change the file's owner to 568:568 -# Change the file's permissions to 770 -sudo chown 568:568 ./*.mp3 -sudo chmod 770 ./*.mp3 \ No newline at end of file diff --git a/utils/launcher b/utils/launcher deleted file mode 100755 index 4d9f4ab..0000000 --- a/utils/launcher +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -rofi \ - -show drun \ - -modi run,drun,ssh,calc \ - -scroll-method 0 \ - -drun-match-fields all \ - -drun-display-format "{name}" \ - -terminal 'kermit -e' \ - -kb-cancel Escape \ - -theme "$HOME"/.config/rofi/config/launcher.rasi diff --git a/utils/set-monitors.sh b/utils/set-monitors.sh deleted file mode 100755 index c7d5b08..0000000 --- a/utils/set-monitors.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -eou pipefail -base_command="xrandr -q | grep connected" -monitors=$(bash -c "$base_command") -monitors_len=$(bash -c "$base_command" | grep -w 'connected' | wc -l) -if [[ "$monitors_len" -eq 2 ]]; -then - xrandr --auto --output eDP-1 --mode 1920x1080 --right-of HDMI-2 - bspc monitor eDP-1 -d I II III IV V - bspc monitor HDMI-2 -d VI VII VIII IX X - -else - bspc monitor eDP-1 -d I II III IV V VI VII VIII IX X -fi diff --git a/utils/toggle-keyboard-layout.sh b/utils/toggle-keyboard-layout.sh deleted file mode 100755 index 87510a1..0000000 --- a/utils/toggle-keyboard-layout.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -(setxkbmap -query | grep -q "layout:\s\+us") && setxkbmap es || setxkbmap us -notify-send "layout: $(setxkbmap -query | tail -1 | awk '{print $2}')" - - - diff --git a/v2/flake.nix b/v2/flake.nix deleted file mode 100644 index 84e8294..0000000 --- a/v2/flake.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - description = "Your new nix config"; - - inputs = { - # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - # You can access packages and modules from different nixpkgs revs - # at the same time. Here's an working example: - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. - - # Home manager - home-manager.url = "github:nix-community/home-manager/release-25.11"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { - self, - nixpkgs, - home-manager, - ... - } @ inputs: let - # Supported systems for your flake packages, shell, etc. - systems = [ - "x86_64-linux" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; - in { - # Your custom packages - # Accessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; - - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = { - # FIXME replace with your hostname - limgrave = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; - modules = [ - # > Our main nixos configuration file < - ./nixos/configuration.nix - ]; - }; - }; - - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { - # FIXME replace with your username@hostname - "catalin@limgrave" = home-manager.lib.homeManagerConfiguration { - # Home-manager requires 'pkgs' instance - pkgs = nixpkgs.legacyPackages.x86_64-linux; # FIXME replace x86_64-linux with your architecure - extraSpecialArgs = {inherit inputs;}; - modules = [ - # > Our main home-manager configuration file < - ./home-manager/home.nix - ]; - }; - }; - }; -} diff --git a/v2/home-manager/home.nix b/v2/home-manager/home.nix deleted file mode 100644 index 9030601..0000000 --- a/v2/home-manager/home.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This is your home-manager configuration file -# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - lib, - config, - pkgs, - ... -}: { - # You can import other home-manager modules here - imports = [ - # If you want to use modules your own flake exports (from modules/home-manager): - # inputs.self.homeManagerModules.example - - # Or modules exported from other flakes (such as nix-colors): - # inputs.nix-colors.homeManagerModules.default - - # You can also split up your configuration and import pieces of it here: - # ./nvim.nix - ]; - - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - inputs.self.overlays.additions - inputs.self.overlays.modifications - inputs.self.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - # TODO: Set your username - home = { - username = "your-username"; - homeDirectory = "/home/your-username"; - }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - - # Enable home-manager and git - programs.home-manager.enable = true; - programs.git.enable = true; - - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; -} diff --git a/v2/modules/home-manager/default.nix b/v2/modules/home-manager/default.nix deleted file mode 100644 index 45aae31..0000000 --- a/v2/modules/home-manager/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/v2/modules/nixos/default.nix b/v2/modules/nixos/default.nix deleted file mode 100644 index 8605069..0000000 --- a/v2/modules/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/v2/nixos/configuration.nix b/v2/nixos/configuration.nix deleted file mode 100644 index 3f44965..0000000 --- a/v2/nixos/configuration.nix +++ /dev/null @@ -1,206 +0,0 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) -{ - inputs, - lib, - config, - pkgs, - ... -}: { - # You can import other NixOS modules here - imports = [ - # If you want to use modules your own flake exports (from modules/nixos): - # inputs.self.nixosModules.example - - # Or modules from other flakes (such as nixos-hardware): - # inputs.hardware.nixosModules.common-cpu-amd - # inputs.hardware.nixosModules.common-ssd - - # You can also split up your configuration and import pieces of it here: - # ./users.nix - - # Import your generated (nixos-generate-config) hardware configuration - ./hardware-configuration.nix - ]; - - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - inputs.self.overlays.additions - inputs.self.overlays.modifications - inputs.self.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - nix = let - flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; - in { - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Opinionated: disable global registry - flake-registry = ""; - download-buffer-size = 524288000; - # Workaround for https://github.com/NixOS/nix/issues/9574 - nix-path = config.nix.nixPath; - }; - # Opinionated: disable channels - channel.enable = false; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 1w"; - }; - # Opinionated: make flake registry and nix path match flake inputs - registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs; - nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; - extraOptions = '' - trusted-users = root catalin - ''; - }; - - # FIXME: Add the rest of your current configuration - - nixpkgs.config.allowBroken = true; - nixpkgs.config.permittedInsecurePackages = [ "electron-33.4.11" "mono-5.20.1.34" "qtwebengine-5.15.19" ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "ntfs" ]; - - - networking.networkmanager.enable = true; - services.mullvad-vpn.enable = true; - - - environment.sessionVariables.MOZ_ENABLE_WAYLAND = 0; - - time.timeZone = "Europe/Madrid"; - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "es_ES.UTF-8"; - LC_IDENTIFICATION = "es_ES.UTF-8"; - LC_MEASUREMENT = "es_ES.UTF-8"; - LC_MONETARY = "es_ES.UTF-8"; - LC_NAME = "es_ES.UTF-8"; - LC_NUMERIC = "es_ES.UTF-8"; - LC_PAPER = "es_ES.UTF-8"; - LC_TELEPHONE = "es_ES.UTF-8"; - LC_TIME = "es_ES.UTF-8"; - }; - - networking.firewall = rec { - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; - allowedUDPPortRanges = allowedTCPPortRanges; - }; - - - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - windowManager.openbox.enable = true; - - xkb = { - layout = "us"; - variant = ""; - }; - }; - - services.printing.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - hardware.graphics.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - programs.firefox.enable = true; - programs = { - fish.enable = true; - steam = { - enable = true; - package = pkgs.steam.override { - extraLibraries = p: with p; [ (lib.getLib networkmanager) ]; - }; - }; - }; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - xdg.portal.config.common.default = "gtk"; - - programs.mtr.enable = true; - programs.dconf.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; - - - fonts.packages = with pkgs; [ - atkinson-hyperlegible - ]; - - boot.kernel.sysctl."net.ipv4.ip_forward" = 1; - services.tailscale.enable = true; - virtualisation.docker.enable = true; - networking.nameservers = [ "192.168.1.7" "1.1.1.1" ]; - - - system.autoUpgrade.enable = true; - - environment.systemPackages = import ./packages.nix pkgs; - - networking.hostName = "limgrave"; - - users.users = { - catalin = { - isNormalUser = true; - description = "catalin"; - shell = pkgs.fish; - useDefaultShell = true; - extraGroups = [ "networkmanager" "wheel" "docker" "nas" ]; - packages = with pkgs; [ flatpak ]; - }; - }; - users.groups.nas.gid = 568; - - - services.openssh = { - enable = true; - settings = { - PermitRootLogin = "no"; - PasswordAuthentication = true; - }; - }; - - system.stateVersion = "24.11"; -} diff --git a/v2/nixos/packages.nix b/v2/nixos/packages.nix deleted file mode 100644 index fa1c4bb..0000000 --- a/v2/nixos/packages.nix +++ /dev/null @@ -1,110 +0,0 @@ -pkgs: with pkgs; [ - vim - wget - git - tmux - eza - bat - jq - curl - atuin - leaf - dotter - kubectl - k9s - trashy - krew - pre-commit - devenv - git-cliff - difftastic - unzip - hadolint - docker-compose - delta - bottom - dust - popeye - kubecolor - kubeconform - kube-score - uv - neovim - ncdu - direnv - asciinema - yq - - kitty - steam - steam-run - python311 - protonup-qt - jellyfin-media-player - spotify - adwaita-icon-theme - fishPlugins.z - fishPlugins.tide - fishPlugins.transient-fish - fishPlugins.done - fishPlugins.colored-man-pages - lutris - ayugram-desktop - restic - bitwarden-desktop - pre-commit - cargo - inconsolata - google-chrome - yt-dlp - mpv - gnumake - stremio - kubernetes-helm - opentofu - kubeseal - openssl - xclip - resticprofile - gnupg - awscli2 - kor - exiftool - jetbrains-toolbox - chiaki-ng - gnome-themes-extra - tela-circle-icon-theme - hmcl - rose-pine-gtk-theme - rose-pine-icon-theme - rose-pine-cursor - vlc - unrar-wrapper - atkinson-hyperlegible - libreoffice-qt - hunspell - hunspellDicts.es_ES - hunspellDicts.en_US - sqlite-interactive - ffmpeg - filezilla - lrcget - picard - gimp - yq - qbittorrent - p7zip - ansible - k3sup - gamemode - lm_sensors - appimage-run - coder - xcolor - element-desktop - samrewritten - protontricks - nmap - terragrunt - discord -] diff --git a/v2/overlays/default.nix b/v2/overlays/default.nix deleted file mode 100644 index 7bfcb4c..0000000 --- a/v2/overlays/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file defines overlays -{inputs, ...}: { - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs final.pkgs; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} diff --git a/v2/pkgs/default.nix b/v2/pkgs/default.nix deleted file mode 100644 index 3d9e23c..0000000 --- a/v2/pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' -pkgs: { - # example = pkgs.callPackage ./example { }; -} diff --git a/v22/flake.lock b/v22/flake.lock deleted file mode 100644 index 79c38b5..0000000 --- a/v22/flake.lock +++ /dev/null @@ -1,65 +0,0 @@ -{ - "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/v22/flake.nix b/v22/flake.nix deleted file mode 100644 index 985ed84..0000000 --- a/v22/flake.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - description = "My NixOS configuration"; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - #unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - #nix-snapd.url = "github:nix-community/nix-snapd"; - #nix-snapd.inputs.nixpkgs.follows = "nixpkgs"; - systems.url = "github:nix-systems/default-linux"; - #autofirma-nix = { - # url = "github:nix-community/autofirma-nix/release-25.05"; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; - home-manager = { - url = "github:nix-community/home-manager/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - ]; - como cuando experimenta extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - outputs = { - self, - nixpkgs, - systems, - home-manager, - } @ inputs: let - inherit (self) outputs; - lib = nixpkgs.lib // home-manager.lib; - forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system}); - pkgsFor = lib.genAttrs (import systems) ( - system: - import nixpkgs { - inherit system; - config.allowUnfree = true; - } - ); - in { - inherit lib; - - #nixosModules = import ./modules/nixos; - #homeManagerModules = import ./modules/home-manager; - #overlays = import ./overlays {inherit inputs;}; - - packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;}); - - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = { - limgrave = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; - modules = [ - ./hosts/limgrave/nixos - ]; - }; - }; - - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { - "catalin@limgrave" = home-manager.lib.homeManagerConfiguration { - # Home-manager requires 'pkgs' instance - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = {inherit inputs;}; - modules = [ - ./hosts/limgrave/home - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/v22/hosts/limgrave/nixos/default.nix b/v22/hosts/limgrave/nixos/default.nix deleted file mode 100644 index 1aa7029..0000000 --- a/v22/hosts/limgrave/nixos/default.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ pkgs, inputs, ... }: -{ - imports = [ - ./hardware-configuration.nix - ]; - - nixpkgs.config.allowBroken = true; - nix.settings.download-buffer-size = 524288000; - nixpkgs.config.permittedInsecurePackages = [ "electron-33.4.11" "mono-5.20.1.34" ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "ntfs" ]; - - services.snap.enable = false; - - networking.hostName = "limgrave"; - networking.networkmanager.enable = true; - services.mullvad-vpn.enable = true; - - - environment.sessionVariables.MOZ_ENABLE_WAYLAND = 0; - - time.timeZone = "Europe/Madrid"; - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "es_ES.UTF-8"; - LC_IDENTIFICATION = "es_ES.UTF-8"; - LC_MEASUREMENT = "es_ES.UTF-8"; - LC_MONETARY = "es_ES.UTF-8"; - LC_NAME = "es_ES.UTF-8"; - LC_NUMERIC = "es_ES.UTF-8"; - LC_PAPER = "es_ES.UTF-8"; - LC_TELEPHONE = "es_ES.UTF-8"; - LC_TIME = "es_ES.UTF-8"; - }; - - networking.firewall = rec { - allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; - allowedUDPPortRanges = allowedTCPPortRanges; - }; - - - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - windowManager.openbox.enable = true; - - xkb = { - layout = "us"; - variant = ""; - }; - }; - - services.printing.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - hardware.graphics.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - users.users.catalin = { - isNormalUser = true; - description = "catalin"; - shell = pkgs.fish; - useDefaultShell = true; - extraGroups = [ "networkmanager" "wheel" "docker" "nas" ]; - packages = with pkgs; [ flatpak ]; - }; - users.groups.nas.gid = 568; - - programs.firefox.enable = true; - # Enable smart card service and eID tooling (AutoFirma stack) - services.pcscd.enable = true; - programs.autofirma = { - enable = true; - firefoxIntegration.enable = true; - }; - programs.dnieremote = { - enable = true; - jumpIntro = "no"; - wifiPort = 9501; - usbPort = 9501; - openFirewall = false; - }; - programs.configuradorfnmt = { - enable = true; - firefoxIntegration.enable = true; - }; - # Configure Firefox PKCS#11 modules for DNIe and OpenSC - programs.firefox.policies = { - SecurityDevices = { - "OpenSC PKCS#11" = "${pkgs.opensc}/lib/opensc-pkcs11.so"; - "DNIeRemote" = "${config.programs.dnieremote.finalPackage}/lib/libdnieremotepkcs11.so"; - }; - }; - nixpkgs.config.allowUnfree = true; - services.flatpak.enable = true; - programs.nix-ld.enable = true; - - # Merge base packages with host-specific packages - environment.systemPackages = import ./packages.nix pkgs; - - programs = { - fish.enable = true; - steam = { - enable = true; - package = pkgs.steam.override { - extraLibraries = p: with p; [ (lib.getLib networkmanager) ]; - }; - }; - }; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - xdg.portal.config.common.default = "gtk"; - - programs.mtr.enable = true; - programs.dconf.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; - - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 1w"; - }; - - fonts.packages = with pkgs; [ - atkinson-hyperlegible - ]; - - boot.kernel.sysctl."net.ipv4.ip_forward" = 1; - services.openssh.enable = true; - services.tailscale.enable = true; - virtualisation.docker.enable = true; - networking.nameservers = [ "192.168.1.7" "1.1.1.1" ]; - - nix.extraOptions = '' - trusted-users = root catalin - ''; - - system.autoUpgrade.enable = true; - system.stateVersion = "24.11"; -} diff --git a/v22/hosts/limgrave/nixos/hardware-configuration.nix b/v22/hosts/limgrave/nixos/hardware-configuration.nix deleted file mode 100644 index 7013bdc..0000000 --- a/v22/hosts/limgrave/nixos/hardware-configuration.nix +++ /dev/null @@ -1,82 +0,0 @@ -# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/07b5dda3-2fcd-494b-893c-72301d637e9a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/04FD-A91D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - -# fileSystems."/snap/acestreamplayer/17" = -# { device = "/var/lib/snapd/snaps/acestreamplayer_17.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# -# fileSystems."/snap/core22/1722" = -# { device = "/var/lib/snapd/snaps/core22_1722.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# -# fileSystems."/snap/snapd/23258" = -# { device = "/var/lib/snapd/snaps/snapd_23258.snap"; -# fsType = "squashfs"; -# options = [ "loop" ]; -# }; -# - fileSystems."/mnt/zeruel/nas1" = - { device = "zeruel.fuku:/mnt/pool1/nas1"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - - fileSystems."/mnt/zeruel/dcsi" = - { device = "zeruel.fuku:/mnt/pool1/dcsi"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - - fileSystems."/mnt/windoze2" = - { device = "/dev/disk/by-uuid/6084BE5384BE2B82"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; - fileSystems."/mnt/windoze" = - { device = "/dev/disk/by-uuid/46B01460B01458AF"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; - swapDevices = - [ { device = "/dev/disk/by-uuid/03ecd98d-013f-4476-b43a-bcae0bc1de67"; } - ]; - - # 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.br-71a907d8e6fd.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/v22/modules/home-manager/default.nix b/v22/modules/home-manager/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/v22/modules/nixos/default.nix b/v22/modules/nixos/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/v22/overlays/default.nix b/v22/overlays/default.nix deleted file mode 100644 index e69de29..0000000