From f0a7f40f06c4b48319f078bac6a744f3cee0f82b Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:26:49 -0800 Subject: [PATCH] remove stylix --- flake.lock | 266 +------------------------------------------------- flake.nix | 8 +- users/tao.nix | 52 +++++----- 3 files changed, 31 insertions(+), 295 deletions(-) diff --git a/flake.lock b/flake.lock index e2e0bdd..6af411a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,152 +1,5 @@ { "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", - "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", - "type": "github" - }, - "original": { - "owner": "chriskempson", - "repo": "base16-vim", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -168,22 +21,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -220,39 +57,6 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1698794309, - "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "45.1", - "repo": "gnome-shell", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -296,27 +100,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706001011, - "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "jujutsu": { "inputs": { "flake-utils": "flake-utils_2", @@ -418,22 +201,6 @@ "type": "indirect" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "helix": "helix", @@ -441,8 +208,7 @@ "jujutsu": "jujutsu", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", - "nixpkgs": "nixpkgs_2", - "stylix": "stylix" + "nixpkgs": "nixpkgs_2" } }, "rust-overlay": { @@ -495,36 +261,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", - "base16-fish": "base16-fish", - "base16-foot": "base16-foot", - "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", - "base16-vim": "base16-vim", - "flake-compat": "flake-compat", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1708896938, - "narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=", - "owner": "danth", - "repo": "stylix", - "rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 68025a9..dd26b7d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + # stylix.url = "github:danth/stylix"; helix = { url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,7 +22,6 @@ # url = "github:lilyinstarlight/nixos-cosmic"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - stylix.url = "github:danth/stylix"; # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -43,7 +43,7 @@ helix, jujutsu, # nixos-cosmic, - stylix, + # stylix, ... } @ inputs: { nixosConfigurations = { @@ -54,7 +54,7 @@ nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-gpu-nvidia-nonprime home-manager.nixosModules.home-manager - stylix.nixosModules.stylix + # stylix.nixosModules.stylix ./systems/BASED.nix ./systems/NOcomputer.nix ./users/tao.nix @@ -72,7 +72,7 @@ nixos-hardware.nixosModules.common-cpu-intel # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel home-manager.nixosModules.home-manager - stylix.nixosModules.stylix + # stylix.nixosModules.stylix ./systems/BASED.nix ./systems/NOlaptop.nix ./users/tao.nix diff --git a/users/tao.nix b/users/tao.nix index 4417a4c..0789cd9 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -103,32 +103,32 @@ options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 ''; - stylix.autoEnable = false; - stylix.image = /home/tao/Pictures/Wallpapers/DJI_0121.JPG; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; - stylix.fonts = with pkgs; { - monospace = { - package = nerdfonts.override {fonts = ["FiraCode"];}; - name = "FiraCode Nerd Font"; - }; - }; - stylix.targets = { - console.enable = true; - }; - home-manager.sharedModules = [ - { - stylix.targets = { - bat.enable = true; - # firefox.enable = true; - # helix.enable = true; - kde.enable = true; - nushell.enable = true; - # wezterm.enable = true; - zathura.enable = true; - zellij.enable = true; - }; - } - ]; + # stylix.autoEnable = false; + # stylix.image = /home/tao/Pictures/Wallpapers/DJI_0121.JPG; + # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; + # stylix.fonts = with pkgs; { + # monospace = { + # package = nerdfonts.override {fonts = ["FiraCode"];}; + # name = "FiraCode Nerd Font"; + # }; + # }; + # stylix.targets = { + # console.enable = true; + # }; + # home-manager.sharedModules = [ + # { + # stylix.targets = { + # bat.enable = true; + # # firefox.enable = true; + # # helix.enable = true; + # kde.enable = true; + # nushell.enable = true; + # # wezterm.enable = true; + # zathura.enable = true; + # zellij.enable = true; + # }; + # } + # ]; fonts.packages = with pkgs; [ # (nerdfonts.override {fonts = ["FiraCode"];})