vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to 24.11
All checks were successful
Nix Format Check / check-format (push) Successful in 38s
Details

Browse Source
This commit is contained in:
Menno van Leeuwen
2024-11-29 18:02:30 +01:00
parent 2cd1c77d60
commit 2c0e3c746b
19 changed files with 67 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/nixos/common/workstation.nix
View File

@ -7,7 +7,7 @@
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
environment.systemPackages = with pkgs; [ gnome3.gnome-session ];
environment.systemPackages = with pkgs; [ gnome-session ];
# Configure keymap in X11
services.xserver.xkb = {
@ -26,14 +26,14 @@
};
# Japanese input
i18n.inputMethod = {
enabled = "fcitx5";
fcitx5.addons = with pkgs; [
fcitx5-mozc
fcitx5-gtk
];
ibus.engines = with pkgs.ibus-engines; [ mozc ];
};
# i18n.inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [
# fcitx5-mozc
# fcitx5-gtk
# ];
# ibus.engines = with pkgs.ibus-engines; [ mozc ];
# };
# Open ports in the firewall
networking.firewall = {

2
config/nixos/configuration.nix
View File

@ -66,5 +66,5 @@
# 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 = "24.11"; # Did you read the comment?
}

14
config/nixos/flake.lock generated
View File

@ -2,27 +2,27 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"lastModified": 1732350895,
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github"
},
"original": {

2
config/nixos/flake.nix
View File

@ -2,7 +2,7 @@
description = "menno's dotfiles";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
};

9
config/nixos/hardware/mennos-gamingpc.nix
View File

@ -17,19 +17,16 @@
boot.loader.efi.canTouchEfiVariables = true;
# Enable Vulkan support for AMD graphics cards
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
# Enable OpenGL
hardware.opengl = {
hardware.graphics = {
enable = true;
driSupport = true;
driSupport32Bit = true;
# Enable the latest AMDGPU drivers
extraPackages = with pkgs; [
amdvlk
rocm-opencl-icd
rocm-opencl-runtime
rocmPackages.clr
];
};

2
config/nixos/hardware/mennos-laptop.nix
View File

@ -14,7 +14,7 @@
boot.loader.efi.canTouchEfiVariables = true;
# Enable OpenGL
hardware.opengl.enable = true;
hardware.graphics.enable = true;
# Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "nvidia" ];

8
config/nixos/hardware/mennos-server.nix
View File

@ -24,12 +24,8 @@
# Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "nvidia" ];
# Enable opengl and 32-bit support
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
# Enable OpenGL
hardware.graphics.enable = true;
# nvtop, a system monitor for GPUs
environment.systemPackages = with pkgs; [ nvtopPackages.nvidia ];

1
config/nixos/packages/workstation/default.nix
View File

@ -5,6 +5,5 @@
./1password.nix
./flatpak.nix
./steam.nix
./pano.nix
];
}

10
config/nixos/packages/workstation/pano.nix
View File

@ -1,10 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
environment.systemPackages = [ (pkgs.callPackage ./pano { }) ];
}

60
config/nixos/packages/workstation/pano/default.nix
View File

@ -1,60 +0,0 @@
{
stdenv,
fetchzip,
lib,
gnome,
glib,
libgda,
gsound,
substituteAll,
wrapGAppsHook,
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pano";
version = "v23-alpha3";
src = fetchzip {
url = "https://github.com/oae/gnome-shell-pano/releases/download/${version}/pano@elhan.io.zip";
sha256 = "LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc=";
stripRoot = false;
};
patches = [
(substituteAll {
src = ./gnome-shell-extension-pano.patch;
gsound_path = "${gsound}/lib/girepository-1.0";
gda_path = "${libgda}/lib/girepository-1.0";
})
];
buildInputs = [
gnome.gnome-shell
libgda
gsound
];
nativeBuildInputs = [ wrapGAppsHook ];
installPhase = ''
runHook preInstall
local_ext_dir=$out/share/gnome-shell/extensions/pano@elhan.io
install -d $local_ext_dir
cp -r * $local_ext_dir
# Ensure typelibs are directly accessible
mkdir -p $out/lib/girepository-1.0
ln -s ${gsound}/lib/girepository-1.0/* $out/lib/girepository-1.0/
ln -s ${libgda}/lib/girepository-1.0/* $out/lib/girepository-1.0/
runHook postInstall
'';
meta = with lib; {
description = "Pano GNOME Shell Clipboard Management Extension (${version} pre-release)";
homepage = "https://github.com/oae/gnome-shell-pano";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.zvictor ];
};
}

10
config/nixos/packages/workstation/pano/gnome-shell-extension-pano.patch
View File

@ -1,10 +0,0 @@
--- a/extension.js
+++ b/extension.js
@@ -1,3 +1,7 @@
+import GIRepository from 'gi://GIRepository';
+GIRepository.Repository.prepend_search_path('@gda_path@');
+GIRepository.Repository.prepend_search_path('@gsound_path@');
+
import Gio from 'gi://Gio';
import GLib from 'gi://GLib';
import * as extension_js from 'resource:///org/gnome/shell/extensions/extension.js';