diff --git a/configuration.nix b/configuration.nix index be83063..50f4a4e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -47,13 +47,13 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "fi"; - xkbVariant = ""; + variant = ""; }; # Configure console keymap @@ -63,7 +63,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -136,7 +136,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "26.05"; # Did you read the comment? nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/flake.nix b/flake.nix index e0772b0..b364bab 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Babbys first flake"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; + home-manager.url = "github:nix-community/home-manager/release-26.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -11,7 +11,10 @@ let lib = nixpkgs.lib; system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; in { nixosConfigurations = { nixos = lib.nixosSystem { diff --git a/home.nix b/home.nix index d5cb265..7628278 100644 --- a/home.nix +++ b/home.nix @@ -13,7 +13,7 @@ # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. - home.stateVersion = "24.05"; # Please read the comment before changing. + home.stateVersion = "26.05"; # Please read the comment before changing. # The home.packages option allows you to install Nix packages into your # environment. @@ -106,7 +106,7 @@ shellAliases = { c = "clear"; gcam = "git checkout master && git pull"; - count = "ls -1 | wc -1"; + count = "ls -1 | wc -l"; }; };