quickshell stuff

This commit is contained in:
zastian@mrthoddata.com
2025-06-13 15:50:24 +01:00
parent 5897ff3410
commit 8d618a8ae3
8 changed files with 88 additions and 11 deletions

View File

@@ -50,6 +50,7 @@ in
#nixpkgs.overlays = [ inputs.niri.overlays.niri ]; #nixpkgs.overlays = [ inputs.niri.overlays.niri ];
#programs.hyprland.enable = true; #programs.hyprland.enable = true;
programs.river.enable = window_manager == "river" || window_manager == "all"; programs.river.enable = window_manager == "river" || window_manager == "all";
qt.enable = true;
nixpkgs.overlays = [ inputs.niri.overlays.niri ]; nixpkgs.overlays = [ inputs.niri.overlays.niri ];
programs.niri = { programs.niri = {

View File

@@ -231,6 +231,17 @@
:chat-model "codellama:13b" :chat-model "codellama:13b"
:embedding-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 ;; custom functions

View File

@@ -52,6 +52,7 @@
riverctl spawn 'fcitx5 -d' riverctl spawn 'fcitx5 -d'
riverctl spawn 'foot -s' riverctl spawn 'foot -s'
riverctl spawn '[ -n "$(whereis swaync | awk '{print $2}')" ] && swaync' riverctl spawn '[ -n "$(whereis swaync | awk '{print $2}')" ] && swaync'
riverctl spawn 'nm-applet'
riverctl focus-follows-cursor normal riverctl focus-follows-cursor normal
riverctl set-cursor-warp on-focus-change riverctl set-cursor-warp on-focus-change
#riverctl xcursor-theme oreo_spark_pink_cursors #riverctl xcursor-theme oreo_spark_pink_cursors

42
flake.lock generated
View File

@@ -600,6 +600,46 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
@@ -608,6 +648,8 @@
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixcord": "nixcord", "nixcord": "nixcord",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"qs-qml": "qs-qml",
"quickshell": "quickshell",
"stylix": "stylix", "stylix": "stylix",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }

View File

@@ -13,6 +13,18 @@
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
nixcord.url = "github:kaylorben/nixcord"; nixcord.url = "github:kaylorben/nixcord";
niri.url = "github:sodiboo/niri-flake"; 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 = outputs =

View File

@@ -8,24 +8,28 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/6aa7c67d-a0a5-4928-b16b-9c7991fee7ab"; { device = "/dev/disk/by-uuid/fdcbb840-4b35-4023-a048-599b0c5161d6";
fsType = "ext4"; fsType = "btrfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A4F3-8038"; { device = "/dev/disk/by-uuid/E1B6-9089";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; };
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/d226a8ed-10eb-452e-9284-1ff994a7f179";
fsType = "btrfs";
}; };
swapDevices = 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 # 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 # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; 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"; 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;
} }

View File

@@ -172,13 +172,17 @@ in
zed-editor zed-editor
dualsensectl dualsensectl
mangayomi mangayomi
#inputs.way-inhibitor.packages.${pkgs.system}.default
inputs.zen-browser.packages.${pkgs.system}.twilight
element-desktop element-desktop
scrcpy scrcpy
fuse fuse
fuse-emulator fuse-emulator
fuse3 fuse3
alacritty 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
]; ];
} }

View File

@@ -13,6 +13,7 @@ in
enable = true; enable = true;
autoEnable = false; autoEnable = false;
targets.gtk.enable = true; targets.gtk.enable = true;
targets.qt.enable = true;
targets.vscode.enable = true; targets.vscode.enable = true;
targets.gitui.enable = true; targets.gitui.enable = true;
targets.foot.enable = true; targets.foot.enable = true;