update not NixOS 25.05, switch go Gnome

This commit is contained in:
2025-07-01 14:43:57 +02:00
parent 2ae3539681
commit 19fd771e13
8 changed files with 45 additions and 37 deletions

View File

@@ -1,14 +1,10 @@
{ config, pkgs, ... }:
{
nix = {
package = pkgs.nixFlakes;
#package = pkgs.nixFlakes;
settings = {
experimental-features = [ "nix-command" "flakes" ];
};
};
system.stateVersion = "23.05";
}

16
os/flake.lock generated
View File

@@ -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"
}

View File

@@ -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
];

View File

@@ -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;
};

View File

@@ -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;

View File

@@ -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 = ''

View File

@@ -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;

View File

@@ -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 = {