a bunch of qol improvments

This commit is contained in:
Chris Cochrun 2022-12-06 09:04:11 -06:00
parent 35cbaadd07
commit 06d7e288c6
9 changed files with 117 additions and 42 deletions

View file

@ -36,7 +36,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:vaxerski/Hyprland";
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs = {
@ -106,7 +106,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
programs.hyprland.enable = true;
}
];
};
@ -121,7 +120,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
programs.hyprland.enable = true;
}
];
};
@ -183,6 +181,16 @@ services.xserver = {
sddm = {
enable = true;
};
session = [
{
manage = "desktop";
name = "Hyprland";
start = ''
/home/chris/bin/hyprland &
waitPID=$!
'';
}
];
};
desktopManager.plasma5 = {
enable = true;
@ -191,6 +199,25 @@ services.xserver = {
# desktopManager.gnome.enable = true;
};
services.greetd = {
enable = true;
settings = rec {
initial_session = {
command = "startplasma-wayland";
user = "chris";
};
default_session = initial_session;
hyprland_session = {
command = "/home/chris/bin/hyprland";
user = "chris";
};
};
};
programs.hyprland = {
enable = true;
};
services.avahi = {
enable = true;
nssmdns = true;
@ -497,7 +524,7 @@ fennel
Let's create our own custom LightlyShaders package. This is in it's own file for now.
#+NAME: lightlyshaders
#+begin_src nix
(libsForQt5.callPackage ../../LightlyShaders {})
(libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
#+end_src
Let's also add our own package from my WIP presenter
@ -554,15 +581,12 @@ Emacs service
#+begin_src nix
services.emacs = {
enable = true;
package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages
package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages
(epkgs: with epkgs; [
vterm
magit
pdf-tools
eglot
consult-eglot
tree-sitter
tree-sitter-langs
org
org-roam
command-log-mode
@ -663,7 +687,6 @@ services.emacs = {
use-package
esh-autosuggest
pkgs.mu
pkgs.tree-sitter-grammars.tree-sitter-cpp
]));
};
#+end_src