From 13b42e251179648a91bf69255b80c5e4163da4dc Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 18 Mar 2024 17:20:18 -0500 Subject: [PATCH] add tsm flake --- flake.lock | 25 ++++++++++++++++++- flake.nix | 3 +++ hosts/othalan/default.nix | 2 +- modules/common.nix | 2 +- modules/development/cli.nix | 4 ++- .../{vivaldi.nix => chrome/default.nix} | 8 +++--- 6 files changed, 36 insertions(+), 8 deletions(-) rename modules/programs/{vivaldi.nix => chrome/default.nix} (75%) diff --git a/flake.lock b/flake.lock index 10df296..fa98300 100644 --- a/flake.lock +++ b/flake.lock @@ -381,7 +381,8 @@ "nixpkgs": "nixpkgs", "nixpkgs-wayland": "nixpkgs-wayland", "pinix": "pinix", - "stable": "stable" + "stable": "stable", + "tsm": "tsm" } }, "stable": { @@ -467,6 +468,28 @@ "type": "github" } }, + "tsm": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "nix", + "lastModified": 1710799014, + "narHash": "sha256-QQMkhLc3UPOziGHCKHLkLffbbUxhXBOpmaarTX1LfxM=", + "owner": "daylinmorgan", + "repo": "tsm", + "rev": "ebdf050743bfac25a08944b2a348327909371ce2", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "daylinmorgan", + "repo": "tsm", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index e8dcc3b..370d94f 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; stable.url = "github:nixos/nixpkgs/nixos-23.11"; + tsm.url = "github:daylinmorgan/tsm?dir=nix"; + tsm.inputs.nixpkgs.follows = "nixpkgs"; + hyprland.url = "github:hyprwm/Hyprland/main"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland-contrib.url = "github:hyprwm/contrib"; diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 28481dd..73f9041 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -20,8 +20,8 @@ "tex" "node" ]; + chrome.enable = true; }; - vivaldi.enable = true; environment.systemPackages = with pkgs; [ zk diff --git a/modules/common.nix b/modules/common.nix index 8480fe6..21e7127 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -26,7 +26,7 @@ languages # programs - vivaldi + chrome vscode ]; diff --git a/modules/development/cli.nix b/modules/development/cli.nix index 330f3be..3f72e82 100644 --- a/modules/development/cli.nix +++ b/modules/development/cli.nix @@ -1,7 +1,8 @@ { - config, + inputs, lib, pkgs, + config, ... }: let inherit (lib) mkOption mkIf types; @@ -32,6 +33,7 @@ in { ripgrep btop + inputs.tsm.packages.${pkgs.system}.tsm ]; }; } diff --git a/modules/programs/vivaldi.nix b/modules/programs/chrome/default.nix similarity index 75% rename from modules/programs/vivaldi.nix rename to modules/programs/chrome/default.nix index f52679a..f65cfe1 100644 --- a/modules/programs/vivaldi.nix +++ b/modules/programs/chrome/default.nix @@ -5,9 +5,9 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.vivaldi; + cfg = config.oizys.chrome; in { - options.vivaldi.enable = mkEnableOption "enable vivaldi + extensions"; + options.oizys.chrome.enable = mkEnableOption "enable chrome + extensions"; config = mkIf cfg.enable { programs.chromium = { enable = true; @@ -18,15 +18,15 @@ in { "pbmlfaiicoikhdbjagjbglnbfcbcojpj" # simplify gmail "oemmndcbldboiebfnladdacbdfmadadm" # pdf viewer "clngdbkpkpeebahjckkjfobafhncgmne" # stylus + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin ]; }; environment.systemPackages = with pkgs; [ - (vivaldi.override { + (google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; - proprietaryCodecs = true; }) ]; };