diff --git a/flake.lock b/flake.lock index 22c03ad..e159eba 100644 --- a/flake.lock +++ b/flake.lock @@ -46,32 +46,32 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1785119570, + "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1785104993, + "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 93a832c..170c827 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS + Home Manager config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; antigravity-nix = { url = "github:jacopone/antigravity-nix"; @@ -10,7 +10,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/lukas/common/git.nix b/home/lukas/common/git.nix index a82b1fe..557aab5 100644 --- a/home/lukas/common/git.nix +++ b/home/lukas/common/git.nix @@ -9,10 +9,9 @@ in { programs.git = { enable = true; - userName= "Lukas"; - userEmail = "mail@lukas.contact"; - - extraConfig = { + settings = { + user.name = "Lukas"; + user.email = "mail@lukas.contact"; commit.gpgsign = true; gpg.format = "ssh"; gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers"; @@ -26,4 +25,3 @@ in { - diff --git a/home/lukas/common/shell.nix b/home/lukas/common/shell.nix index ca8dcfc..32719bb 100644 --- a/home/lukas/common/shell.nix +++ b/home/lukas/common/shell.nix @@ -1,8 +1,9 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { programs.zsh = { enable = true; + dotDir = config.home.homeDirectory; enableCompletion = true; syntaxHighlighting.enable = true; autosuggestion.enable = true; @@ -35,4 +36,3 @@ }; } - diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index 4fd79fc..f8d94e3 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -1,10 +1,8 @@ { pkgs, ... }: { - services.xserver = { - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; # To disable installing GNOME's suite of applications diff --git a/modules/networking/networkmanager.nix b/modules/networking/networkmanager.nix index ac90203..0fe40ec 100644 --- a/modules/networking/networkmanager.nix +++ b/modules/networking/networkmanager.nix @@ -3,10 +3,12 @@ services.resolved = { enable = true; - dnssec = "false"; - fallbackDns = [ - "1.1.1.1" - "8.8.8.8" - ]; + settings.Resolve = { + DNSSEC = false; + FallbackDNS = [ + "1.1.1.1" + "8.8.8.8" + ]; + }; }; } diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index f666551..44a8190 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -3,8 +3,7 @@ { services.ollama = { enable = true; - package = pkgs.ollama; - acceleration = "cuda"; + package = pkgs.ollama-cuda; environmentVariables = { OLLAMA_CONTEXT_LENGTH="32000"; };