upgrade to 24.11
All checks were successful
Nix Format Check / check-format (push) Successful in 38s
All checks were successful
Nix Format Check / check-format (push) Successful in 38s
This commit is contained in:
parent
2cd1c77d60
commit
2c0e3c746b
@ -18,9 +18,22 @@ fi
|
|||||||
if [[ "$RUN_NIX" == true ]]; then
|
if [[ "$RUN_NIX" == true ]]; then
|
||||||
printfe "%s\n" "cyan" "Upgrading NixOS packages..."
|
printfe "%s\n" "cyan" "Upgrading NixOS packages..."
|
||||||
cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure
|
cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure
|
||||||
|
|
||||||
|
if [[ $? -ne 0 ]]; then
|
||||||
|
printfe "%s\n" "red" "Failed to upgrade NixOS packages."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$RUN_HA" == true ]]; then
|
if [[ "$RUN_HA" == true ]]; then
|
||||||
|
printfe "%s\n" "cyan" "Cleaning old backup files..."
|
||||||
|
rm -rf $HOME/.config/mimeapps.list.backup
|
||||||
|
|
||||||
printfe "%s\n" "cyan" "Upgrading Home Manager packages..."
|
printfe "%s\n" "cyan" "Upgrading Home Manager packages..."
|
||||||
cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure
|
cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure
|
||||||
|
|
||||||
|
if [[ $? -ne 0 ]]; then
|
||||||
|
printfe "%s\n" "red" "Failed to upgrade Home Manager packages."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -1 +1 @@
|
|||||||
/nix/store/xibrqca2cl3bpl7c8kd93ps6myy47k8n-home-manager-files/.config/autostart/ulauncher.desktop
|
/nix/store/kmm2y2027i9arkvzyqsid23hb0asyvq7-home-manager-files/.config/autostart/ulauncher.desktop
|
22
config/home-manager/flake.lock
generated
22
config/home-manager/flake.lock
generated
@ -7,43 +7,43 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726989464,
|
"lastModified": 1732466619,
|
||||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
"rev": "f3111f62a23451114433888902a55cf0692b408d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.05",
|
"ref": "release-24.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731797254,
|
"lastModified": 1732350895,
|
||||||
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
|
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
|
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1732521221,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
description = "menno's dotfiles";
|
description = "menno's dotfiles";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-24.05";
|
url = "github:nix-community/home-manager/release-24.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
home = {
|
home = {
|
||||||
username = "menno";
|
username = "menno";
|
||||||
homeDirectory = "/home/menno";
|
homeDirectory = "/home/menno";
|
||||||
stateVersion = "24.05";
|
stateVersion = "24.11";
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
PATH = "${config.home.homeDirectory}/go/bin:$PATH"; # Removed extra asterisks
|
PATH = "${config.home.homeDirectory}/go/bin:$PATH"; # Removed extra asterisks
|
||||||
};
|
};
|
||||||
|
@ -4,14 +4,14 @@
|
|||||||
# GUI Application
|
# GUI Application
|
||||||
## Utilities
|
## Utilities
|
||||||
mission-center # Task Manager like Windows 11
|
mission-center # Task Manager like Windows 11
|
||||||
gnome.gnome-tweaks
|
gnome-tweaks
|
||||||
pinta # Paint.NET alternative
|
pinta # Paint.NET alternative
|
||||||
bottles # Wine manager
|
bottles # Wine manager
|
||||||
trayscale # Tray icon for Tailscale
|
trayscale # Tray icon for Tailscale
|
||||||
spacedrive # Virtual filesystem manager
|
spacedrive # Virtual filesystem manager
|
||||||
smile # Emoji picker
|
smile # Emoji picker
|
||||||
gnome-frog # OCR tool
|
gnome-frog # OCR tool
|
||||||
gnome.gnome-boxes # Virtual machine manager
|
gnome-boxes # Virtual machine manager
|
||||||
deja-dup # Backup tool
|
deja-dup # Backup tool
|
||||||
sqlitebrowser # SQLite database manager
|
sqlitebrowser # SQLite database manager
|
||||||
wmctrl # Window manager control (Used in ulauncher)
|
wmctrl # Window manager control (Used in ulauncher)
|
||||||
|
12
config/home-manager/packages/workstation/thunderbird.nix
Normal file
12
config/home-manager/packages/workstation/thunderbird.nix
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
programs.thunderbird = {
|
||||||
|
enable = true;
|
||||||
|
profiles = {
|
||||||
|
default = {
|
||||||
|
isDefault = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -7,7 +7,7 @@
|
|||||||
services.xserver.displayManager.gdm.enable = true;
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
services.xserver.desktopManager.gnome.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
|
# Configure keymap in X11
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
@ -26,14 +26,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Japanese input
|
# Japanese input
|
||||||
i18n.inputMethod = {
|
# i18n.inputMethod = {
|
||||||
enabled = "fcitx5";
|
# enabled = "fcitx5";
|
||||||
fcitx5.addons = with pkgs; [
|
# fcitx5.addons = with pkgs; [
|
||||||
fcitx5-mozc
|
# fcitx5-mozc
|
||||||
fcitx5-gtk
|
# fcitx5-gtk
|
||||||
];
|
# ];
|
||||||
ibus.engines = with pkgs.ibus-engines; [ mozc ];
|
# ibus.engines = with pkgs.ibus-engines; [ mozc ];
|
||||||
};
|
# };
|
||||||
|
|
||||||
# Open ports in the firewall
|
# Open ports in the firewall
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
|
@ -66,5 +66,5 @@
|
|||||||
# this value at the release version of the first install of this system.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (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
14
config/nixos/flake.lock
generated
@ -2,27 +2,27 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731797254,
|
"lastModified": 1732350895,
|
||||||
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
|
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
|
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1732521221,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
description = "menno's dotfiles";
|
description = "menno's dotfiles";
|
||||||
|
|
||||||
inputs = {
|
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";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -17,19 +17,16 @@
|
|||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
# Enable Vulkan support for AMD graphics cards
|
# Enable Vulkan support for AMD graphics cards
|
||||||
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
|
hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
|
||||||
|
|
||||||
# Enable OpenGL
|
# Enable OpenGL
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
|
|
||||||
# Enable the latest AMDGPU drivers
|
# Enable the latest AMDGPU drivers
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
amdvlk
|
amdvlk
|
||||||
rocm-opencl-icd
|
rocmPackages.clr
|
||||||
rocm-opencl-runtime
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
# Enable OpenGL
|
# Enable OpenGL
|
||||||
hardware.opengl.enable = true;
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
# Load nvidia driver for Xorg and Wayland
|
# Load nvidia driver for Xorg and Wayland
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
@ -24,12 +24,8 @@
|
|||||||
# Load nvidia driver for Xorg and Wayland
|
# Load nvidia driver for Xorg and Wayland
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
# Enable opengl and 32-bit support
|
# Enable OpenGL
|
||||||
hardware.opengl = {
|
hardware.graphics.enable = true;
|
||||||
enable = true;
|
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# nvtop, a system monitor for GPUs
|
# nvtop, a system monitor for GPUs
|
||||||
environment.systemPackages = with pkgs; [ nvtopPackages.nvidia ];
|
environment.systemPackages = with pkgs; [ nvtopPackages.nvidia ];
|
||||||
|
@ -5,6 +5,5 @@
|
|||||||
./1password.nix
|
./1password.nix
|
||||||
./flatpak.nix
|
./flatpak.nix
|
||||||
./steam.nix
|
./steam.nix
|
||||||
./pano.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
|
||||||
environment.systemPackages = [ (pkgs.callPackage ./pano { }) ];
|
|
||||||
}
|
|
@ -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 ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -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';
|
|
2
setup.sh
2
setup.sh
@ -4,7 +4,7 @@ set -euo pipefail
|
|||||||
IFS=$'\n\t'
|
IFS=$'\n\t'
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
readonly NIXOS_RELEASE="24.05"
|
readonly NIXOS_RELEASE="24.11"
|
||||||
readonly GIT_REPO="https://git.mvl.sh/vleeuwenmenno/dotfiles.git"
|
readonly GIT_REPO="https://git.mvl.sh/vleeuwenmenno/dotfiles.git"
|
||||||
readonly DOTFILES_DIR="${HOME}/dotfiles"
|
readonly DOTFILES_DIR="${HOME}/dotfiles"
|
||||||
readonly SETUP_MARKER="${HOME}/.dotfiles-setup"
|
readonly SETUP_MARKER="${HOME}/.dotfiles-setup"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user