diff --git a/features/neovim/default.nix b/features/neovim/default.nix deleted file mode 100644 index 2b98f29..0000000 --- a/features/neovim/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ self, ... }: -{ - programs.nixvim = { - enable = true; - - colorschemes.catppuccin = { - enable = true; - settings.flavour = "latte"; - }; - }; -} diff --git a/features/neovim/keys.nix b/features/neovim/keys.nix deleted file mode 100644 index 36af769..0000000 --- a/features/neovim/keys.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - programs.nixvim = { - enable = true; - keymaps = { - - }; - }; -} diff --git a/features/neovim/plugins.nix b/features/neovim/plugins.nix deleted file mode 100644 index dc1a635..0000000 --- a/features/neovim/plugins.nix +++ /dev/null @@ -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; - }; - }; - }; - }; -} diff --git a/flake.lock b/flake.lock index 2bd390c..cc8de3d 100644 --- a/flake.lock +++ b/flake.lock @@ -252,15 +252,16 @@ ] }, "locked": { - "lastModified": 1740845322, - "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", + "lastModified": 1739757849, + "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" } diff --git a/flake.nix b/flake.nix index a5822cc..a8062ea 100644 --- a/flake.nix +++ b/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"; - - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixvim = { - url = "github:nix-community/nixvim"; + anyrun = { + url = "github:anyrun-org/anyrun"; 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 { - modules = [ - ./hosts/dadarwin/configuration.nix + darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem { + modules = [ ./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. - darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs; - - packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix { }; + packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix {}; }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 89785d0..ab3ddb6 100644 --- a/home-manager/home.nix +++ b/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 - zoxide - btop + pkgs.dm-sans + pkgs.zoxide + pkgs.btop #pkgs.bitwarden - weechat - eclipses.eclipse-java # school wants us to use it... - cava - hyfetch - kittysay - nextcloud-client - thunderbird-bin - feh - waybar - p7zip + pkgs.weechat + pkgs.eclipses.eclipse-java # school wants us to use it... + pkgs.cava + pkgs.hyfetch + pkgs.kittysay + pkgs.nextcloud-client + pkgs.thunderbird-bin + pkgs.feh + pkgs.waybar + pkgs.p7zip - playerctl - wf-recorder + pkgs.playerctl + pkgs.wf-recorder - file - osu-lazer-bin + pkgs.file + pkgs.osu-lazer-bin - qbittorrent + pkgs.qbittorrent - i2pd + pkgs.i2pd - ripgrep - vscode + pkgs.ripgrep + pkgs.vscode - zathura - tor-browser + pkgs.zathura + pkgs.tor-browser - gammastep - lazygit - xfce.thunar - gimp-with-plugins - fzf - lf - why3 - alt-ergo - cvc4 - z3 - prismlauncher + pkgs.gammastep + pkgs.lazygit + pkgs.xfce.thunar + pkgs.gimp-with-plugins + pkgs.fzf + pkgs.lf + pkgs.why3 + pkgs.alt-ergo + pkgs.cvc4 + pkgs.z3 + pkgs.prismlauncher - audacious - audacious-plugins + pkgs.audacious + pkgs.audacious-plugins - krita - udiskie + pkgs.krita + pkgs.udiskie - libsixel - walker - unzip - p7zip + pkgs.libsixel + pkgs.walker + pkgs.unzip + pkgs.p7zip - nixfmt-rfc-style - signal-desktop - gajim - blender + pkgs.nixfmt-rfc-style # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index f3783cf..9ed0989 100644 --- a/hosts/goober/configuration.nix +++ b/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; diff --git a/overlays/foot-overlay.nix b/overlays/foot-overlay.nix index 87c10b0..d775c77 100644 --- a/overlays/foot-overlay.nix +++ b/overlays/foot-overlay.nix @@ -1,13 +1,19 @@ -final: prev: { - foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec { +{ config, lib, pkgs, ... }: +{ + let foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec { inherit (oldAttrs) name; version = "1.20.2"; src = pkgs.fetchFromGitea { - domain = "codeberg.org"; - owner = "dnkl"; - repo = "foot"; - rev = version; - hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ="; + domain = "codeberg.org"; + owner = "dnkl"; + repo = "foot"; + rev = version; + hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ="; }; - }); -} + }) in + nixpkgs.overlays = [( + final: previous: { + foot = foot-next; + } + )]; +} \ No newline at end of file