From 19fd771e13f441a0c98c25df092ff179413c4336 Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Tue, 1 Jul 2025 14:43:57 +0200 Subject: [PATCH] update not NixOS 25.05, switch go Gnome --- os/configuration.nix | 6 +----- os/flake.lock | 16 ++++++++-------- os/flake.nix | 6 +++--- os/system/desktop/gnome.nix | 4 ++-- os/system/network.nix | 2 +- os/system/packages.nix | 31 ++++++++++++++++++++++--------- os/system/sound.nix | 4 ++-- os/users/master.nix | 13 ++++++------- 8 files changed, 45 insertions(+), 37 deletions(-) diff --git a/os/configuration.nix b/os/configuration.nix index 7b8de4f..261c410 100644 --- a/os/configuration.nix +++ b/os/configuration.nix @@ -1,14 +1,10 @@ { config, pkgs, ... }: - { - nix = { - package = pkgs.nixFlakes; + #package = pkgs.nixFlakes; settings = { experimental-features = [ "nix-command" "flakes" ]; }; }; - system.stateVersion = "23.05"; - } diff --git a/os/flake.lock b/os/flake.lock index b0b4e32..6d917cc 100644 --- a/os/flake.lock +++ b/os/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/os/flake.nix b/os/flake.nix index d814a97..534797a 100644 --- a/os/flake.nix +++ b/os/flake.nix @@ -2,8 +2,8 @@ description = "flake for nixos"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -17,7 +17,7 @@ ./hardware/lenovo-thinkpad-e14.nix ./system/base.nix ./system/packages.nix - ./system/desktop/plasma.nix + ./system/desktop/gnome.nix ./users/demo.nix ./users/master.nix ]; diff --git a/os/system/desktop/gnome.nix b/os/system/desktop/gnome.nix index 41f8c0b..6414280 100644 --- a/os/system/desktop/gnome.nix +++ b/os/system/desktop/gnome.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { services.xserver = { enable = true; - layout = "ch"; - xkbVariant = ""; + xkb.layout = "ch"; + xkb.variant = ""; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; }; diff --git a/os/system/network.nix b/os/system/network.nix index 82326c3..de31f66 100644 --- a/os/system/network.nix +++ b/os/system/network.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { networking = { hostName = "nixos"; - nameservers = [ "192.168.1.1" "9.9.9.9" "2620:fe::fe" ]; + nameservers = [ "192.168.1.1" "192.168.2.1" "9.9.9.9" "2620:fe::fe" ]; #nameservers = [ "127.0.0.1" ]; networkmanager = { enable = true; diff --git a/os/system/packages.nix b/os/system/packages.nix index 1d81cb2..092c107 100644 --- a/os/system/packages.nix +++ b/os/system/packages.nix @@ -1,18 +1,23 @@ -{ config, pkgs, ... }: +{ config, pkgs, ... }: let - unstable = import - (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/nixpkgs-unstable) + unstable = import + (builtins.fetchTarball { + url = "https://github.com/nixos/nixpkgs/tarball/nixpkgs-unstable"; + sha256 = "sha256:19wkjfhyidvkp4wjrr7idx83iiql6bskp1x1wrp52y0lc3xx847y"; + }) # reuse the current configuration { config = config.nixpkgs.config; }; -in { +in +{ nixpkgs.config = { allowUnfree = true; permittedInsecurePackages = [ "electron-24.8.6" + "electron-25.9.0" ]; }; - + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -47,10 +52,18 @@ in { docker-buildx appimage-run gimp - unstable.libation - unstable.ledger-live-desktop - unstable.android-tools - unstable.android-udev-rules + libation + ledger-live-desktop + ledger-udev-rules + android-tools + android-udev-rules + ghostty + alacritty + brave + #unstable.gsconnect + code-cursor + go + gnomeExtensions.forge ]; services.logind.extraConfig = '' diff --git a/os/system/sound.nix b/os/system/sound.nix index 0eb1d1f..6878e87 100644 --- a/os/system/sound.nix +++ b/os/system/sound.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - sound.enable = true; - hardware.pulseaudio.enable = false; + #sound.enable = true; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; diff --git a/os/users/master.nix b/os/users/master.nix index 4ad518e..7423e84 100644 --- a/os/users/master.nix +++ b/os/users/master.nix @@ -13,13 +13,13 @@ home.username = "master"; home.homeDirectory = "/home/master"; home.packages = with pkgs; [ - plasma5Packages.bismuth - kdeconnect - kcalc - filelight + #plasma5Packages.bismuth + #kdeconnect + #kcalc + #filelight gparted veracrypt - nerdfonts + #nerdfonts tmux btop ranger @@ -37,10 +37,9 @@ hunspell hunspellDicts.de_CH imagemagick - solana-cli + #solana-cli sqlite rtl-sdr - brave ]; programs = {