From 8d618a8ae34c24dec513ff333250fc03c924c625 Mon Sep 17 00:00:00 2001 From: "zastian@mrthoddata.com" Date: Fri, 13 Jun 2025 15:50:24 +0100 Subject: [PATCH] quickshell stuff --- configuration.nix | 1 + dots/doom/config.el | 11 ++++++++++ dots/river.nix | 1 + flake.lock | 42 ++++++++++++++++++++++++++++++++++++++ flake.nix | 12 +++++++++++ hardware-configuration.nix | 23 +++++++++++++-------- home/homePkgs.nix | 8 ++++++-- home/stylix.nix | 1 + 8 files changed, 88 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index 29f94bd..3724731 100755 --- a/configuration.nix +++ b/configuration.nix @@ -50,6 +50,7 @@ in #nixpkgs.overlays = [ inputs.niri.overlays.niri ]; #programs.hyprland.enable = true; programs.river.enable = window_manager == "river" || window_manager == "all"; + qt.enable = true; nixpkgs.overlays = [ inputs.niri.overlays.niri ]; programs.niri = { diff --git a/dots/doom/config.el b/dots/doom/config.el index 7dc851b..5cc7168 100755 --- a/dots/doom/config.el +++ b/dots/doom/config.el @@ -231,6 +231,17 @@ :chat-model "codellama:13b" :embedding-model "codellama:13b")) ) +(use-package qml-ts-mode + :after lsp-mode + :config + (add-to-list 'lsp-language-id-configuration '(qml-ts-mode . "qml-ts")) + (lsp-register-client + (make-lsp-client :new-connection (lsp-stdio-connection '("qmlls", "-E")) + :activation-fn (lsp-activate-on "qml-ts") + :server-id 'qmlls)) + (add-hook 'qml-ts-mode-hook (lambda () + (setq-local electric-indent-chars '(?\n ?\( ?\) ?{ ?} ?\[ ?\] ?\; ?,)) + (lsp-deferred)))) ;; custom functions diff --git a/dots/river.nix b/dots/river.nix index 8a3ca5f..8440709 100755 --- a/dots/river.nix +++ b/dots/river.nix @@ -52,6 +52,7 @@ riverctl spawn 'fcitx5 -d' riverctl spawn 'foot -s' riverctl spawn '[ -n "$(whereis swaync | awk '{print $2}')" ] && swaync' + riverctl spawn 'nm-applet' riverctl focus-follows-cursor normal riverctl set-cursor-warp on-focus-change #riverctl xcursor-theme oreo_spark_pink_cursors diff --git a/flake.lock b/flake.lock index bccb41b..5332f06 100644 --- a/flake.lock +++ b/flake.lock @@ -600,6 +600,46 @@ "type": "github" } }, + "qs-qml": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730724501, + "narHash": "sha256-zvNdomPM86fUf0iAwJV1RQC8yAqDCKbCDJKIs4iIPy0=", + "ref": "refs/heads/master", + "rev": "8f897ffb4a1575252c536c63db8be72f22b6a494", + "revCount": 1, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/nix-qml-support" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/nix-qml-support" + } + }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749772873, + "narHash": "sha256-ZsFQIs3ZpUud1QmR1TyhAW0LGbjHzCkA79YCLBbJ12A=", + "ref": "refs/heads/master", + "rev": "517143adf97fb0df7e9a7584061deecdffb19faf", + "revCount": 576, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "anyrun": "anyrun", @@ -608,6 +648,8 @@ "nix-colors": "nix-colors", "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", + "qs-qml": "qs-qml", + "quickshell": "quickshell", "stylix": "stylix", "zen-browser": "zen-browser" } diff --git a/flake.nix b/flake.nix index 876141b..d2eb5eb 100755 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,18 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; nixcord.url = "github:kaylorben/nixcord"; niri.url = "github:sodiboo/niri-flake"; + quickshell = { + # remove ?ref=v0.1.0 to track the master branch + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + + # THIS IS IMPORTANT + # Mismatched system dependencies will lead to crashes and other issues. + inputs.nixpkgs.follows = "nixpkgs"; + }; + qs-qml = { + url = "git+https://git.outfoxxed.me/outfoxxed/nix-qml-support"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 3563a70..5aced16 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,24 +8,28 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/6aa7c67d-a0a5-4928-b16b-9c7991fee7ab"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/fdcbb840-4b35-4023-a048-599b0c5161d6"; + fsType = "btrfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A4F3-8038"; + { device = "/dev/disk/by-uuid/E1B6-9089"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/d226a8ed-10eb-452e-9284-1ff994a7f179"; + fsType = "btrfs"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/b416c3bd-861b-4b0c-aa84-6962b2e6a47d"; } + [ { device = "/dev/disk/by-uuid/ccf41b96-c45f-47e0-8541-cd865f5d2ec6"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -33,8 +37,9 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp4s0f0u8.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 176c458..69d02dc 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -172,13 +172,17 @@ in zed-editor dualsensectl mangayomi - #inputs.way-inhibitor.packages.${pkgs.system}.default - inputs.zen-browser.packages.${pkgs.system}.twilight element-desktop scrcpy fuse fuse-emulator fuse3 alacritty + networkmanagerapplet + #inputs.way-inhibitor.packages.${pkgs.system}.default + inputs.zen-browser.packages.${pkgs.system}.twilight + inputs.quickshell.packages.${pkgs.system}.default + inputs.qs-qml.packages.${pkgs.system}.tree-sitter-qmljs + inputs.qs-qml.packages.${pkgs.system}.qml-ts-mode ]; } diff --git a/home/stylix.nix b/home/stylix.nix index 419bf80..43267a3 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -13,6 +13,7 @@ in enable = true; autoEnable = false; targets.gtk.enable = true; + targets.qt.enable = true; targets.vscode.enable = true; targets.gitui.enable = true; targets.foot.enable = true;