diff --git a/common/configuration.nix b/common/configuration.nix index 56d9722..a423190 100644 --- a/common/configuration.nix +++ b/common/configuration.nix @@ -15,13 +15,27 @@ boot.plymouth.enable = true; # start kernel in quiet output mode - # boot.kernelParams = ["quiet"]; + boot.kernelParams = ["amdgpu.sg_display=0"]; # clean temp dir on every boot boot.tmp.cleanOnBoot = true; # newest kernel - boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_latest; + # set mainline kernel version + #boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_5; + # set specific kernel version + boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_6.override { + argsOverride = rec { + src = pkgs.fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-2h7X1HyX7XLJNUCRYodAqjxAo8nNc4KHHzztvWBYgjQ="; + }; + version = "6.6.1"; + modDirVersion = "6.6.1"; + }; + }); + # Enable networking networking.networkmanager.enable = true; diff --git a/common/home.nix b/common/home.nix index 9db6601..ea97450 100644 --- a/common/home.nix +++ b/common/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -{ +let + uint32 = lib.hm.gvariant.mkUint32; +in { imports = []; @@ -15,13 +17,21 @@ enable-hot-corners = true; clock-show-seconds = true; show-battery-percentage = true; - scaling-factor = 1.25; }; "org/gnome/mutter" = { dynamic-workspaces = true; edge-tiling = true; + + # remove line when out of experimental experimental-features = ["scale-monitor-framebuffer"]; }; + "org/gnome/session" = { + idle-delay = uint32(600); + }; + "org/gnome/desktop/screensaver" = { + lock-enabled = true; + lock-delay = uint32(300); + }; "org/gnome/shell" = { favorite-apps = [ "org.gnome.Nautilus.desktop" @@ -58,6 +68,8 @@ sleep-inactive-battery-type = "nothing"; sleep-inactive-ac-type = "nothing"; ambient-enabled = false; + # doesn't work for some reason? + idle-dim = false; }; }; diff --git a/common/modules/packages.nix b/common/modules/packages.nix index 27be41b..92fd2d1 100644 --- a/common/modules/packages.nix +++ b/common/modules/packages.nix @@ -41,6 +41,8 @@ powertop htop radeontop + neofetch + dmidecode # web firefox @@ -51,7 +53,9 @@ git flutter prusa-slicer - rustup + + #cargo + #rustc ## jetbrains ides jetbrains.idea-ultimate diff --git a/flake.lock b/flake.lock index 4eca56b..8bac517 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699368917, - "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", + "lastModified": 1700087144, + "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", + "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506", "type": "github" }, "original": { @@ -22,27 +22,27 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1698870265, - "narHash": "sha256-ZbTELogcMIGfnGULeAzPDbh4SNIVKYxeH7Y7Vu9BQdc=", - "owner": "kjhoerr", + "lastModified": 1699997707, + "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=", + "owner": "NixOS", "repo": "nixos-hardware", - "rev": "39d0b4df49bc835542dab47645764a8f3779ec31", + "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9", "type": "github" }, "original": { - "owner": "kjhoerr", - "ref": "fw13-7040", + "owner": "NixOS", + "ref": "master", "repo": "nixos-hardware", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 299b406..ba4e1f8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - #nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixos-hardware.url = "github:kjhoerr/nixos-hardware/fw13-7040"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = { self, nixpkgs, home-manager, nixos-hardware }: