features/neovim/default.nix

@@ -1,11 +0,0 @@
-{ self, ... }:
-{
-  programs.nixvim = {
-    enable = true;
-
-    colorschemes.catppuccin = {
-      enable = true;
-      settings.flavour = "latte";
-    };
-  };
-}

features/neovim/keys.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-{
-  programs.nixvim = {
-    enable = true;
-    keymaps = {
-
-    };
-  };
-}

features/neovim/plugins.nix

@@ -1,78 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-{
-  programs.nixvim = {
-    plugins = {
-      lsp = {
-        enable = true;
-        servers = {
-          asm_lsp.enable = true;
-          gopls.enable = true;
-          java_language_server.enable = true;
-          rust-analyzer.enable = true;
-        };
-      };
-
-      nvim-cmp = {
-        enable = true;
-        autoEnableSources = true;
-        sources = [
-          { name = "nvim_lsp"; }
-          { name = "path"; }
-          { name = "buffer"; }
-
-        ];
-      };
-      barbar.enable = true;
-      gitsigns.enable = true;
-
-      comment = {
-        enable = true;
-      };
-
-      treesitter = {
-        enable = true;
-      };
-
-      web-devicons = {
-        enable = true;
-      };
-
-      emmet = {
-        enable = true;
-      };
-
-      nvim-autopairs = {
-        enable = true;
-      };
-
-      presence-nvim = {
-        enable = true;
-      };
-
-      chadtree = {
-        enable = true;
-      };
-
-      fzf-lua = {
-        enable = true;
-      };
-
-      notify = true;
-
-      neotest = {
-        enable = true;
-        adapters = {
-          rust.enable = true;
-          python.enable = true;
-          java.enable = true;
-          go.enable = true;
-        };
-      };
-    };
-  };
-}

flake.lock

@@ -252,15 +252,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1740845322,
+        "lastModified": 1739757849,
-        "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }

flake.nix

@@ -7,7 +7,7 @@
     nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
 
-    home-manager.url = "github:nix-community/home-manager/";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     alejandra.url = "github:kamadorueda/alejandra/3.0.0";
@@ -25,13 +25,13 @@
 
     nix-darwin.url = "github:LnL7/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-
+    anyrun = {
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
+      url = "github:anyrun-org/anyrun";
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-    inputs.nixvim = {
-      url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; 
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
   };
 
   outputs =
@@ -39,13 +39,12 @@
       self,
       nixpkgs,
       nixpkgsSmall,
-      nixpkgsUnstable,
       sops-nix,
       nixos-generators,
       nix-darwin,
       nix-flatpak,
+      anyrun,
       home-manager,
-      nixvim,
       ...
     }@inputs:
     let
@@ -59,7 +58,7 @@
       };
 
       system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs {inherit system;};
     in
     {
       nixosConfigurations = {
@@ -81,22 +80,22 @@
           ];
         };
 
-        goober = nixpkgsUnstable.lib.nixosSystem {
+        goober = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = specialArgs;
           modules = [
             ./hosts/goober/configuration.nix
             nix-flatpak.nixosModules.nix-flatpak
-            home-manager.nixosModules.home-manager
+
-            {
+            {environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ];}
+
+            home-manager.nixosModules.home-manager {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.${username} = import ./home-manager/home.nix;
-
+              
-              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.extraSpecialArgs = {inherit inputs;};
             }
-
-            nixvim.homeManagerModules.nixvim
           ];
         };
 
@@ -153,18 +152,17 @@
         };
       };
 
-      darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
-        modules = [
+      modules = [ ./hosts/dadarwin/configuration.nix 
-          ./hosts/dadarwin/configuration.nix
+      
+      {system.configurationRevision = self.rev or self.dirtyRev or null;}
+      ];
+    };
 
-          { system.configurationRevision = self.rev or self.dirtyRev or null; }
+    # Expose the package set, including overlays, for convenience.
-        ];
+    darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs;
-      };
 
-      # Expose the package set, including overlays, for convenience.
+   packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix {};
-      darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs;
-
-      packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix { };
     };
 
 }

home-manager/home.nix

@@ -30,71 +30,72 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = with pkgs; [
+  home.packages = [
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello
 
-    nerd-fonts.code-new-roman
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    (pkgs.nerdfonts.override { fonts = [ "CodeNewRoman" ]; })
 
-    dm-sans
+    pkgs.dm-sans
-    zoxide
+    pkgs.zoxide
-    btop
+    pkgs.btop
     #pkgs.bitwarden
-    weechat
+    pkgs.weechat
-    eclipses.eclipse-java # school wants us to use it...
+    pkgs.eclipses.eclipse-java # school wants us to use it...
-    cava
+    pkgs.cava
-    hyfetch
+    pkgs.hyfetch
-    kittysay
+    pkgs.kittysay
-    nextcloud-client
+    pkgs.nextcloud-client
-    thunderbird-bin
+    pkgs.thunderbird-bin
-    feh
+    pkgs.feh
-    waybar
+    pkgs.waybar
-    p7zip
+    pkgs.p7zip
 
-    playerctl
+    pkgs.playerctl
-    wf-recorder
+    pkgs.wf-recorder
 
-    file
+    pkgs.file
-    osu-lazer-bin
+    pkgs.osu-lazer-bin
 
-    qbittorrent
+    pkgs.qbittorrent
 
-    i2pd
+    pkgs.i2pd
 
-    ripgrep
+    pkgs.ripgrep
-    vscode
+    pkgs.vscode
 
-    zathura
+    pkgs.zathura
-    tor-browser
+    pkgs.tor-browser
 
-    gammastep
+    pkgs.gammastep
-    lazygit
+    pkgs.lazygit
-    xfce.thunar
+    pkgs.xfce.thunar
-    gimp-with-plugins
+    pkgs.gimp-with-plugins
-    fzf
+    pkgs.fzf
-    lf
+    pkgs.lf
-    why3
+    pkgs.why3
-    alt-ergo
+    pkgs.alt-ergo
-    cvc4
+    pkgs.cvc4
-    z3
+    pkgs.z3
-    prismlauncher
+    pkgs.prismlauncher
 
-    audacious
+    pkgs.audacious
-    audacious-plugins
+    pkgs.audacious-plugins
 
-    krita
+    pkgs.krita
-    udiskie
+    pkgs.udiskie
 
-    libsixel
+    pkgs.libsixel
-    walker
+    pkgs.walker
-    unzip
+    pkgs.unzip
-    p7zip
+    pkgs.p7zip
 
-    nixfmt-rfc-style
+    pkgs.nixfmt-rfc-style
-    signal-desktop
-    gajim
-    blender
     # # You can also create simple shell scripts directly inside your
     #  # configuration. For example, this adds a command 'my-hello' to your
     # # environment:

hosts/goober/configuration.nix

@@ -17,6 +17,7 @@
     ../../features/client/tailscale.nix
     ../../features/client/sway.nix
     ./features/default.nix
+    ./overlays/foot-overlay.nix
   ];
 
   nixpkgs.config.allowUnfree = true;

overlays/foot-overlay.nix

@@ -1,13 +1,19 @@
-final: prev: {
+{ config, lib, pkgs, ... }:
-  foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
+{
+  let foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
     inherit (oldAttrs) name;
     version = "1.20.2";
     src = pkgs.fetchFromGitea {
-      domain = "codeberg.org";
+    domain = "codeberg.org";
-      owner = "dnkl";
+    owner = "dnkl";
-      repo = "foot";
+    repo = "foot";
-      rev = version;
+    rev = version;
-      hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
+    hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
     };
-  });
+  }) in
-}
+  nixpkgs.overlays = [(
+    final: previous: {
+      foot = foot-next;
+    }
+  )];
+}