pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Laptop back to using KDE Plasma

Browse source 
Rename emacs expression files
This commit is contained in:
Evie Litherland-Smith 2023-08-18 12:19:52 +01:00
parent 85433f04bb
commit 54c97e0cbc
10 changed files with 99 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
home/alacritty/macos.nix → home/alacritty/floating.nix
View file

15
home/default.nix
View file

@ -1,16 +1,9 @@
{ pkgs, ... }:
{ pkgs, wallpapers, ... }:
{
imports = [
./git/default.nix
./ssh/default.nix
./tui/default.nix
./tmux/default.nix
./hyprland/default.nix
./firefox/default.nix
./zathura/default.nix
./emacs/server.nix
];
imports =
[ ./git ./ssh ./tui ./tmux ./alacritty ./firefox ./zathura ./emacs ];
home.packages = with pkgs; [ bitwarden signal-desktop libreoffice zotero ];
programs.home-manager.enable = true;
xdg.configFile."wallpapers/default.jpg".source = wallpapers.outputs.default;
}

69
home/emacs/default.nix
View file

@ -1,59 +1,12 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
# Emacs dependencies
emacs28NativeComp
git
ripgrep
coreutils
cmake
fd
graphviz
# Mail server setup
isync
mu
protonmail-bridge
# Language-specific requirements
ispell
findutils
sqlite
pandoc
gfortran
texlive.combined.scheme-medium
# Formatters
nixfmt
beautysh
nodePackages.fixjson
fprettify
shellharden
stylua
python3Packages.mdformat
# LSP servers
nil
fortls
(python3.withPackages (ps:
with ps; [
python-lsp-server
python-lsp-ruff
python-lsp-black
pyls-isort
pylsp-rope
pylsp-mypy
]))
nodePackages.yaml-language-server
nodePackages.bash-language-server
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-css-languageserver-bin
nodePackages.vscode-json-languageserver-bin
nodePackages.dockerfile-language-server-nodejs
shellcheck
marksman
luajitPackages.lua-lsp
texlab
];
{ pkgs, ... }: {
imports = [ ./dependencies.nix ];
# Emacs28 package
home.packages = with pkgs; [ emacs28NativeComp ];
# Emacs server service
services.emacs = {
enable = true;
package = pkgs.emacs28NativeComp;
defaultEditor = true;
startWithUserSession = true;
};
}

58
home/emacs/dependencies.nix Normal file
View file

@ -0,0 +1,58 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
# Emacs dependencies
git
ripgrep
coreutils
cmake
fd
graphviz
# Mail server setup
isync
mu
protonmail-bridge
# Language-specific requirements
ispell
findutils
sqlite
pandoc
gfortran
texlive.combined.scheme-medium
# Formatters
nixfmt
beautysh
nodePackages.fixjson
fprettify
shellharden
stylua
python3Packages.mdformat
# LSP servers
nil
fortls
(python3.withPackages (ps:
with ps; [
python-lsp-server
python-lsp-ruff
python-lsp-black
pyls-isort
pylsp-rope
pylsp-mypy
]))
nodePackages.yaml-language-server
nodePackages.bash-language-server
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-css-languageserver-bin
nodePackages.vscode-json-languageserver-bin
nodePackages.dockerfile-language-server-nodejs
shellcheck
marksman
luajitPackages.lua-lsp
texlab
];
}

10
home/emacs/server.nix
View file

@ -1,10 +0,0 @@
{ pkgs, ... }: {
imports = [ ./default.nix ];
# Emacs server service
services.emacs = {
enable = true;
package = pkgs.emacs28NativeComp;
defaultEditor = true;
startWithUserSession = true;
};
}

2
hosts/Legion/home.nix
View file

@ -4,7 +4,7 @@
in {
imports = [
shellConfig
../../home/emacs/server.nix
../../home/emacs
../../home/git
../../home/ssh
../../home/tui

12
hosts/Monarch/home.nix
View file

@ -5,16 +5,16 @@ let
in {
imports = [
../../home/shell/zsh.nix
../../home/git/default.nix
../../home/ssh/default.nix
../../home/tui/default.nix
../../home/alacritty/macos.nix
../../home/emacs/default.nix
../../home/git
../../home/ssh
../../home/tui
../../home/alacritty
../../home/emacs/dependencies.nix
];
home = {
inherit username homeDirectory;
stateVersion = "23.05";
packages = with pkgs; [coreutils-prefixed];
packages = with pkgs; [ emacs28NativeComp coreutils-prefixed ];
};
programs = {
home-manager.enable = true;

9
hosts/Ronin/configuration.nix
View file

@ -9,7 +9,7 @@ in {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
../hyprland.nix
../plasma.nix
../../services/${hostName}.nix
];
# Bootloader.
@ -32,13 +32,6 @@ in {
'';
programs.light.enable = true;
users.users.${user} = userConfig;
services.greetd = {
enable = true;
settings = {
default_session.user = user;
initial_session.user = user;
};
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

58
hosts/Ronin/home.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, shellConfig, wallpapers, ... }:
{ pkgs, lib, shellConfig, ... }:
let
username = "elitherl";
homeDirectory = "/home/${username}";
@ -81,7 +81,8 @@ in {
{
name = "Physics Summary";
tags = [ "JET" "operations" ];
url = "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
url =
"https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
}
{
name = "JSPO";
@ -145,57 +146,4 @@ in {
}];
};
};
services.kanshi.profiles = {
undocked = {
outputs = [{
criteria = "eDP-1";
mode = "1920x1080";
position = "0,0";
scale = 1.0;
status = "enable";
}];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
};
work = {
outputs = [
{
criteria = "eDP-1";
status = "disable";
}
{
criteria = "Iiyama North America PLB2403WS 0574281251316";
position = "1280,185";
status = "enable";
}
{
criteria = "Dell Inc. DELL U2417H 5K9YD872FY1L";
position = "3200,0";
status = "enable";
}
];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
};
home = {
outputs = [
{
criteria = "Acer Technologies ED270R TJMEE0043W01";
position = "0,0";
status = "enable";
}
{
criteria = "eDP-1";
status = "disable";
}
];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
};
};
xdg.configFile."hypr/display.conf".text = ''
monitor=eDP-1,preferred,auto,1
monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x185,1
monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,3200x0,1,transform,1
monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
bindl=,switch:Lid Switch,exec,hyprctl reload
'';
}

21
hosts/plasma.nix
View file

@ -1,11 +1,18 @@
{ pkgs, ... }: {
imports = [ ./desktop.nix ];
services.xserver.desktopManager.plasma5.enable = true;
# programs.kdeconnect.enable = true;
environment.systemPackages = [
pkgs.libsForQt5.lightly
pkgs.libsForQt5.kwindowsystem
# pkgs.libsForQt5.ktorrent
pkgs.libsForQt5.krdc
environment.systemPackages = with pkgs;
with libsForQt5; [
lightly
kwindowsystem
krdc
];
services.xserver = {
enable = true;
desktopManager.plasma5.enable = true;
displayManager.sddm = {
enable = true;
# theme = "catppuccin-macchiato";
settings = { General = { InputMethod = ""; }; };
};
};
}