flake: update lockfile

flake.lock

@@ -508,16 +508,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
+        "lastModified": 1710532761,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -561,11 +560,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1710864211,
+        "lastModified": 1710538160,
-        "narHash": "sha256-Uve1/UBnwD4M/9xD0E3XATnLrF8B5vL6MTBhX6Is+TE=",
+        "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "bcba3951f45f11245d424274130eb3a0ac790d93",
+        "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde",
         "type": "github"
       },
       "original": {
@@ -709,11 +708,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710644923,
+        "lastModified": 1710120787,
-        "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=",
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "e25efda85e39fcdc845e371971ac4384989c4295",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -866,16 +865,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1710695816,
+        "lastModified": 1710451336,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },

flake.nix

@@ -1,8 +1,8 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-index-database = {
@@ -76,17 +76,9 @@
         overlays = old_overlays.all;
       };
 
-      bootstrapPkgs = import inputs.nixpkgs nixpkgsConfig;
-      nixpkgs = bootstrapPkgs.applyPatches {
-        name = "patched-nixpkgs";
-        src = inputs.nixpkgs;
-        patches = lib.mapAttrsToList (k: v: ./patches/nixpkgs/${k})
-          (builtins.readDir ./patches/nixpkgs);
-      };
-
       inherit (import ./user/variables.nix) desktop;
       system = "x86_64-linux";
-      pkgs = import nixpkgs nixpkgsConfig;
+      pkgs = import inputs.nixpkgs nixpkgsConfig;
       lib = inputs.nixpkgs.lib;
 
       packages = import ./pkgs { inherit pkgs inputs; };

hosts/monolith.nix

@@ -43,6 +43,7 @@ in
     vaapiVdpau
     rocm-opencl-icd
     rocm-opencl-runtime
+    rocmPackages.rocm-smi
   ];
 
   programs.corectrl.enable = true;

overlays/default.nix

@@ -52,6 +52,14 @@
       patches = old.patches
         ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
     });
+    mangohud = prev.mangohud.overrideAttrs (o: {
+      patches = o.patches ++ [
+        (prev.fetchpatch {
+          url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
+          hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
+        })
+      ];
+    });
   });
 
   variables = (final: prev: {

patches/nixpkgs/fix-steam-generation-after-generation-switch.patch

@@ -1,27 +0,0 @@
-From ac4d51306af54a088e29e2e5efcfac5dfe87d95c Mon Sep 17 00:00:00 2001
-From: lelgenio <lelgenio@disroot.org>
-Date: Fri, 4 Aug 2023 01:25:04 -0300
-Subject: [PATCH] HACK: fix steam after generation switch
-
----
- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-index 3500e5e9216f..4d7ac0aa7618 100644
---- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-@@ -152,6 +152,10 @@ let
-       fi
-       if [[ -L $i ]]; then
-         symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i")
-+      elif [[ -f $i && -r $i ]]; then
-+        SNAPSHOT=$(mktemp --dry-run)
-+        cp "$i" "$SNAPSHOT"
-+        ro_mounts+=(--ro-bind-try "$SNAPSHOT" "$i")
-       else
-         ro_mounts+=(--ro-bind-try "$i" "$i")
-       fi
--- 
-2.42.0
-

system/configuration.nix

@@ -11,6 +11,8 @@
     ./nix.nix
   ];
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   zramSwap.enable = true;
 
   programs.adb.enable = true;
@@ -38,9 +40,9 @@
   # services.xserver.displayManager.autologin.user = "lelgenio";
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "colemak";
+    variant = "colemak";
   };
   console.keyMap = "colemak";
   # Enable CUPS to print documents.

system/media-packages.nix

@@ -16,7 +16,7 @@ in {
       gimp
       inkscape
       krita
-      kdenlive
+      kdePackages.kdenlive
       pitivi
       blender-hip
       libreoffice

user/alacritty.nix

@@ -31,8 +31,8 @@ in
             cyan = "${color.normal.cyan}";
             white = "${color.normal.white}";
           };
-        };
           draw_bold_text_with_bright_colors = false;
+        };
         window = {
           opacity = theme.opacity / 100.0;
           dynamic_padding = true;
@@ -65,7 +65,7 @@ in
           }];
         };
         mouse = { hide_when_typing = true; };
-        key_bindings = [
+        keyboard.bindings = [
           {
             key = lib.toUpper key.up;
             mode = "Vi|~Search";

user/fish/default.nix

@@ -69,7 +69,6 @@ in {
     programs = {
       zoxide.enable = true;
       eza.enable = true;
-      eza.enableAliases = true;
       direnv.enable = true;
       direnv.nix-direnv.enable = true;
     };

user/gnome.nix

@@ -36,6 +36,8 @@
 
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
+    qt6Packages.qt6ct
+    qt6Packages.qtstyleplugin-kvantum
   ];
 
   home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; };

user/gpg.nix

@@ -4,7 +4,7 @@
       enable = true;
       defaultCacheTtl = 604800;
       maxCacheTtl = 604800;
-      pinentryFlavor = "gtk2";
+      pinentryPackage = pkgs.pinentry-curses;
       extraConfig = ''
         allow-preset-passphrase
       '';

user/home.nix

@@ -70,7 +70,9 @@
     comma
 
     # System monitors
-    btop
+    (btop.override {
+      cudaSupport = true;
+    })
     amdgpu_top
     inxi
     dmidecode

user/kakoune/kak-lsp.toml

@@ -7,7 +7,7 @@ verbosity = 2
 # set to 0 to disable
 timeout = 1800 # seconds = 30 minutes
 
-[language.angular]
+[language_server.angular]
 filetypes = ["angular"]
 roots = [".angular", ".git"]
 command = "node"
@@ -20,134 +20,80 @@ args = [
     "--stdio",
 ]
 
-[language.bash]
+[language_server.bash-language-server]
 filetypes = ["sh"]
 roots = [".git", ".hg"]
 command = "bash-language-server"
 args = ["start"]
 
-[language.c_cpp]
+[language_server.clangd]
 filetypes = ["c", "cpp"]
-roots = [ "compile_commands.json", ".clangd", ".git" ]
+roots = ["compile_commands.json", ".clangd", ".git", ".hg"]
 command = "clangd"
 
-[language.crystal]
+[language_server.css-language-server]
-filetypes = ["crystal"]
-roots = ["shard.yml"]
-command = "scry"
-
-[language.css]
 filetypes = ["css"]
-roots = ["package.json"]
+roots = ["package.json", ".git", ".hg"]
 command = "vscode-css-languageserver"
 args = ["--stdio"]
 
-[language.less]
+[language_server.less-language-server]
 filetypes = ["less"]
-roots = ["package.json", ".git"]
+roots = ["package.json", ".git", ".hg"]
 command = "vscode-css-languageserver"
 args = ["--stdio"]
 
-[language.d]
+[language_server.html-language-server]
-filetypes = ["d", "di"]
-roots = [".git", "dub.sdl", "dub.json"]
-command = "dls"
-
-[language.dart]
-# start shell to find path to dart analysis server source
-filetypes = ["dart"]
-roots = ["pubspec.yaml", ".git"]
-command = "sh"
-args = ["-c", "dart $(dirname $(which dart))/snapshots/analysis_server.dart.snapshot --lsp"]
-
-[language.elm]
-filetypes = ["elm"]
-roots = ["elm.json"]
-command = "elm-language-server"
-args = ["--stdio"]
-
-# [language.elm.initialization_options]
-# runtime = "node"
-# elmPath = "elm"
-# elmFormatPath = "elm-format"
-# elmTestPath = "elm-test"
-
-[language.go]
-filetypes = ["go"]
-roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
-command = "gopls"
-offset_encoding = "utf-8"
-
-[language.haskell]
-filetypes = ["haskell"]
-roots = ["Setup.hs", "stack.yaml", "*.cabal"]
-command = "haskell-language-server-wrapper"
-args = ["--lsp"]
-
-[language.html]
 filetypes = ["html"]
 roots = ["package.json"]
 command = "vscode-html-languageserver"
 args = ["--stdio"]
+settings_section = "_"
+[language_server.html-language-server.settings._]
+# quotePreference = "single"
+# javascript.format.semicolons = "insert"
 
-[language.javascript]
+[language_server.typescript-language-server]
-filetypes = ["javascript"]
+filetypes = ["javascript", "typescript"]
-roots = [".flowconfig"]
+roots = ["package.json", "tsconfig.json", "jsconfig.json", ".git", ".hg"]
-command = "flow"
-args = ["lsp"]
-
-[language.typescript]
-filetypes = ["typescript"]
-roots = ["package.json"]
 command = "typescript-language-server"
 args = ["--stdio"]
+settings_section = "_"
+[language_server.typescript-language-server.settings._]
+# quotePreference = "double"
+# typescript.format.semicolons = "insert"
 
-[language.json]
+[language_server.json-language-server]
 filetypes = ["json"]
 roots = ["package.json"]
 command = "vscode-json-languageserver"
 args = ["--stdio"]
 
-[language.latex]
+[language_server.nil]
-filetypes = ["latex"]
-roots = [".git"]
-command = "texlab"
-
-[language.nim]
-filetypes = ["nim"]
-roots = ["*.nimble", ".git"]
-command = "nimlsp"
-
-[language.nix]
 filetypes = ["nix"]
 command = "nil"
 roots = ["flake.nix", "shell.nix", ".git"]
-[language.nix.settings.nil]
+[language_server.nil.settings.nil]
 formatting.command = [ "nixpkgs-fmt" ]
 
-[language.ocaml]
+[language_server.intelephense]
-filetypes = ["ocaml"]
-roots = ["Makefile", "opam", "*.opam", "dune"]
-command = "ocaml-language-server"
-args = ["--stdio"]
-
-[language.php]
 filetypes = ["php"]
 roots = [".htaccess", "composer.json"]
 command = "intelephense"
 args = ["--stdio"]
 settings_section = "intelephense"
-[language.php.settings]
+[language_server.intelephense.settings.intelephense]
-intelephense.format.braces = "k&r"
+storagePath = "/tmp/intelephense"
-intelephense.storagePath = "/tmp/intelephense"
+
-intelephense.environment.includePaths = [
+format.braces = "k&r"
+environment.includePaths = [
     "./vendor",
     "./vendor/autoload",
     "./vendor/laravel/framework/",
     "./vendor/laravel/framework/src/",
     "./vendor/laravel/framework/src/Illuminate/"
 ]
-intelephense.files.exclude = [
+files.exclude = [
     "**/.git/**",
     "**/.svn/**",
     "**/.hg/**",
@@ -159,42 +105,9 @@ intelephense.files.exclude = [
     "**/resources/views/**"
 ]
 
-[language.python]
+[language_server.rust-analyzer]
-filetypes = ["python"]
-roots = ["requirements.txt", "setup.py", ".git", ".hg"]
-command = "pyls"
-offset_encoding = "utf-8"
-
-[language.reason]
-filetypes = ["reason"]
-roots = ["package.json", "Makefile", ".git", ".hg"]
-command = "ocaml-language-server"
-args = ["--stdio"]
-
-[language.ruby]
-filetypes = ["ruby"]
-roots = ["Gemfile"]
-command = "solargraph"
-args = ["stdio"]
-
-# [language.rust]
-# filetypes = ["rust"]
-# roots = ["Cargo.toml"]
-# command = "sh"
-# args = [
-#     "-c",
-#     """
-#         if path=$(rustup which rls 2>/dev/null); then
-#             "$path"
-#         else
-#             rls
-#         fi
-#     """,
-# ]
-
-[language.rust]
 filetypes = ["rust"]
-roots = ["rust-toolchain.toml", "rust-toolchain", "Cargo.toml"]
+roots = ["Cargo.toml"]
 command = "sh"
 args = [
     "-c",
@@ -206,99 +119,37 @@ args = [
         fi
     """,
 ]
-[language.rust.settings.rust-analyzer]
+[language_server.rust-analyzer.settings.rust-analyzer]
-## this can use too much space and processing power
+# See https://rust-analyzer.github.io/manual.html#configuration
-# checkOnSave.extraArgs = ["--target-dir", "./target/check"]
+# cargo.features = []
 checkOnSave.command = "clippy"
 hoverActions.enable = false # kak-lsp doesn't support this at the moment
-# procMacro.enable = true
-# cargo.loadOutDirsFromCheck = true
-# rustfmt.rangeFormatting.enable = true
-# rustfmt.extraArgs = ["+nightly"]
 
-[language.terraform]
+[language_server.godot]
-filetypes = ["terraform"]
-roots = ["*.tf"]
-command = "terraform-ls"
-args = ["serve"]
-
-[language.godot]
 filetypes = ["gd", "gdscript", "gdscript3"]
 roots = ["project.godot", ".git/"]
 command = "nc"
 args = [ "localhost", "6008"]
 
-[language.clojure]
+# Semantic tokens support
-filetypes = ["clojure"]
+# See https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_semanticTokens
-roots = ["project.clj", ".git/"]
+# for the default list of tokens and modifiers.
-command = "clojure-lsp"
+# However, many language servers implement their own values.
-args = []
+# Make sure to check the output of `lsp-capabilities` and each server's documentation and source code as well.
-
+# Examples:
-
+# - TypeScript: https://github.com/microsoft/vscode-languageserver-node/blob/main/client/src/common/semanticTokens.ts
-
+# - Rust Analyzer: https://github.com/rust-analyzer/rust-analyzer/blob/master/crates/ide/src/syntax_highlighting.rs
-
+[semantic_tokens]
-[semantic_scopes]
+faces = [
-# Map textmate scopes to kakoune faces for semantic highlighting
+    {face="documentation", token="comment", modifiers=["documentation"]},
-# the underscores are translated to dots, and indicate nesting.
+    {face="comment", token="comment"},
-# That is, if variable_other_field is omitted, it will try the face for
+    {face="function", token="function"},
-# variable_other and then variable
+    {face="keyword", token="keyword"},
-#
+    {face="module", token="namespace"},
-# To see a list of available scopes in the debug buffer, run lsp-semantic-available-scopes
+    {face="operator", token="operator"},
-variable = "variable"
+    {face="string", token="string"},
-entity_name_function = "function"
+    {face="type", token="type"},
-entity_name_type = "type"
+    {face="default+d", token="variable", modifiers=["readonly"]},
-variable_other_enummember = "variable"
+    {face="default+d", token="variable", modifiers=["constant"]},
-entity_name_namespace = "module"
+    {face="variable", token="variable"},
-
+]
-[semantic_modifiers]
-documentation = "documentation"
-readonly = "default+d"
-
-
-
-[[semantic_tokens]]
-token = "comment"
-face = "documentation"
-modifiers = ["documentation"]
-
-[[semantic_tokens]]
-token = "comment"
-face = "comment"
-
-[[semantic_tokens]]
-token = "function"
-face = "function"
-
-[[semantic_tokens]]
-token = "keyword"
-face = "keyword"
-
-[[semantic_tokens]]
-token = "namespace"
-face = "module"
-
-[[semantic_tokens]]
-token = "operator"
-face = "operator"
-
-[[semantic_tokens]]
-token = "string"
-face = "string"
-
-[[semantic_tokens]]
-token = "type"
-face = "type"
-
-[[semantic_tokens]]
-token = "variable"
-face = "default+d"
-modifiers = ["readonly"]
-
-[[semantic_tokens]]
-token = "variable"
-face = "default+d"
-modifiers = ["constant"]
-
-[[semantic_tokens]]
-token = "variable"
-face = "variable"

user/sway/default.nix

@@ -52,7 +52,7 @@ in
           };
         output = {
           "*" = {
-            adaptive_sync = "on";
+            adaptive_sync = "off";
             bg = "${theme.background} fill";
             mode = "1920x1080@144.000Hz";
           };

user/sway/theme.nix

@@ -33,12 +33,10 @@ lib.mkIf (desktop == "sway")
     in
     { gtk4 = shared; gtk3 = shared; }
   );
-  # qt = {
+  qt = {
-  #   enable = true;
+    enable = true;
-  #   platformTheme = "gtk";
+    platformTheme = "qtct";
-  #   # style.package = pkgs.libsForQt5.qtstyleplugins;
+  };
-  #   # style.name = "gtk2";
-  # };
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
@@ -79,10 +77,11 @@ lib.mkIf (desktop == "sway")
     };
   };
 
-  home.sessionVariables = { QT_QPA_PLATFORMTHEME = "gtk3"; };
   home.packages = with pkgs; [
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
+    qt6Packages.qt6ct
+    qt6Packages.qtstyleplugin-kvantum
 
     pkgs.bibata-cursors
     pkgs.orchis_theme_compact

user/syncthing.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, lib, inputs, ... }:
+{ ... }: {
-let inherit (pkgs.uservars) key theme color accent font;
-in {
   services.syncthing = {
     enable = true;
-    # tray.enable = true;
+    tray = {
+      enable = true;
+      command = "syncthingtray --wait";
+    };
   };
 }