From 851eaf80ee345a72eb78658731ac060a8ea8b574 Mon Sep 17 00:00:00 2001 From: harry123 Date: Mon, 3 Mar 2025 08:58:57 +0100 Subject: [PATCH 1/2] it makes more sense upgrading to unstable --- flake.lock | 7 +++---- flake.nix | 37 ++++++++++++++++++---------------- hosts/goober/configuration.nix | 1 - overlays/foot-overlay.nix | 24 +++++++++------------- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index cc8de3d..2bd390c 100644 --- a/flake.lock +++ b/flake.lock @@ -252,16 +252,15 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index a8062ea..a85d847 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/release-24.11"; + home-manager.url = "github:nix-community/home-manager/"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; alejandra.url = "github:kamadorueda/alejandra/3.0.0"; @@ -30,7 +30,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; }; @@ -39,6 +39,7 @@ self, nixpkgs, nixpkgsSmall, + nixpkgsUnstable, sops-nix, nixos-generators, nix-darwin, @@ -58,7 +59,7 @@ }; system = "x86_64-linux"; - pkgs = import nixpkgs {inherit system;}; + pkgs = import nixpkgs { inherit system; }; in { nixosConfigurations = { @@ -80,21 +81,22 @@ ]; }; - goober = nixpkgs.lib.nixosSystem { + goober = nixpkgsUnstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = specialArgs; modules = [ ./hosts/goober/configuration.nix nix-flatpak.nixosModules.nix-flatpak - {environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ];} + { environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ]; } - home-manager.nixosModules.home-manager { + 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; }; } ]; }; @@ -152,17 +154,18 @@ }; }; - darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem { - modules = [ ./hosts/dadarwin/configuration.nix - - {system.configurationRevision = self.rev or self.dirtyRev or null;} - ]; - }; + darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem { + modules = [ + ./hosts/dadarwin/configuration.nix - # Expose the package set, including overlays, for convenience. - darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs; + { system.configurationRevision = self.rev or self.dirtyRev or null; } + ]; + }; - packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix {}; + # 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 { }; }; } diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index 9ed0989..f3783cf 100644 --- a/hosts/goober/configuration.nix +++ b/hosts/goober/configuration.nix @@ -17,7 +17,6 @@ ../../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 d775c77..87c10b0 100644 --- a/overlays/foot-overlay.nix +++ b/overlays/foot-overlay.nix @@ -1,19 +1,13 @@ -{ config, lib, pkgs, ... }: -{ - let foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec { +final: prev: { + 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 + }); +} From dc4c8a81e1587cb3f602f6a16bc8effe4c713033 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 7 Mar 2025 13:34:05 +0100 Subject: [PATCH 2/2] having fun with nixvim --- features/neovim/default.nix | 11 +++++ features/neovim/keys.nix | 14 ++++++ features/neovim/plugins.nix | 78 +++++++++++++++++++++++++++++ flake.nix | 15 +++--- home-manager/home.nix | 97 ++++++++++++++++++------------------- 5 files changed, 158 insertions(+), 57 deletions(-) create mode 100644 features/neovim/default.nix create mode 100644 features/neovim/keys.nix create mode 100644 features/neovim/plugins.nix diff --git a/features/neovim/default.nix b/features/neovim/default.nix new file mode 100644 index 0000000..2b98f29 --- /dev/null +++ b/features/neovim/default.nix @@ -0,0 +1,11 @@ +{ self, ... }: +{ + programs.nixvim = { + enable = true; + + colorschemes.catppuccin = { + enable = true; + settings.flavour = "latte"; + }; + }; +} diff --git a/features/neovim/keys.nix b/features/neovim/keys.nix new file mode 100644 index 0000000..36af769 --- /dev/null +++ b/features/neovim/keys.nix @@ -0,0 +1,14 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + programs.nixvim = { + enable = true; + keymaps = { + + }; + }; +} diff --git a/features/neovim/plugins.nix b/features/neovim/plugins.nix new file mode 100644 index 0000000..dc1a635 --- /dev/null +++ b/features/neovim/plugins.nix @@ -0,0 +1,78 @@ +{ + 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.nix b/flake.nix index a85d847..a5822cc 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,13 @@ nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - 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"; + inputs.nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -44,8 +44,8 @@ nixos-generators, nix-darwin, nix-flatpak, - anyrun, home-manager, + nixvim, ... }@inputs: let @@ -87,9 +87,6 @@ modules = [ ./hosts/goober/configuration.nix nix-flatpak.nixosModules.nix-flatpak - - { environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ]; } - home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -98,6 +95,8 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } + + nixvim.homeManagerModules.nixvim ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index ab3ddb6..89785d0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -30,72 +30,71 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = [ + home.packages = with pkgs; [ # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello - # # 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" ]; }) + nerd-fonts.code-new-roman - pkgs.dm-sans - pkgs.zoxide - pkgs.btop + dm-sans + zoxide + btop #pkgs.bitwarden - 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 + weechat + eclipses.eclipse-java # school wants us to use it... + cava + hyfetch + kittysay + nextcloud-client + thunderbird-bin + feh + waybar + p7zip - pkgs.playerctl - pkgs.wf-recorder + playerctl + wf-recorder - pkgs.file - pkgs.osu-lazer-bin + file + osu-lazer-bin - pkgs.qbittorrent + qbittorrent - pkgs.i2pd + i2pd - pkgs.ripgrep - pkgs.vscode + ripgrep + vscode - pkgs.zathura - pkgs.tor-browser + zathura + tor-browser - 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 + gammastep + lazygit + xfce.thunar + gimp-with-plugins + fzf + lf + why3 + alt-ergo + cvc4 + z3 + prismlauncher - pkgs.audacious - pkgs.audacious-plugins + audacious + audacious-plugins - pkgs.krita - pkgs.udiskie + krita + udiskie - pkgs.libsixel - pkgs.walker - pkgs.unzip - pkgs.p7zip + libsixel + walker + unzip + p7zip - pkgs.nixfmt-rfc-style + 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: