added script to activate wayland specialisation, disabled bash lsp (causing issues)
This commit is contained in:
parent
a7ac762a9f
commit
a1dd79241c
13
flake.nix
13
flake.nix
|
@ -20,6 +20,7 @@
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
helix,
|
helix,
|
||||||
|
...
|
||||||
}: let
|
}: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||||
|
@ -57,21 +58,9 @@
|
||||||
extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
|
extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
|
||||||
modules = [
|
modules = [
|
||||||
./users/tacocat/home.nix
|
./users/tacocat/home.nix
|
||||||
./users/tacocat/wayland
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# homeConfigurations."tacocat-X11" = inputs.home-manager.lib.homeManagerConfiguration {
|
|
||||||
# inherit pkgs;
|
|
||||||
# extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
|
|
||||||
# modules = [
|
|
||||||
# ./users/tacocat/home.nix
|
|
||||||
# ./users/tacocat/X11
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
#outputs home-manager activation package for use on non-NixOS, i think?
|
|
||||||
packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
|
packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
|
||||||
# packages.${system}."tacocat-X11" = self.homeConfigurations."tacocat-X11".activationPackage;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,17 +86,17 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.river.enable = true;
|
programs.river.enable = true;
|
||||||
programs.river.extraPackages = with pkgs; [
|
# programs.river.extraPackages = with pkgs; [
|
||||||
swaylock
|
# swaylock
|
||||||
swayidle
|
# swayidle
|
||||||
dunst
|
# dunst
|
||||||
wlsunset
|
# wlsunset
|
||||||
nm-applet
|
# nm-applet
|
||||||
grim
|
# grim
|
||||||
slurp
|
# slurp
|
||||||
waybar
|
# waybar
|
||||||
wbg
|
# wbg
|
||||||
];
|
# ];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
|
|
|
@ -5,14 +5,14 @@
|
||||||
}: {
|
}: {
|
||||||
programs.helix.languages = {
|
programs.helix.languages = {
|
||||||
language = [
|
language = [
|
||||||
{
|
# {
|
||||||
name = "bash";
|
# name = "bash";
|
||||||
auto-format = false;
|
# auto-format = false;
|
||||||
formatter = {
|
# formatter = {
|
||||||
command = "${pkgs.shfmt}/bin/shfmt";
|
# command = "${pkgs.shfmt}/bin/shfmt";
|
||||||
args = ["-i" "2"];
|
# args = ["-i" "2"];
|
||||||
};
|
# };
|
||||||
}
|
# }
|
||||||
|
|
||||||
{
|
{
|
||||||
name = "java";
|
name = "java";
|
||||||
|
@ -20,10 +20,10 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
language-server = {
|
language-server = {
|
||||||
bash-language-server = {
|
# bash-language-server = {
|
||||||
command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
|
# command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
|
||||||
args = ["start"];
|
# args = ["start"];
|
||||||
};
|
# };
|
||||||
|
|
||||||
clangd = {
|
clangd = {
|
||||||
command = "${pkgs.clang-tools}/bin/clangd";
|
command = "${pkgs.clang-tools}/bin/clangd";
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
wineWowPackages.unstable
|
wineWowPackages.unstable
|
||||||
eza
|
eza
|
||||||
bat
|
bat
|
||||||
|
networkmanagerapplet
|
||||||
comic-mono
|
comic-mono
|
||||||
maple-mono
|
maple-mono
|
||||||
jetbrains-mono
|
jetbrains-mono
|
||||||
|
@ -35,6 +36,11 @@
|
||||||
jdk20
|
jdk20
|
||||||
pdftk
|
pdftk
|
||||||
git
|
git
|
||||||
|
(writeShellScriptBin "hs-way" ''
|
||||||
|
home-manager --flake $HOME/nix-config/#tacocat switch
|
||||||
|
GEN=$(home-manager generations | head -1 | awk '{print $NF}')
|
||||||
|
"$GEN/specialisation/wayland/activate"
|
||||||
|
'')
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
swaylock
|
swaylock
|
||||||
swayidle
|
swayidle
|
||||||
wbg
|
wbg
|
||||||
|
dunst
|
||||||
|
grim
|
||||||
|
slurp
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.rofi.package = pkgs.rofi-wayland-unwrapped;
|
programs.rofi.package = pkgs.rofi-wayland-unwrapped;
|
||||||
|
|
|
@ -21,7 +21,6 @@ riverctl map normal Super Q close
|
||||||
|
|
||||||
# Super+Shift+E to exit river
|
# Super+Shift+E to exit river
|
||||||
riverctl map normal Super+Shift E exit
|
riverctl map normal Super+Shift E exit
|
||||||
riverctl map normal Super+Shift R spawn "$HOME/.config/river/reload"
|
|
||||||
|
|
||||||
# Super+J and Super+K to focus the next/previous view in the layout stack
|
# Super+J and Super+K to focus the next/previous view in the layout stack
|
||||||
riverctl map normal Super J focus-view next
|
riverctl map normal Super J focus-view next
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
wlsunset -S 8:00 -s 23:30 &
|
|
||||||
waybar &
|
waybar &
|
||||||
nm-applet --indicator &
|
nm-applet --indicator &
|
||||||
dunst &
|
dunst &
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# killall pipewire
|
|
||||||
killall wlsunset
|
|
||||||
killall waybar
|
|
||||||
killall nm-applet
|
|
||||||
killall dunst
|
|
||||||
killall swayidle
|
|
||||||
killall wbg
|
|
||||||
killall void-setup
|
|
||||||
|
|
||||||
~/.config/river/init
|
|
Loading…
Reference in a new issue