chore: remove unneeded Emacs packages

This commit is contained in:
Leon Schwarzäugl 2024-12-29 20:08:38 +01:00
parent b3c492d11b
commit 7e6d7fea84
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
15 changed files with 1724 additions and 3029 deletions

File diff suppressed because it is too large Load diff

View file

@ -6,119 +6,78 @@
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.ngi0.nixos.org/" "https://cache.ngi0.nixos.org/"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=" "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
]; ];
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
systems.url = "github:nix-systems/default-linux"; systems.url = "github:nix-systems/default-linux";
# user-level configuration
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# overlay to access bleeding edge emacs
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# nix user repository
# i use this mainly to not have to build all firefox extensions
# myself as well as for the emacs-init package (tbd)
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
# provides GL to non-NixOS hosts
nixgl.url = "github:guibou/nixGL"; nixgl.url = "github:guibou/nixGL";
# manages all theming using Home-Manager
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
# nix secrets management
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
# enable secure boot on NixOS
lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.url = "github:nix-community/lanzaboote";
# nix for android
nix-on-droid = { nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05"; url = "github:nix-community/nix-on-droid/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# generate NixOS images
nixos-generators = { nixos-generators = {
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# hardware quirks on nix
nixos-hardware = { nixos-hardware = {
url = "github:NixOS/nixos-hardware/master"; url = "github:NixOS/nixos-hardware/master";
}; };
# dynamic library loading
nix-alien = { nix-alien = {
url = "github:thiagokokada/nix-alien"; url = "github:thiagokokada/nix-alien";
}; };
# automatic nintendo switch payload injection
nswitch-rcm-nix = { nswitch-rcm-nix = {
url = "github:Swarsel/nswitch-rcm-nix"; url = "github:Swarsel/nswitch-rcm-nix";
}; };
# weekly updated nix-index database
nix-index-database = { nix-index-database = {
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
zjstatus = { zjstatus = {
url = "github:dj95/zjstatus"; url = "github:dj95/zjstatus";
}; };
fw-fanctrl = { fw-fanctrl = {
url = "github:TamtamHero/fw-fanctrl/packaging/nix"; url = "github:TamtamHero/fw-fanctrl/packaging/nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pre-commit-hooks = { pre-commit-hooks = {
url = "github:cachix/git-hooks.nix"; url = "github:cachix/git-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-secrets = { nix-secrets = {
url = "git+ssh://git@github.com/Swarsel/nix-secrets.git?ref=main&shallow=1"; url = "git+ssh://git@github.com/Swarsel/nix-secrets.git?ref=main&shallow=1";
flake = false; flake = false;
inputs = { }; inputs = { };
}; };
nix-topology.url = "github:oddlama/nix-topology"; nix-topology.url = "github:oddlama/nix-topology";
}; };
outputs = outputs =
inputs@{ self inputs@{ self
, nixpkgs , nixpkgs
@ -215,10 +174,8 @@
import ./checks { inherit self inputs system pkgs; } import ./checks { inherit self inputs system pkgs; }
); );
nixosConfigurations = nixosConfigurations =
lib.swarselsystems.mkFullHostConfigs (lib.swarselsystems.readHosts "nixos") "nixos"; lib.swarselsystems.mkFullHostConfigs (lib.swarselsystems.readHosts "nixos") "nixos";
homeConfigurations = homeConfigurations =
# "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration { # "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
@ -230,11 +187,8 @@
# }; # };
lib.swarselsystems.mkHalfHostConfigs (lib.swarselsystems.readHosts "home") "home" lib.swarselsystems.pkgsFor.x86_64-linux; lib.swarselsystems.mkHalfHostConfigs (lib.swarselsystems.readHosts "home") "home" lib.swarselsystems.pkgsFor.x86_64-linux;
darwinConfigurations = darwinConfigurations =
lib.swarselsystems.mkFullHostConfigs (lib.swarselsystems.readHosts "darwin") "darwin"; lib.swarselsystems.mkFullHostConfigs (lib.swarselsystems.readHosts "darwin") "darwin";
nixOnDroidConfigurations = nixOnDroidConfigurations =
# magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration { # magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
@ -246,8 +200,6 @@
lib.swarselsystems.mkHalfHostConfigs (lib.swarselsystems.readHosts "android") "android" lib.swarselsystems.pkgsFor.aarch64-linux; lib.swarselsystems.mkHalfHostConfigs (lib.swarselsystems.readHosts "android") "android" lib.swarselsystems.pkgsFor.aarch64-linux;
topology = topology =
lib.swarselsystems.forEachSystem (pkgs: import inputs.nix-topology { lib.swarselsystems.forEachSystem (pkgs: import inputs.nix-topology {
@ -259,6 +211,5 @@
]; ];
}); });
}; };
} }

View file

@ -1,27 +1,27 @@
default: default:
@just --list @just --list
check: check:
nix flake check --keep-going nix flake check --keep-going
check-trace: check-trace:
nix flake check --show-trace nix flake check --show-trace
update: update:
nix flake update nix flake update
iso: iso:
rm -rf result rm -rf result
nix build .#nixosConfigurations.iso.config.system.build.isoImage && ln -sf result/iso/*.iso latest.iso nix build .#nixosConfigurations.iso.config.system.build.isoImage && ln -sf result/iso/*.iso latest.iso
iso-flake FLAKE SYSTEM="x86_64" FORMAT="iso": iso-flake FLAKE SYSTEM="x86_64" FORMAT="iso":
nixos-generate --flake .#{{FLAKE}} -f {{FORMAT}} --system {{SYSTEM}} nixos-generate --flake .#{{FLAKE}} -f {{FORMAT}} --system {{SYSTEM}}
iso-install DRIVE: iso iso-install DRIVE: iso
sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
dd DRIVE ISO: dd DRIVE ISO:
sudo dd if=$(eza --sort changed {{ISO}} | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync sudo dd if=$(eza --sort changed {{ISO}} | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
sync USER HOST: sync USER HOST:
rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:.dotfiles/ rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:.dotfiles/

View file

@ -1,7 +1,6 @@
{ self, lib, config, pkgs, ... }: { self, lib, config, pkgs, ... }:
{ {
stylix = lib.mkIf (!config.swarselsystems.isNixos) { stylix = lib.mkIf (!config.swarselsystems.isNixos) {
enable = true; enable = true;
base16Scheme = "${self}/wallpaper/swarsel.yaml"; base16Scheme = "${self}/wallpaper/swarsel.yaml";
# base16Scheme = "${pkgs.base16-schemes}/share/themes/shapeshifter.yaml"; # base16Scheme = "${pkgs.base16-schemes}/share/themes/shapeshifter.yaml";
@ -25,7 +24,6 @@
# name = "FiraCode Nerd Font Propo"; # name = "FiraCode Nerd Font Propo";
# name = "Montserrat"; # name = "Montserrat";
}; };
sansSerif = { sansSerif = {
# package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; }); # package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; });
package = pkgs.cantarell-fonts; package = pkgs.cantarell-fonts;
@ -34,19 +32,15 @@
# name = "FiraCode Nerd Font Propo"; # name = "FiraCode Nerd Font Propo";
# name = "Montserrat"; # name = "Montserrat";
}; };
monospace = { monospace = {
package = pkgs.nerd-fonts.fira-mono; # has overrides package = pkgs.nerd-fonts.fira-mono; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };
emoji = { emoji = {
package = pkgs.noto-fonts-emoji; package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji"; name = "Noto Color Emoji";
}; };
}; };
image = config.swarselsystems.wallpaper; image = config.swarselsystems.wallpaper;
targets = { targets = {
emacs.enable = false; emacs.enable = false;

View file

@ -262,29 +262,28 @@ in
swayfxSettings = config.swarselsystems.swayfxConfig; swayfxSettings = config.swarselsystems.swayfxConfig;
in in
" "
exec_always autotiling exec_always autotiling
set $exit \"exit: [s]leep, [l]ock, [p]oweroff, [r]eboot, [u]ser logout\" set $exit \"exit: [s]leep, [l]ock, [p]oweroff, [r]eboot, [u]ser logout\"
mode $exit {
bindsym --to-code { mode $exit {
s exec \"systemctl suspend\", mode \"default\" bindsym --to-code {
l exec \"swaylock --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2 --daemonize && systemctl suspend \", mode \"default \" s exec \"systemctl suspend\", mode \"default\"
p exec \"systemctl poweroff\" l exec \"swaylock --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2 --daemonize && systemctl suspend \", mode \"default \"
r exec \"systemctl reboot\" p exec \"systemctl poweroff\"
u exec \"swaymsg exit\" r exec \"systemctl reboot\"
u exec \"swaymsg exit\"
Return mode \"default\" Return mode \"default\"
Escape mode \"default\" Escape mode \"default\"
${modifier}+Escape mode \"default\" ${modifier}+Escape mode \"default\"
}
} }
}
exec systemctl --user import-environment exec systemctl --user import-environment
exec swayidle -w exec swayidle -w
${swayfxSettings} ${swayfxSettings}
";
";
}; };
} }

View file

@ -91,34 +91,6 @@
zle -N my-backward-delete-whole-word zle -N my-backward-delete-whole-word
# bind this new widget to `ctrl+alt+w` # bind this new widget to `ctrl+alt+w`
bindkey '^W' my-backward-delete-whole-word bindkey '^W' my-backward-delete-whole-word
vterm_printf() {
if [ -n "$TMUX" ] && ([ "''${TERM%%-*}" = "tmux" ] || [ "''${TERM%%-*}" = "screen" ]); then
# Tell tmux to pass the escape sequences through
printf "\ePtmux;\e\e]%s\007\e\\" "$1"
elif [ "''${TERM%%-*}" = "screen" ]; then
# GNU screen (screen, screen-256color, screen-256color-bce)
printf "\eP\e]%s\007\e\\" "$1"
else
printf "\e]%s\e\\" "$1"
fi
}
vterm_prompt_end() {
vterm_printf "51;A$(whoami)@$(hostname):$(pwd)"
}
setopt PROMPT_SUBST
PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
vterm_cmd() {
local vterm_elisp
vterm_elisp=""
while [ $# -gt 0 ]; do
vterm_elisp="$vterm_elisp""$(printf '"%s" ' "$(printf "%s" "$1" | sed -e 's|\\|\\\\|g' -e 's|"|\\"|g')")"
shift
done
vterm_printf "51;E$vterm_elisp"
}
''; '';
}; };
} }

View file

@ -45,15 +45,15 @@ in
WIREGUARDPUB=${config.sops.placeholder.wireguardpub} WIREGUARDPUB=${config.sops.placeholder.wireguardpub}
WIREGUARDENDPOINT=${config.sops.placeholder.wireguardendpoint} WIREGUARDENDPOINT=${config.sops.placeholder.wireguardendpoint}
''; '';
".authinfo" = { # ".authinfo" = {
owner = "swarsel"; # owner = "swarsel";
path = "${config.users.users.swarsel.home}/.emacs.d/.authinfo"; # path = "${config.users.users.swarsel.home}/.emacs.d/.authinfo";
content = '' # content = ''
machine stash.swarsel.win:443 port https login ${config.sops.placeholder.stashuser} password ${config.sops.placeholder.stashpass} # machine stash.swarsel.win:443 port https login ${config.sops.placeholder.stashuser} password ${config.sops.placeholder.stashpass}
machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password ${config.sops.placeholder.githubforgepass} # machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password ${config.sops.placeholder.githubforgepass}
machine api.github.com login ${config.sops.placeholder.gitlabforgeuser} password ${config.sops.placeholder.gitlabforgepass} # machine api.github.com login ${config.sops.placeholder.gitlabforgeuser} password ${config.sops.placeholder.gitlabforgepass}
''; # '';
}; # };
}; };
}; };
} }

View file

@ -1,7 +1,6 @@
{ self, pkgs, home-manager, config, ... }: { self, pkgs, home-manager, config, ... }:
{ {
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = "${self}/wallpaper/swarsel.yaml"; base16Scheme = "${self}/wallpaper/swarsel.yaml";
# base16Scheme = "${pkgs.base16-schemes}/share/themes/shapeshifter.yaml"; # base16Scheme = "${pkgs.base16-schemes}/share/themes/shapeshifter.yaml";
@ -25,7 +24,6 @@
# name = "FiraCode Nerd Font Propo"; # name = "FiraCode Nerd Font Propo";
# name = "Montserrat"; # name = "Montserrat";
}; };
sansSerif = { sansSerif = {
# package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; }); # package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; });
package = pkgs.cantarell-fonts; package = pkgs.cantarell-fonts;
@ -34,19 +32,15 @@
# name = "FiraCode Nerd Font Propo"; # name = "FiraCode Nerd Font Propo";
# name = "Montserrat"; # name = "Montserrat";
}; };
monospace = { monospace = {
package = pkgs.nerd-fonts.fira-mono; # has overrides package = pkgs.nerd-fonts.fira-mono; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };
emoji = { emoji = {
package = pkgs.noto-fonts-emoji; package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji"; name = "Noto Color Emoji";
}; };
}; };
targets.grub.enable = false; # the styling makes grub more ugly targets.grub.enable = false; # the styling makes grub more ugly
image = config.swarselsystems.wallpaper; image = config.swarselsystems.wallpaper;
}; };

View file

@ -97,7 +97,7 @@ in
openssh = { openssh = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
''; '';
}; };
syncthing = { syncthing = {

View file

@ -9,9 +9,7 @@
(add-hook 'emacs-startup-hook (add-hook 'emacs-startup-hook
(lambda () (lambda ()
(progn (progn
;; (setq gc-cons-threshold (* 1000 1000 8) (setq gc-cons-threshold (* 32 1024 1024)
;; (setq gc-cons-threshold #x40000000
(setq gc-cons-threshold (* 32 1024 1024)
gc-cons-percentage 0.1 gc-cons-percentage 0.1
jit-lock-defer-time 0.05 jit-lock-defer-time 0.05
read-process-output-max (* 1024 1024) read-process-output-max (* 1024 1024)

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
~SwarselSystems~ ~SwarselSystems~
IP of primary interface: \4 IP of primary interface: \4
The Password for all users & root is 'setup'. The Password for all users & root is 'setup'.
Install the system remotely by running 'bootstrap -n <CONFIGURATION_NAME> -d <IP_FROM_ABOVE> ' on a machine with deployed secrets. Install the system remotely by running 'bootstrap -n <CONFIGURATION_NAME> -d <IP_FROM_ABOVE> ' on a machine with deployed secrets.
Alternatively, run 'swarsel-install -n <CONFIGURATION_NAME>' for a local install. For your convenience, an example call is in the bash history (press up on the keyboard to access). Alternatively, run 'swarsel-install -n <CONFIGURATION_NAME>' for a local install. For your convenience, an example call is in the bash history (press up on the keyboard to access).

View file

@ -9,7 +9,7 @@
@define-color background-critical blue; @define-color background-critical blue;
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: "FiraCode Nerd Font Propo", "Font Awesome 5 Free"; font-family: "FiraCode Nerd Font Propo", "Font Awesome 5 Free";
@ -19,9 +19,9 @@
} }
window#waybar { window#waybar {
background: transparent; background: transparent;
color: @foreground; color: @foreground;
transition-duration: .5s; transition-duration: .5s;
} }
window#waybar.hidden { window#waybar.hidden {
@ -39,14 +39,14 @@ window#waybar.hidden {
#custom-right-arrow-dark, #custom-right-arrow-dark,
#custom-left-arrow-dark { #custom-left-arrow-dark {
color: @background; color: @background;
background: @background-alt; background: @background-alt;
font-size: 24px; font-size: 24px;
} }
#window { #window {
font-size: 12px; font-size: 12px;
padding: 0 20px; padding: 0 20px;
} }
#mode { #mode {
@ -73,21 +73,21 @@ window#waybar.hidden {
#custom-outer-right-arrow-dark, #custom-outer-right-arrow-dark,
#custom-outer-left-arrow-dark { #custom-outer-left-arrow-dark {
color: @background; color: @background;
font-size: 24px; font-size: 24px;
} }
#custom-outer-left-arrow-dark, #custom-outer-left-arrow-dark,
#custom-left-arrow-dark, #custom-left-arrow-dark,
#custom-left-arrow-light { #custom-left-arrow-light {
margin: 0 -1px; margin: 0 -1px;
} }
#custom-right-arrow-light, #custom-right-arrow-light,
#custom-left-arrow-light { #custom-left-arrow-light {
color: @background-alt; color: @background-alt;
background: @background; background: @background;
font-size: 24px; font-size: 24px;
} }
#workspaces, #workspaces,
@ -119,20 +119,20 @@ window#waybar.hidden {
#workspaces button { #workspaces button {
padding: 0 2px; padding: 0 2px;
color: #fdf6e3; color: #fdf6e3;
} }
#workspaces button.focused { #workspaces button.focused {
color: @foreground-warning; color: @foreground-warning;
} }
#workspaces button:hover { #workspaces button:hover {
background: @foreground; background: @foreground;
color: @background; color: @background;
border: @foreground; border: @foreground;
padding: 0 2px; padding: 0 2px;
box-shadow: inherit; box-shadow: inherit;
text-shadow: inherit; text-shadow: inherit;
} }
#workspaces button.urgent { #workspaces button.urgent {
@ -177,8 +177,8 @@ window#waybar.hidden {
color: @foreground-error; color: @foreground-error;
} }
#memory { #memory {
/*color: #2aa198;*/ /*color: #2aa198;*/
color: #fdfd97; color: #fdfd97;
} }
#cpu { #cpu {
/*color: #6c71c4;*/ /*color: #6c71c4;*/
@ -192,7 +192,7 @@ window#waybar.hidden {
#battery, #battery,
#custom-pseudobat { #custom-pseudobat {
color: cyan; color: cyan;
} }
#battery.discharging { #battery.discharging {
color: #859900; color: #859900;

View file

@ -78,14 +78,14 @@ function update_sops_file() {
SOPS_FILE=".sops.yaml" SOPS_FILE=".sops.yaml"
sed -i "{ sed -i "{
# Remove any * and & entries for this host # Remove any * and & entries for this host
/[*&]$key_name/ d; /[*&]$key_name/ d;
# Inject a new age: entry # Inject a new age: entry
# n matches the first line following age: and p prints it, then we transform it while reusing the spacing # n matches the first line following age: and p prints it, then we transform it while reusing the spacing
/age:/{n; p; s/\(.*- \*\).*/\1$key_name/}; /age:/{n; p; s/\(.*- \*\).*/\1$key_name/};
# Inject a new hosts or user: entry # Inject a new hosts or user: entry
/&$key_type/{n; p; s/\(.*- &\).*/\1$key_name $key/} /&$key_type/{n; p; s/\(.*- &\).*/\1$key_name $key/}
}" $SOPS_FILE }" $SOPS_FILE
green "Updating .sops.yaml" green "Updating .sops.yaml"
cd - cd -
} }

View file

@ -1,5 +1,5 @@
disabled = [ disabled = [
"repeated_keys" "repeated_keys"
] ]
nix_version = '2.4' nix_version = '2.4'
ignore = ['.direnv'] ignore = ['.direnv']