diff --git a/flake.lock b/flake.lock index 40c3bb1..d3c6b94 100644 --- a/flake.lock +++ b/flake.lock @@ -26,7 +26,7 @@ "catppuccin-vsc": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { @@ -101,7 +101,7 @@ "home-manager-unstable": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { @@ -143,7 +143,7 @@ "inputs": { "nix-github-actions": "nix-github-actions", "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { @@ -236,7 +236,7 @@ "nix-index-db-unstable": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { @@ -284,19 +284,7 @@ "type": "indirect" } }, - "nixpkgs-pr280779": { - "flake": false, - "locked": { - "narHash": "sha256-eP6JaUafbs7ulve2jOsidJKM28bKzcLgoQ4WKXN1k4I=", - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/280779.patch" - }, - "original": { - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/280779.patch" - } - }, - "nixpkgs-unstable-raw": { + "nixpkgs-unstable": { "locked": { "lastModified": 1704722960, "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", @@ -317,7 +305,7 @@ "home-manager-unstable" ], "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { @@ -347,8 +335,7 @@ "nix-index-db-unstable": "nix-index-db-unstable", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-pr280779": "nixpkgs-pr280779", - "nixpkgs-unstable-raw": "nixpkgs-unstable-raw", + "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "vscode-extensions": "vscode-extensions" } @@ -388,7 +375,7 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-unstable-raw" + "nixpkgs-unstable" ] }, "locked": { diff --git a/flake.nix b/flake.nix index a7cdc98..75ab5e1 100755 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-23.11"; - nixpkgs-unstable-raw.url = "nixpkgs/nixos-unstable"; - - nixpkgs-pr280779 = { - url = "file+https://github.com/NixOS/nixpkgs/pull/280779.patch"; - flake = false; - }; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; agenix = { url = "github:ryantm/agenix"; @@ -25,14 +20,14 @@ home-manager-unstable = { url = "github:nix-community/home-manager/"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; jovian = { url = "github:Jovian-Experiments/Jovian-NixOS"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nix-impermanence.url = "github:nix-community/impermanence"; @@ -48,41 +43,30 @@ nix-index-db-unstable = { url = "github:Mic92/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; plasma-manager = { url = "github:pjones/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.home-manager.follows = "home-manager-unstable"; }; catppuccin-vsc = { url = "github:catppuccin/vscode"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; - inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nix-flatpak.url = github:gmodena/nix-flatpak/main; }; - outputs = { ... } @inputs: with inputs; - # Patch nixpkgs - # https://ertt.ca/nix/patch-nixpkgs/ - let - nixpkgs-unstable-patched = nixpkgs.legacyPackages.x86_64-linux.applyPatches { - name = "patched-nixpkgs-unstable"; - src = nixpkgs-unstable-raw; - patches = [ nixpkgs-pr280779 ]; - }; - # https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26 - nixpkgs-unstable = (import "${nixpkgs-unstable-patched}/flake.nix").outputs { self = inputs.self; }; - in - { + outputs = { ... } @inputs: with inputs; { + devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { name = "Environment for toast's nixos configurations"; # The agenix cli is not needed to activate a configuration, so instead of installing it @@ -98,7 +82,7 @@ ''; }; packages = { - x86_64-linux = with import nixpkgs-unstable-raw { system = "x86_64-linux"; }; { + x86_64-linux = with import nixpkgs-unstable { system = "x86_64-linux"; }; { pseint = callPackage ./pkgs/pseint.nix {}; anything-sync-daemon = callPackage ./pkgs/anything-sync-daemon {}; discord-krisp-fixer = callPackage ./pkgs/discord-krisp-fixer {}; @@ -107,7 +91,7 @@ nixosConfigurations = { Archie = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; }; + specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; }; /* I used to set up nixpkgs in the flake, but doing that made defining overlays in modules impossible (or at least I could @@ -129,7 +113,7 @@ SurfaceGo = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; }; + specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; }; modules = [ agenix.nixosModules.default home-manager-unstable.nixosModule @@ -144,7 +128,7 @@ SteamDeck = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; }; + specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; }; modules = [ agenix.nixosModules.default jovian.nixosModules.default diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 29bf21d..42a9518 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -64,22 +64,6 @@ # Set up time zone. time.timeZone = "Europe/Madrid"; - nixpkgs.overlays = [ - ( - final: prev: { - catppuccin = prev.catppuccin.override { - accent = "mauve"; - variant = "mocha"; - themeList = [ - "bat" - "btop" - "starship" - ]; - }; - } - ) - ]; - home-manager = { backupFileExtension = "hm-backup"; useGlobalPkgs = true; diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix index 2a8224d..2075753 100644 --- a/roles/common/programs/bat.nix +++ b/roles/common/programs/bat.nix @@ -9,8 +9,13 @@ }; themes = { catppuccin-mocha = { - src = pkgs.catppuccin; - file = "bat/Catppuccin-mocha.tmTheme"; + src = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "bat"; + rev = "master"; + hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + file = "Catppuccin-mocha.tmTheme"; }; }; }; diff --git a/roles/common/programs/btop.nix b/roles/common/programs/btop.nix index 5150cbf..291d05e 100644 --- a/roles/common/programs/btop.nix +++ b/roles/common/programs/btop.nix @@ -1,5 +1,15 @@ { pkgs, ... }: +let + catppuccinBtop = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "btop"; + # I know fetiching from master is not best practice but idc this is not going to change often + # Latest commit rn is c6469190f2ecf25f017d6120bf4e050e6b1d17af + rev = "master"; + hash = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs="; +}; +in { home-manager = { users.toast = { @@ -10,7 +20,7 @@ }; }; xdg.configFile = { - "btop/themes".source = "${pkgs.catppuccin}/btop"; + "btop/themes".source = "${catppuccinBtop}/themes"; }; }; }; diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index 0718478..d7a3518 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -5,7 +5,13 @@ with builtins; let catppuccinFlavour = "mocha"; - catppuccinStarship = pkgs.catppuccin + /starship/${catppuccinFlavour}.toml; + catppuccinStarship = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "starship"; + # Latest commit is 5629d2356f62a9f2f8efad3ff37476c19969bd4f + rev = "main"; + hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + } + /palettes/${catppuccinFlavour}.toml; presets = { nerdFontSymbols = pkgs.fetchurl {