diff --git a/bin/actions/upgrade.sh b/bin/actions/upgrade.sh index b3568b5..a304b32 100755 --- a/bin/actions/upgrade.sh +++ b/bin/actions/upgrade.sh @@ -18,9 +18,22 @@ fi if [[ "$RUN_NIX" == true ]]; then printfe "%s\n" "cyan" "Upgrading NixOS packages..." 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 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..." 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 diff --git a/config/autostart/ulauncher.desktop b/config/autostart/ulauncher.desktop index 572b630..bf97f07 120000 --- a/config/autostart/ulauncher.desktop +++ b/config/autostart/ulauncher.desktop @@ -1 +1 @@ -/nix/store/xibrqca2cl3bpl7c8kd93ps6myy47k8n-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file +/nix/store/kmm2y2027i9arkvzyqsid23hb0asyvq7-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index 4425e8f..3d4fa07 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "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": { diff --git a/config/home-manager/flake.nix b/config/home-manager/flake.nix index 7364e49..60cf868 100644 --- a/config/home-manager/flake.nix +++ b/config/home-manager/flake.nix @@ -2,11 +2,11 @@ description = "menno's dotfiles"; 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"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/config/home-manager/home.nix b/config/home-manager/home.nix index c484f09..8380668 100644 --- a/config/home-manager/home.nix +++ b/config/home-manager/home.nix @@ -30,7 +30,7 @@ home = { username = "menno"; homeDirectory = "/home/menno"; - stateVersion = "24.05"; + stateVersion = "24.11"; sessionVariables = { PATH = "${config.home.homeDirectory}/go/bin:$PATH"; # Removed extra asterisks }; diff --git a/config/home-manager/packages/workstation/packages.nix b/config/home-manager/packages/workstation/packages.nix index 6a8e0f0..6939df8 100644 --- a/config/home-manager/packages/workstation/packages.nix +++ b/config/home-manager/packages/workstation/packages.nix @@ -4,14 +4,14 @@ # GUI Application ## Utilities mission-center # Task Manager like Windows 11 - gnome.gnome-tweaks + gnome-tweaks pinta # Paint.NET alternative bottles # Wine manager trayscale # Tray icon for Tailscale spacedrive # Virtual filesystem manager smile # Emoji picker gnome-frog # OCR tool - gnome.gnome-boxes # Virtual machine manager + gnome-boxes # Virtual machine manager deja-dup # Backup tool sqlitebrowser # SQLite database manager wmctrl # Window manager control (Used in ulauncher) diff --git a/config/home-manager/packages/workstation/thunderbird.nix b/config/home-manager/packages/workstation/thunderbird.nix new file mode 100644 index 0000000..63389f4 --- /dev/null +++ b/config/home-manager/packages/workstation/thunderbird.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + programs.thunderbird = { + enable = true; + profiles = { + default = { + isDefault = true; + }; + }; + }; +} diff --git a/config/nixos/common/workstation.nix b/config/nixos/common/workstation.nix index 3f9c201..8058ede 100644 --- a/config/nixos/common/workstation.nix +++ b/config/nixos/common/workstation.nix @@ -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 = { diff --git a/config/nixos/configuration.nix b/config/nixos/configuration.nix index 0d7ef98..dd71ed8 100644 --- a/config/nixos/configuration.nix +++ b/config/nixos/configuration.nix @@ -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? } diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index 65d3316..58f9d89 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -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": { diff --git a/config/nixos/flake.nix b/config/nixos/flake.nix index 58bceac..1f9f532 100644 --- a/config/nixos/flake.nix +++ b/config/nixos/flake.nix @@ -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"; }; diff --git a/config/nixos/hardware/mennos-gamingpc.nix b/config/nixos/hardware/mennos-gamingpc.nix index a731fe3..ccc77c1 100644 --- a/config/nixos/hardware/mennos-gamingpc.nix +++ b/config/nixos/hardware/mennos-gamingpc.nix @@ -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 ]; }; diff --git a/config/nixos/hardware/mennos-laptop.nix b/config/nixos/hardware/mennos-laptop.nix index 3f4deee..4f5bb2c 100644 --- a/config/nixos/hardware/mennos-laptop.nix +++ b/config/nixos/hardware/mennos-laptop.nix @@ -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" ]; diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix index 66f4900..804b493 100644 --- a/config/nixos/hardware/mennos-server.nix +++ b/config/nixos/hardware/mennos-server.nix @@ -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 ]; diff --git a/config/nixos/packages/workstation/default.nix b/config/nixos/packages/workstation/default.nix index eba9b03..c093a9d 100644 --- a/config/nixos/packages/workstation/default.nix +++ b/config/nixos/packages/workstation/default.nix @@ -5,6 +5,5 @@ ./1password.nix ./flatpak.nix ./steam.nix - ./pano.nix ]; } diff --git a/config/nixos/packages/workstation/pano.nix b/config/nixos/packages/workstation/pano.nix deleted file mode 100644 index f8cc7fc..0000000 --- a/config/nixos/packages/workstation/pano.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - environment.systemPackages = [ (pkgs.callPackage ./pano { }) ]; -} diff --git a/config/nixos/packages/workstation/pano/default.nix b/config/nixos/packages/workstation/pano/default.nix deleted file mode 100644 index 3bda800..0000000 --- a/config/nixos/packages/workstation/pano/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/config/nixos/packages/workstation/pano/gnome-shell-extension-pano.patch b/config/nixos/packages/workstation/pano/gnome-shell-extension-pano.patch deleted file mode 100644 index fd3939b..0000000 --- a/config/nixos/packages/workstation/pano/gnome-shell-extension-pano.patch +++ /dev/null @@ -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'; \ No newline at end of file diff --git a/setup.sh b/setup.sh index 3272619..88a10e0 100755 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' # Constants -readonly NIXOS_RELEASE="24.05" +readonly NIXOS_RELEASE="24.11" readonly GIT_REPO="https://git.mvl.sh/vleeuwenmenno/dotfiles.git" readonly DOTFILES_DIR="${HOME}/dotfiles" readonly SETUP_MARKER="${HOME}/.dotfiles-setup"