diff --git a/aqua.yaml b/aqua.yaml deleted file mode 100644 index 2327efe..0000000 --- a/aqua.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -# aqua - Declarative CLI Version Manager -# https://aquaproj.github.io/ -# checksum: -# enabled: true -# require_checksum: true -# supported_envs: -# - all -registries: -- type: standard - ref: v4.269.0 # renovate: depName=aquaproj/aqua-registry -packages: -- name: kubernetes/kubectl@v1.31.3 -- name: charmbracelet/glow@v2.0.0 -- name: Azure/kubelogin@v0.1.5 -- name: derailed/k9s@v0.32.7 -- name: neovim/neovim@v0.10.2 -- name: kubernetes-sigs/krew@v0.4.4 -- name: hadolint/hadolint@v2.12.0 -- name: dandavison/delta@0.18.2 -- name: SuperCuber/dotter@v0.13.3 -- name: ClementTsang/bottom@0.10.2 -- name: topgrade-rs/topgrade@v16.0.1 -- name: sharkdp/bat@v0.24.0 -- name: bootandy/dust@v1.1.1 -- name: ogham/exa@v0.10.1 -- name: atuinsh/atuin@v18.3.0 -- name: jqlang/jq@jq-1.7.1 -- name: derailed/popeye@v0.21.5 -- name: kubecolor/kubecolor@v0.4.0 -- name: yannh/kubeconform@v0.6.7 -- name: zegl/kube-score@v1.19.0 -- name: terraform-linters/tflint@v0.54.0 -- name: pulumi/pulumi@v3.142.0 -- name: orhun/git-cliff@v2.7.0 diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index 7a1b3b8..71b0bb1 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -1,6 +1,6 @@ -alias ls 'exa' -alias l 'exa -ah' -alias ll 'exa -alh' +alias ls 'eza' +alias l 'eza -ah' +alias ll 'eza -alh' alias g 'git' alias gl 'git log' alias gpf 'git push --force-with-lease' diff --git a/nix/configuration.nix b/nix/configuration.nix index e56505c..a1cd6a6 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -2,9 +2,7 @@ { config, pkgs, ... }: { imports = [ - /etc/nixos/hardware-configuration.nix - (import ).nixosModules.default - + ./hardware-configuration.nix ]; nixpkgs.config.allowBroken = true; boot.loader.systemd-boot.enable = true; @@ -12,6 +10,7 @@ services.snap.enable = true; networking.hostName = "limgrave"; networking.networkmanager.enable = true; + environment.sessionVariables.MOZ_ENABLE_WAYLAND = 0; time.timeZone = "Europe/Madrid"; i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -63,6 +62,7 @@ enable = true; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; + windowManager.openbox.enable = true; xkb = { layout = "us"; diff --git a/nix/flake.lock b/nix/flake.lock index 0126f35..febcdc6 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -1,50 +1,87 @@ { "nodes": { - "flake-utils": { + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { "inputs": { - "systems": "systems" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "ghostty": { + "home-manager": { "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1735255310, - "narHash": "sha256-iAKNXAEfX+f+ETIgNPxCoNtmFpQsdEG3YYGhEPvohHI=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "35b9ceee2116331b83c0c86269394e2545070b0f", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { - "owner": "ghostty-org", - "repo": "ghostty", + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "nix-snapd": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734935829, + "narHash": "sha256-/7Y+EZoU8O+N2PgEIvJKwp6qLBuwiOq3MeC0YLezX/w=", + "owner": "nix-community", + "repo": "nix-snapd", + "rev": "355a1ed0141b6fd3093e3cb7b3492e6e67913681", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-snapd", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1735141468, - "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -54,83 +91,24 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-lib": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "root": { "inputs": { - "ghostty": "ghostty", + "home-manager": "home-manager", + "nix-snapd": "nix-snapd", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/nix/flake.nix b/nix/flake.nix index b586d90..21c683d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -3,22 +3,22 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - ghostty = { - url = "github:ghostty-org/ghostty"; + nix-snapd.url = "github:nix-community/nix-snapd"; + nix-snapd.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, ghostty, ... }@inputs: { + outputs = { self, nixpkgs, nix-snapd, home-manager, ... }@inputs: { nixosConfigurations.limgrave = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix - { - environment.systemPackages = [ - ghostty.packages.x86_64-linux.default - ]; - } + nix-snapd.nixosModules.default + home-manager.nixosModules.home-manager ]; }; }; -} \ No newline at end of file +} diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix new file mode 100644 index 0000000..df65371 --- /dev/null +++ b/nix/hardware-configuration.nix @@ -0,0 +1,60 @@ +# 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" ]; + }; + + 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/nix/packages.nix b/nix/packages.nix index 1d41c36..03cb8e6 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -10,7 +10,6 @@ pkgs: with pkgs; [ jellyfin-media-player spotify adwaita-icon-theme - jetbrains.pycharm-professional fishPlugins.z fishPlugins.tide fishPlugins.transient-fish @@ -26,6 +25,7 @@ pkgs: with pkgs; [ dotter pre-commit kubectl + krew k9s trashy cargo @@ -58,5 +58,19 @@ pkgs: with pkgs; [ r2modman kor exiftool - chatterino2 + samrewritten + jetbrains-toolbox + atuin + hadolint + delta + bottom + bat + dust + eza + jq + popeye + kubecolor + kubeconform + kube-score + tflint ]