diff --git a/flake.lock b/flake.lock index d573f01..e2e6ce6 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { @@ -37,10 +37,27 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1762361079, + "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 0da5bfc..44aebbe 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; @@ -11,54 +12,64 @@ }; - outputs = inputs@{ self, nixpkgs, home-manager, ... }: { - - nixosConfigurations = { - segfault-machine = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/segfault-machine/configuration.nix - - home-manager.nixosModules.home-manager { - home-manager.backupFileExtension = "backup"; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - - - home-manager.users.lukas.imports = [ - ./home/lukas/laptop/default.nix - ]; - - home-manager.extraSpecialArgs = { inherit inputs; }; - - } - ]; + outputs = inputs@{ self, nixpkgs, home-manager, ... }: + let + system = "x86_64-linux"; + lib = nixpkgs.lib; + pkgs-unstable = import inputs.nixpkgs-unstable { + system = system; + config.allowUnfree = true; }; + in + { + nixosConfigurations = { + segfault-machine = lib.nixosSystem { + inherit system; # inherited it from 'let' block - segfault-tower = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/segfault-tower/configuration.nix + specialArgs = { inherit pkgs-unstable; }; + + modules = [ + ./hosts/segfault-machine/configuration.nix + + home-manager.nixosModules.home-manager { + home-manager.backupFileExtension = "backup"; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; - home-manager.nixosModules.home-manager { - home-manager.backupFileExtension = "backup"; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.lukas.imports = [ - ./home/lukas/tower/default.nix - ]; + home-manager.users.lukas.imports = [ + ./home/lukas/laptop/default.nix + ]; + + home-manager.extraSpecialArgs = { inherit inputs; }; + + } + ]; + }; + + segfault-tower = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit pkgs-unstable; }; + modules = [ + ./hosts/segfault-tower/configuration.nix + + + home-manager.nixosModules.home-manager { + home-manager.backupFileExtension = "backup"; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + + home-manager.users.lukas.imports = [ + ./home/lukas/tower/default.nix + ]; + + home-manager.extraSpecialArgs = { inherit inputs; }; + } + ]; + }; - home-manager.extraSpecialArgs = { inherit inputs; }; - } - ]; }; - - }; }; } diff --git a/home/lukas/tower/packages.nix b/home/lukas/tower/packages.nix index a43bf68..6ac2de3 100644 --- a/home/lukas/tower/packages.nix +++ b/home/lukas/tower/packages.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - fonts.fontconfig.enable = true; home.packages = [ @@ -12,7 +11,6 @@ pkgs.element-desktop pkgs.tidal-hifi - pkgs.tree pkgs.htop pkgs.neovim @@ -42,7 +40,7 @@ pkgs.binutils pkgs.gcc - pkgs.scenebuilder + # pkgs.scenebuilder pkgs.nil diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 8bf0c21..da3bb89 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -1,6 +1,9 @@ +{config, pkgs-unstable, ... }: + { services.ollama = { enable = true; + package = pkgs-unstable.ollama; acceleration = "cuda"; }; @@ -9,6 +12,7 @@ }; services.open-webui = { + package = pkgs-unstable.open-webui; enable = true; port = 8081; environment = { @@ -17,6 +21,10 @@ SCARF_NO_ANALYTICS = "True"; OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api"; OLLAMA_BASE_URL = "http://127.0.0.1:11434"; + WEBUI_AUTH = "False"; + FRONTEND_BUILD_DIR = "${config.services.open-webui.stateDir}/build"; + DATA_DIR = "${config.services.open-webui.stateDir}/data"; + STATIC_DIR = "${config.services.open-webui.stateDir}/static"; }; };