diff --git a/flake.lock b/flake.lock index 58e1721e..caad77ba 100644 --- a/flake.lock +++ b/flake.lock @@ -182,6 +182,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1732053737, + "narHash": "sha256-A+F7WSHR29wIynmzbXMwgUb9rkNAeYwlN15Xm3vZjKk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "32754128c4ef529c567d216a783cb6fdd95ff196", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1731676054, @@ -203,7 +219,8 @@ "home-manager": "home-manager", "niri": "niri", "nixd": "nixd", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_2" } }, "treefmt-nix": { diff --git a/flake.nix b/flake.nix index 7ecc5437..c527b73f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/global.nix b/global.nix index 2ca9799c..c2aed684 100644 --- a/global.nix +++ b/global.nix @@ -13,66 +13,74 @@ services.flatpak.enable = true; - environment.systemPackages = with pkgs; [ - nix-index - git + environment.systemPackages = let + # You can specify here if you want to add any packages from the stable branch onto your system + stablePackages = with inputs.nixpkgs-stable.legacyPackages.x86_64-linux; [ + gtk-pipe-viewer + ]; + in + # Normal (unstable) packages + with pkgs; [ + nix-index + git - # Programming Stuff, language servers etc - gcc - swift - swiftPackages.Foundation - swiftpm - sourcekit-lsp - gradle - nodejs - typescript - deno - # Purely for the tooling - postgresql + # Programming Stuff, language servers etc + gcc + swift + swiftPackages.Foundation + swiftpm + sourcekit-lsp + gradle + nodejs + typescript + deno + # Purely for the tooling + postgresql - sqlite # For development and also telescope-all-recent + sqlite # For development and also telescope-all-recent - # Debugging/LSP related tooling - gdb - lldb_18 # For lldb-dap - clang-tools # clangd - jdt-language-server # Java language server - gnumake - cargo - lua-language-server - yaml-language-server - ansible-language-server - ansible-lint - nginx-language-server - emmet-language-server - vscode-langservers-extracted - docker-compose-language-service - # nodePackages.prettier - nodePackages.typescript-language-server - nodePackages.bash-language-server - python312Packages.jedi-language-server - nixd + # Debugging/LSP related tooling + gdb + lldb_18 # For lldb-dap + clang-tools # clangd + jdt-language-server # Java language server + gnumake + cargo + lua-language-server + yaml-language-server + ansible-language-server + ansible-lint + nginx-language-server + emmet-language-server + vscode-langservers-extracted + docker-compose-language-service + # nodePackages.prettier + nodePackages.typescript-language-server + nodePackages.bash-language-server + python312Packages.jedi-language-server + nixd + + neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + zoxide # A fast cd command that learns your habits + tealdeer # A very fast implementation of tldr in Rust + sc-im + emacs-gtk + fastfetch + appimage-run + imagemagick + yt-dlp + python3 + cifs-utils + exfatprogs + usbutils + inetutils + pciutils + xdg-user-dirs + linuxPackages.usbip + unixtools.xxd + dotnet-sdk + ] ++ stablePackages; - neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - zoxide # A fast cd command that learns your habits - tealdeer # A very fast implementation of tldr in Rust - sc-im - emacs-gtk - fastfetch - appimage-run - imagemagick - yt-dlp - python3 - cifs-utils - exfatprogs - usbutils - inetutils - pciutils - xdg-user-dirs - linuxPackages.usbip - unixtools.xxd - dotnet-sdk - ]; systemd.services.usbipd = { description = "Custom service that runs usbipd"; wantedBy = [ "multi-user.target" ];