From ad9c7413a3e30d4b0fa6af5a17b4bc1fcd44f3e3 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Tue, 24 Jun 2025 14:11:38 -0400 Subject: [PATCH] cleanup --- dot_config/flake/flake.lock | 410 +----------------- dot_config/flake/flake.nix | 18 +- dot_config/flake/home/gui.nix | 15 +- dot_config/flake/home/kitty.nix | 7 +- dot_config/flake/machines/hinge/home.nix | 1 - .../flake/machines/wash/configuration.nix | 1 - dot_config/flake/machines/wash/home.nix | 7 - 7 files changed, 14 insertions(+), 445 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index e1b6c24..8e5478f 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -1,72 +1,5 @@ { "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "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-helix": { - "flake": false, - "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1727974419, @@ -103,38 +36,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -171,42 +72,6 @@ "type": "github" } }, - "flake-utils_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -222,87 +87,6 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "47.2", - "repo": "gnome-shell", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -332,11 +116,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1750781171, + "narHash": "sha256-39oPt8TJZmt3bNEKBcwB+QuasiavRDwM5jkw6UkRb98=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "a4bac2b9ba2f9bd68032880da8ae6b44fbc46047", "type": "github" }, "original": { @@ -345,28 +129,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -402,25 +164,6 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" } }, - "nixgl": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "nix-community", - "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixGL", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1728018373, @@ -439,11 +182,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -455,26 +198,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { @@ -484,32 +212,14 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "darwin": "darwin", "helix": "helix", "home-manager": "home-manager", "lix-module": "lix-module", - "nixgl": "nixgl", - "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", - "stylix": "stylix" + "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable" } }, "rust-overlay": { @@ -533,39 +243,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "git-hooks": "git-hooks", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_3", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" - }, - "locked": { - "lastModified": 1747771231, - "narHash": "sha256-DYdmj22ZvkN5x9/VtdV5Wnze+UaPuboYraCPnOWn6u4=", - "owner": "danth", - "repo": "stylix", - "rev": "66f554e4e32d804bcf2c007a7b7efef04a3773b0", - "type": "github" - }, - "original": { - "owner": "danth", - "ref": "release-24.11", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -595,71 +272,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } } }, "root": "root", diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 13360bf..5ccc230 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -12,9 +12,8 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixgl.url = "github:nix-community/nixGL"; helix.url = "github:helix-editor/helix/25.01.1"; - stylix.url = "github:danth/stylix/release-24.11"; + darwin = { url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,7 +28,6 @@ home-manager, darwin, helix, - stylix, ... } @ inputs: let inherit (self) outputs; @@ -72,8 +70,6 @@ modules = [ lix-module.nixosModules.default - stylix.nixosModules.stylix - ./machines/wash/configuration.nix home-manager.nixosModules.home-manager @@ -115,18 +111,6 @@ extraSpecialArgs = {inherit inputs outputs;}; modules = [./home/guidebolt/guidebolt.nix]; }; - - # "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration { - # pkgs = allPkgs."aarch64-darwin"; - # extraSpecialArgs = {inherit inputs outputs;}; - # modules = [./home/wash/wash.nix]; - # }; - - # "tyler@wash" = home-manager.lib.homeManagerConfiguration { - # pkgs = allPkgs."x86_64-linux"; - # extraSpecialArgs = {inherit inputs outputs;}; - # modules = [stylix.homeManagerModules.stylix ./home/wash/wash.nix]; - # }; }; }; } diff --git a/dot_config/flake/home/gui.nix b/dot_config/flake/home/gui.nix index c3936f1..4078e98 100644 --- a/dot_config/flake/home/gui.nix +++ b/dot_config/flake/home/gui.nix @@ -1,17 +1,8 @@ -{ - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./kitty.nix ]; - nixGL.packages = inputs.nixgl.packages; - nixGL.defaultWrapper = "mesa"; - # nixGL.offloadWrapper = "nvidiaPrime"; - nixGL.installScripts = ["mesa"]; - home.packages = with pkgs; [ adw-gtk3 @@ -20,20 +11,16 @@ # Office libreoffice obsidian - - # (config.lib.nixGL.wrap unstable.onagre) ]; # programs.vscode.enable = true; # programs.alacritty = { # enable = true; - # package = config.lib.nixGL.wrap pkgs.alacritty; # }; # programs.wezterm = { # enable = false; - # package = config.lib.nixGL.wrap pkgs.wezterm; # extraConfig = '' # return { # font_size=9.25, diff --git a/dot_config/flake/home/kitty.nix b/dot_config/flake/home/kitty.nix index 05cb4a8..8c977a6 100644 --- a/dot_config/flake/home/kitty.nix +++ b/dot_config/flake/home/kitty.nix @@ -1,11 +1,6 @@ -{ - pkgs, - config, - ... -}: { +{...}: { programs.kitty = { enable = true; - package = config.lib.nixGL.wrap pkgs.kitty; settings = { disable_ligatures = "cursor"; diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix index b64b1a9..b61a94a 100644 --- a/dot_config/flake/machines/hinge/home.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { imports = [ - # ../../home/stylix.nix ../../home/common.nix ../../home/kitty.nix diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index b4d08df..ff5d199 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -6,7 +6,6 @@ }: { imports = [ # Include the results of the hardware scan. - ../../home/stylix.nix ./hardware-configuration.nix ]; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 9f4058c..50b5bd1 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -1,15 +1,9 @@ {pkgs, ...}: { imports = [ - # ../../home/stylix.nix ../../home/common.nix ../../home/darkman.nix - # ../../home/waybar/mechabar - # ../../home/sway - - # ../../home/hyprland - ../../home/home-backup.nix ../../home/gui.nix @@ -24,7 +18,6 @@ packages = with pkgs; [ nom - # (config.lib.nixGL.wrap renderdoc) ]; stateVersion = "23.11";