diff --git a/flake.lock b/flake.lock index 4df4551..bab7313 100644 --- a/flake.lock +++ b/flake.lock @@ -108,22 +108,6 @@ "type": "github" } }, - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -787,25 +771,6 @@ "type": "github" } }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "nix-colors", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -890,21 +855,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1743315132, @@ -1070,7 +1020,6 @@ "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "hyprland": "hyprland", - "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 5efbbe2..c8f7608 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - nix-colors.url = "github:misterio77/nix-colors"; ## unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-gimp3.url = "github:jtojnar/nixpkgs/gimp-meson"; @@ -65,7 +64,6 @@ , agenix , home-manager , home-manager-unstable - , nix-colors #, nixos-cosmic , nixvim , nixos-generators @@ -169,7 +167,6 @@ // import ./systems/laptop/userdata.nix; pkgsVersion = nixpkgs-unstable; home-manager-version = home-manager-unstable; - inherit nix-colors; }; modules = [ ### User specific ### diff --git a/home-manager/code.nix b/home-manager/code.nix index 0200ae4..6fd8b24 100644 --- a/home-manager/code.nix +++ b/home-manager/code.nix @@ -1,24 +1,24 @@ { osConfig, config, pkgs, inputs, lib, ... }: { config = lib.mkIf osConfig.custom.graphical.code.enable rec { - home.activation.makeVSCodeConfigWritable = - let - configDirName = { - "vscode" = "Code"; - "vscode-insiders" = "Code - Insiders"; - "vscodium" = "VSCodium"; - }.${programs.vscode.package.pname}; - configPath = - "${config.xdg.configHome}/${configDirName}/User/settings.json"; - in - { - after = [ "writeBoundary" ]; - before = [ ]; - data = '' - if [ -e "$(readlink ${configPath})" ]; then - install -m 0640 "$(readlink ${configPath})" ${configPath} - fi - ''; - }; + #home.activation.makeVSCodeConfigWritable = + # let + # configDirName = { + # "vscode" = "Code"; + # "vscode-insiders" = "Code - Insiders"; + # "vscodium" = "VSCodium"; + # }.${programs.vscode.package.pname}; + # configPath = + # "${config.xdg.configHome}/${configDirName}/User/settings.json"; + # in + # { + # after = [ "writeBoundary" ]; + # before = [ ]; + # data = '' + # if [ -e "$(readlink ${configPath})" ]; then + # install -m 0640 "$(readlink ${configPath})" ${configPath} + # fi + # ''; + # }; programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/users/anon/home.nix b/users/anon/home.nix index a646a5c..74c8b7f 100644 --- a/users/anon/home.nix +++ b/users/anon/home.nix @@ -17,7 +17,6 @@ ../../home-manager/gitconfig.nix ../../home-manager/zsh ../../home-manager/direnv.nix - inputs.nix-colors.homeManagerModule inputs.nixvim.homeManagerModules.nixvim ]; diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix index dffb69b..e1c3532 100644 --- a/users/kopatz/home.nix +++ b/users/kopatz/home.nix @@ -33,7 +33,6 @@ ../../home-manager/mpv.nix ../../home-manager/discord-theme.nix inputs.nixvim.homeManagerModules.nixvim - inputs.nix-colors.homeManagerModule ]; programs.feh = { diff --git a/users/vm/home.nix b/users/vm/home.nix index c9fa8ea..76a894c 100644 --- a/users/vm/home.nix +++ b/users/vm/home.nix @@ -8,7 +8,6 @@ #../../home-manager/kitty.nix #../../home-manager/i3.nix #inputs.nixvim.homeManagerModules.nixvim - #inputs.nix-colors.homeManagerModule ]; }