treewide: remove swathes of unused code

moni-dz · Oct 12, 2024 · f2d88d6 · f2d88d6
1 parent 4d2d94a
commit f2d88d6
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 497 deletions.
diff --git a/hosts/mistral/configuration.nix b/hosts/mistral/configuration.nix
@@ -223,7 +223,7 @@
 
         environment = {
           ACCEPT_EULA = "Y";
-          MSSQL_SA_PASSWORD = __readFile config.age.secrets.ms-sql-server.path; # yes, this is bad but I don't have much choice...
+          # MSSQL_SA_PASSWORD = __readFile config.age.secrets.ms-sql-server.path; # yes, this is bad but I don't have much choice...
         };
 
         extraOptions = [ "--network=db-net" ];

diff --git a/hosts/riscake/configuration.nix b/hosts/riscake/configuration.nix
@@ -19,68 +19,11 @@
     };
   };
 
-  services = {
-    nix-daemon.enable = true;
-
-    skhd = {
-      enable = false;
-
-      skhdConfig =
-        let
-          spaces = map toString (lib.range 1 5);
-          ws = n: "cmd - ${n} : yabai -m space --focus ${n}";
-          move = n: "shift + cmd - ${n} : yabai -m window --space ${n}; yabai -m space --focus ${n}";
-        in
-        ''
-          cmd - return : open -na iterm
-        ''
-        + lib.optionalString config.services.yabai.enable ''
-          cmd - e : yabai -m window --toggle zoom-fullscreen
-          shift + cmd - e : yabai -m window --toggle float --grid 4:4:1:1:2:2
-        ''
-        + lib.optionalString config.services.yabai.enable (lib.concatLines (map move spaces));
-    };
-
-    yabai = {
-      enable = false;
-      enableScriptingAddition = false;
-      package = pkgs.yabai;
-
-      config =
-        let
-          gap = 8;
-        in
-        {
-          layout = "bsp";
-          mouse_follows_focus = "off";
-          top_padding = gap;
-          bottom_padding = gap;
-          left_padding = gap;
-          right_padding = gap;
-          window_gap = gap;
-          window_placement = "second_child";
-          window_shadow = "float";
-        };
-
-      extraConfig = ''
-        yabai -m rule --add app='System Settings' manage=off
-        yabai -m rule --add app='Finder' manage=off
-      '';
-    };
-  };
-
+  services.nix-daemon.enable = true;
   programs.fish.enable = true;
   security.pam.enableSudoTouchIdAuth = true;
 
   fonts.packages = __attrValues {
-    inherit (pkgs)
-      fira-code
-      comic-neue
-      fantasque-sans-mono
-      emacs-all-the-icons-fonts
-      terminus_font_ttf
-      unifont
-      unifont_upper
-      ;
+    inherit (pkgs) comic-neue;
   };
 }
diff --git a/modules/shared/home-manager/config/init.lua b/modules/shared/home-manager/config/init.lua
diff --git a/modules/shared/home-manager/default.nix b/modules/shared/home-manager/default.nix
@@ -86,46 +86,6 @@
       };
     };
 
-    helix = {
-      enable = false;
-      defaultEditor = false;
-
-      themes = {
-        rose-pine = fromTOML (
-          __readFile (__fetchurl {
-            url = "https://raw.githubusercontent.com/rose-pine/helix/main/rose_pine.toml";
-            sha256 = "sha256-C9PRimsu8JOHMDVAZovTwGtNnjM0/ZHHnJ8igtcalHs";
-          })
-        );
-
-        rose-pine-moon = fromTOML (
-          __readFile (__fetchurl {
-            url = "https://raw.githubusercontent.com/rose-pine/helix/main/rose_pine_moon.toml";
-            sha256 = "sha256-6okdImytU6EU10UuiOdWE5OP7t0pWf5wx/bFK43DDgk=";
-          })
-        );
-
-        rose-pine-dawn = fromTOML (
-          __readFile (__fetchurl {
-            url = "https://raw.githubusercontent.com/rose-pine/helix/main/rose_pine_dawn.toml";
-            sha256 = "sha256-9WNRaI3OIhSquwNmQCkYgicCZGvcEBmari6m+pAg0b8=";
-          })
-        );
-      };
-
-      settings = {
-        theme = "rose-pine";
-
-        editor = {
-          cursor-shape = {
-            insert = "bar";
-            normal = "block";
-            select = "underline";
-          };
-        };
-      };
-    };
-
     home-manager = {
       enable = true;
       path = lib.mkForce "${inputs.home}";
@@ -178,56 +138,6 @@
 
     nix-index-database.comma.enable = lib.mkDefault true;
 
-    neovim = {
-      enable = false;
-      defaultEditor = false;
-
-      plugins = __attrValues {
-        inherit (pkgs.vimPlugins)
-          which-key-nvim
-          nvim-lspconfig
-          nvim-cmp
-          cmp-nvim-lsp
-          cmp-vsnip
-          cmp-path
-          cmp-buffer
-          popup-nvim
-          plenary-nvim
-          telescope-nvim
-          rust-tools-nvim
-          rose-pine
-          leap-nvim
-          ;
-
-        nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
-
-        auto-dark-mode-nvim = pkgs.vimUtils.buildVimPlugin {
-          name = "auto-dark-mode-nvim";
-
-          src = pkgs.fetchFromGitHub {
-            owner = "f-person";
-            repo = "auto-dark-mode.nvim";
-            rev = "7d15094390f1a0638a5e533022e99a6aa503dbdf";
-            hash = "sha256-f3AJukU9osmHFAWxmSEAw5/GsQyBXDVPdW3eUJJSNpM=";
-          };
-        };
-
-        inlay-hints-nvim = pkgs.vimUtils.buildVimPlugin {
-          name = "inlay-hints-nvim";
-
-          src = pkgs.fetchFromGitHub {
-            owner = "simrat39";
-            repo = "inlay-hints.nvim";
-            rev = "006b0898f5d3874e8e528352103733142e705834";
-            hash = "sha256-cDWx08N+NhN5Voxh8f7RGzerbAYB5FHE6TpD4/o/MIQ=";
-          };
-        };
-      };
-
-      package = inputs'.nvim.packages.default;
-      extraLuaConfig = __readFile ./config/init.lua;
-    };
-
     starship = {
       enable = true;
       settings = import ./config/starship.nix;

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -9,65 +9,5 @@ _:
         pydashing = pfinal.callPackage ./derivations/dashing.nix { };
       };
     };
-
-    firefox-unwrapped = prev.firefox-unwrapped.overrideAttrs (old: {
-      patches = (old.patches or [ ]) ++ [ ./patches/D164578.diff ];
-    });
-
-    iosevka-ft = prev.iosevka.override {
-      privateBuildPlan = {
-        export-glyph-names = true;
-        family = "Iosevka FT";
-        ligations.inherits = "dlig";
-        no-cv-ss = false;
-        serifs = "sans";
-        spacing = "term";
-
-        variants = {
-          inherits = "ss14";
-
-          design = {
-            ascii-grave = "raised-turn-comma";
-            ascii-single-quote = "raised-comma";
-            brace = "curly-flat-boundary";
-            capital-j = "serifless";
-            capital-k = "curly-serifless";
-            capital-r = "curly";
-            caret = "high";
-            cyrl-capital-ka = "curly-serifless";
-            cyrl-capital-u = "cursive";
-            cyrl-ka = "curly-serifless";
-            eight = "crossing-asymmetric";
-            four = "closed";
-            g = "single-storey-serifless";
-            k = "curly-serifless";
-            lower-alpha = "crossing";
-            lower-lambda = "straight-turn";
-            nine = "closed-contour";
-            paren = "normal";
-            q = "earless-corner";
-            question = "smooth";
-            seven = "straight-serifless";
-            six = "closed-contour";
-            t = "flat-hook-short-neck";
-            three = "two-arcs";
-            underscore = "above-baseline";
-            y = "cursive";
-          };
-
-          italic = {
-            a = "double-storey-serifless";
-            f = "serifless";
-          };
-
-          oblique = {
-            cyrl-ef = "cursive";
-            f = "serifless";
-          };
-        };
-      };
-
-      set = "ft";
-    };
   };
 }
diff --git a/overlays/patches/D164578.diff b/overlays/patches/D164578.diff