Added lib.mkForce + backup = false
This commit is contained in:
+1
-1
@@ -2,5 +2,5 @@ use flake
|
||||
|
||||
watch_file .envrc.private
|
||||
if [[ -f .envrc.private ]]; then
|
||||
source_env .envrc.private
|
||||
source_env .envrc.private
|
||||
fi
|
||||
|
||||
+862
-841
File diff suppressed because it is too large
Load Diff
+42
-21
@@ -1,4 +1,4 @@
|
||||
gf#+OPTIONS: toc:nil broken-links:t
|
||||
f#+OPTIONS: toc:nil broken-links:t
|
||||
#+PROPERTY: header-args :noweb yes :results silent :mkdirp yes
|
||||
#+HTML: <div align="center">
|
||||
#+HTML: <div>
|
||||
@@ -1030,7 +1030,7 @@ in
|
||||
};
|
||||
|
||||
# Deploy the config file for runtime visibility/debugging
|
||||
environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
|
||||
environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
|
||||
|
||||
systemd.services.flatpak-sync = {
|
||||
description = "Install Flatpak apps listed in flatpaks.conf";
|
||||
@@ -1671,7 +1671,8 @@ in
|
||||
{
|
||||
# Ensure script exists in ~/.config/hypr/scripts/
|
||||
xdg.configFile."${targetRel}" = {
|
||||
source = repoScript;
|
||||
source = lib.mkForce repoScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true;
|
||||
};
|
||||
}
|
||||
@@ -1816,15 +1817,16 @@ in
|
||||
};
|
||||
# Hyprpaper config (hyprpaper reads this; it does NOT need to write it)
|
||||
# `ipc = true` enables `hyprctl hyprpaper ...` commands. :contentReference[oaicite:0]{index=0}
|
||||
xdg.configFile."hypr/hyprpaper.conf".text = ''
|
||||
xdg.configFile."hypr/hyprpaper.conf".text = lib.mkForce ''
|
||||
ipc = true
|
||||
splash = false
|
||||
'';
|
||||
xdg.configFile."hypr/hyprpaper.conf".backup = lib.mkForce false;
|
||||
# Workspace wallpaper daemon: listens to socket2, applies w-<id>=... mapping
|
||||
# Uses workspacev2 to get numeric workspace id. :contentReference[oaicite:1]{index=1}
|
||||
xdg.configFile."${daemonRel}" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
text = lib.mkForce ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
: "''${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR not set}"
|
||||
@@ -1907,13 +1909,14 @@ in
|
||||
handle "''${line}" || true
|
||||
done
|
||||
'';
|
||||
backup = lib.mkForce false;
|
||||
};
|
||||
|
||||
# CLI setter in the style of your inspiration script.
|
||||
# Usage: set-wallpaper.sh <workspace_id> <monitor> [wallpaper]
|
||||
xdg.configFile."${setRel}" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
text = lib.mkForce ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
@@ -1956,6 +1959,7 @@ in
|
||||
hyprctl hyprpaper wallpaper "''${mon}, ''${wp}, fill" >/dev/null
|
||||
fi
|
||||
'';
|
||||
backup = lib.mkForce false;
|
||||
};
|
||||
|
||||
# Services
|
||||
@@ -2002,13 +2006,15 @@ in
|
||||
programs.waybar.enable = true;
|
||||
# Ensure config matches repo (HM-managed symlink, not user-editable)
|
||||
xdg.configFile."waybar/config" = {
|
||||
source = repoWaybarDir + "/config.jsonc";
|
||||
source = lib.mkForce repoWaybarDir + "/config.jsonc";
|
||||
backup = lib.mkForce false;
|
||||
force = true;
|
||||
};
|
||||
# Override HM's internally-generated waybar-style.css derivation
|
||||
# and use your repo file instead.
|
||||
xdg.configFile."waybar/style.css" = {
|
||||
source = lib.mkForce (repoWaybarDir + "/style.css");
|
||||
backup = lib.mkForce false;
|
||||
force = true;
|
||||
};
|
||||
# Prevent HM from also trying to generate style content via programs.waybar.style
|
||||
@@ -2029,8 +2035,10 @@ let
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.hyprlock ];
|
||||
xdg.configFile."hypr/lock.png".source = lockPngSrc;
|
||||
xdg.configFile."hypr/hyprlock.conf".source = hyprlockConf;
|
||||
xdg.configFile."hypr/lock.png".source = lib.mkForce lockPngSrc;
|
||||
xdg.configFile."hypr/lock.png".backup = lib.mkForce false;
|
||||
xdg.configFile."hypr/hyprlock.conf".source = lib.mkForce hyprlockConf;
|
||||
xdg.configFile."hypr/hyprlock.conf".backup = lib.mkForce false;
|
||||
}
|
||||
#+end_src
|
||||
|
||||
@@ -2043,7 +2051,8 @@ let
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.hypridle ];
|
||||
xdg.configFile."hypr/hypridle.conf".source = hypridleConf;
|
||||
xdg.configFile."hypr/hypridle.conf".source = lib.mkForce hypridleConf;
|
||||
xdg.configFile."hypr/hypridle.conf".backup = lib.mkForce false ;
|
||||
}
|
||||
#+end_src
|
||||
|
||||
@@ -2082,18 +2091,21 @@ in
|
||||
'';
|
||||
};
|
||||
# Copy repo configs/scripts into ~/.config
|
||||
xdg.configFile."${targetRel}".source = repoConf;
|
||||
|
||||
xdg.configFile."${targetRel}".source = lib.mkForce repoConf;
|
||||
xdg.configFile."${targetRel}".backup = lib.mkForce false;
|
||||
xdg.configFile."${targetOverflowRel}" = {
|
||||
source = repoOverflowScript;
|
||||
source = lib.mkForce repoOverflowScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
xdg.configFile."${targetPerMonitor}" = {
|
||||
source = repoPerMonitorScript;
|
||||
source = lib.mkForce repoPerMonitorScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
xdg.configFile."${targetSwitchScript}" = {
|
||||
source = repoSwitchScript;
|
||||
source = lib.mkForce repoSwitchScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
}
|
||||
@@ -2113,8 +2125,10 @@ in
|
||||
xdg.enable = true;
|
||||
home.packages = [ pkgs.hyprshell ];
|
||||
# Link repo -> ~/.config/hyprshell/...
|
||||
xdg.configFile."hyprshell/config.ron".source = cfgRon;
|
||||
xdg.configFile."hyprshell/styles.css".source = cssFile;
|
||||
xdg.configFile."hyprshell/config.ron".source = lib.mkForce cfgRon;
|
||||
xdg.configFile."hyprshell/config.ron".backup = lib.mkForce false;
|
||||
xdg.configFile."hyprshell/styles.css".source = lib.mkForce cssFile;
|
||||
xdg.configFile."hyprshell/styles.css".backup = lib.mkForce false;
|
||||
# Autostart (systemd user service)
|
||||
systemd.user.services.hyprshell = {
|
||||
Unit = {
|
||||
@@ -2160,7 +2174,8 @@ in
|
||||
|
||||
};
|
||||
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
||||
source = flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
||||
source = lib.mkForce flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
||||
backup = lib.mkForce false;
|
||||
executable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
@@ -2201,10 +2216,14 @@ in
|
||||
xdg.enable = true;
|
||||
home.packages = [ walkerPkg elephantPkg ];
|
||||
# ~/.config/walker/themes/*
|
||||
xdg.configFile."walker/themes/frosted/default.css".source = repoThemesDir + "/themes/frosted/default.css";
|
||||
xdg.configFile."walker/themes/frosted/default.css".source = lib.mkForce repoThemesDir + "/themes/frosted/default.css";
|
||||
xdg.configFile."walker/themes/frosted/default.css".backup = lib.mkForce false;
|
||||
xdg.configFile."walker/themes/frosted/style.css".source = repoThemesDir + "/themes/frosted/style.css";
|
||||
xdg.configFile."walker/themes/frosted/style.css".backup = lib.mkForce false;
|
||||
xdg.configFile."walker/config.toml".source = repoThemesDir + "/config.toml";
|
||||
# xdg.configFile."walker/themes/default.html".source = repoThemesDir + "/default.html";
|
||||
xdg.configFile."walker/config.toml".backup = lib.mkForce false;
|
||||
# xdg.configFile."walker/themes/default.html".source = lib.mkForce repoThemesDir + "/default.html";
|
||||
# xdg.configFile."walker/themes/default.html".backup = lib.mkForce false;
|
||||
# (services unchanged)
|
||||
systemd.user.services.elephant = { /* ... your existing service ... */ };
|
||||
systemd.user.services.walker = { /* ... your existing service ... */ };
|
||||
@@ -2299,6 +2318,7 @@ in
|
||||
programs.alacritty.enable = true;
|
||||
# Override the config generated by programs.alacritty
|
||||
xdg.configFile."alacritty/alacritty.toml".source = lib.mkForce repoAlacrittyConf;
|
||||
xdg.configFile."alacritty/alacritty.toml".backup = lib.mkForce false
|
||||
catppuccin.alacritty.enable = true;
|
||||
catppuccin.alacritty.flavor = "mocha";
|
||||
}
|
||||
@@ -2365,7 +2385,8 @@ in
|
||||
{
|
||||
xdg.enable = true;
|
||||
# Stable theme file so kitty.conf can include it without /nix/store paths
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = catppuccinMochaConf;
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = lib.mkForce catppuccinMochaConf;
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".backup = lib.mkForce false;
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
# Home Manager generates ~/.config/kitty/kitty.conf; we append in-order:
|
||||
|
||||
@@ -86,7 +86,7 @@ in
|
||||
};
|
||||
|
||||
# Deploy the config file for runtime visibility/debugging
|
||||
environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
|
||||
environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
|
||||
|
||||
systemd.services.flatpak-sync = {
|
||||
description = "Install Flatpak apps listed in flatpaks.conf";
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{ user, ... } :
|
||||
let
|
||||
locale = user.locale;
|
||||
defaultLocale = "nl_NL.UTF-8";
|
||||
locale = user.locale;
|
||||
defaultLocale = "nl_NL.UTF-8";
|
||||
in
|
||||
{
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = defaultLocale;
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = defaultLocale;
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = locale;
|
||||
LC_IDENTIFICATION = locale;
|
||||
LC_MEASUREMENT = locale;
|
||||
LC_MONETARY = locale;
|
||||
LC_NAME = locale;
|
||||
LC_NUMERIC = locale;
|
||||
LC_PAPER = locale;
|
||||
LC_TELEPHONE = locale;
|
||||
LC_TIME = defaultLocale;
|
||||
};
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = locale;
|
||||
LC_IDENTIFICATION = locale;
|
||||
LC_MEASUREMENT = locale;
|
||||
LC_MONETARY = locale;
|
||||
LC_NAME = locale;
|
||||
LC_NUMERIC = locale;
|
||||
LC_PAPER = locale;
|
||||
LC_TELEPHONE = locale;
|
||||
LC_TIME = defaultLocale;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ pkgs, user, ... } :
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
tuigreet
|
||||
];
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
tuigreet
|
||||
];
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
{ pkgs, user, ... } :
|
||||
{
|
||||
nix.settings = {
|
||||
# enable flakes
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
nix.settings = {
|
||||
# enable flakes
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
# add a cache that speed up new applications by downloading binaries
|
||||
# from the trusted cache instead of compiling from sourcer
|
||||
substituters = [
|
||||
# add a cache that speed up new applications by downloading binaries
|
||||
# from the trusted cache instead of compiling from sourcer
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
# trust the cache public key
|
||||
trusted-public-keys = [
|
||||
];
|
||||
# trust the cache public key
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
];
|
||||
};
|
||||
|
||||
# allow proprietary software on this machine. I'm not a purist.
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# unityhub depends on this... for now
|
||||
nixpkgs.config.permittedInsecurePackages = [ "libxml2-2.13.8" ];
|
||||
# allow proprietary software on this machine. I'm not a purist.
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# unityhub depends on this... for now
|
||||
nixpkgs.config.permittedInsecurePackages = [ "libxml2-2.13.8" ];
|
||||
|
||||
# this declares how often old configurations are cleared up.
|
||||
# i cleanup anything older than a week, every week.
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 7d";
|
||||
dates = "weekly";
|
||||
};
|
||||
# this declares how often old configurations are cleared up.
|
||||
# i cleanup anything older than a week, every week.
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 7d";
|
||||
dates = "weekly";
|
||||
};
|
||||
|
||||
programs = {
|
||||
# command line utility that makes applying changes easy and pretty
|
||||
nh = {
|
||||
programs = {
|
||||
# command line utility that makes applying changes easy and pretty
|
||||
nh = {
|
||||
enable = true;
|
||||
flake = "/home/${user.username}/system";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{ user, ...} :
|
||||
{
|
||||
services = {
|
||||
blueman.enable = true; # bluetooth manager
|
||||
fwupd.enable = true; # firmware updating service
|
||||
fstrim.enable = true; # ssd maintenance service
|
||||
thermald.enable = true; # thermal regulation service
|
||||
printing.enable = true; # printing services, cups
|
||||
gnome.gnome-keyring.enable = true; # keyring
|
||||
flatpak.enable = true; # allow installing things from flatpaks
|
||||
#flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
||||
services = {
|
||||
blueman.enable = true; # bluetooth manager
|
||||
fwupd.enable = true; # firmware updating service
|
||||
fstrim.enable = true; # ssd maintenance service
|
||||
thermald.enable = true; # thermal regulation service
|
||||
printing.enable = true; # printing services, cups
|
||||
gnome.gnome-keyring.enable = true; # keyring
|
||||
flatpak.enable = true; # allow installing things from flatpaks
|
||||
#flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
||||
|
||||
# printer discovery
|
||||
avahi = {
|
||||
# printer discovery
|
||||
avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.docker.enable = true; # enable docker
|
||||
users.users.${user.username}.extraGroups = [ "docker" ]; # add self to docker user group
|
||||
virtualisation.docker.enable = true; # enable docker
|
||||
users.users.${user.username}.extraGroups = [ "docker" ]; # add self to docker user group
|
||||
}
|
||||
|
||||
+28
-28
@@ -1,42 +1,42 @@
|
||||
{
|
||||
description = "Henrov's nixos configuration";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
description = "Henrov's nixos configuration";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
};
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin = {
|
||||
catppuccin = {
|
||||
url = "github:catppuccin/nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
zen-browser = {
|
||||
};
|
||||
zen-browser = {
|
||||
url = "github:youwen5/zen-browser-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
outputs = inputs@{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
emacs-overlay,
|
||||
catppuccin,
|
||||
...
|
||||
}:
|
||||
let
|
||||
user = import ./user.nix;
|
||||
lib = nixpkgs.lib;
|
||||
machines = [
|
||||
};
|
||||
};
|
||||
outputs = inputs@{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
emacs-overlay,
|
||||
catppuccin,
|
||||
...
|
||||
}:
|
||||
let
|
||||
user = import ./user.nix;
|
||||
lib = nixpkgs.lib;
|
||||
machines = [
|
||||
"traveldroid"
|
||||
];
|
||||
pkgs = import nixpkgs {
|
||||
];
|
||||
pkgs = import nixpkgs {
|
||||
inherit (user) system;
|
||||
};
|
||||
in
|
||||
{
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = builtins.listToAttrs (
|
||||
builtins.map (machine: {
|
||||
name = machine;
|
||||
@@ -84,6 +84,6 @@
|
||||
nixfmt-rfc-style
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{ pkgs, lib, user, config, ...} :
|
||||
{
|
||||
nixpkgs.hostPlatform = lib.mkDefault user.system; # x86_64-linux
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # enable power saving on the cpu
|
||||
nixpkgs.hostPlatform = lib.mkDefault user.system; # x86_64-linux
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # enable power saving on the cpu
|
||||
|
||||
# update cpu microcode with firmware that allows redistribution
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# update cpu microcode with firmware that allows redistribution
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
hardware = {
|
||||
# always enable bluetooth
|
||||
bluetooth.enable = true;
|
||||
hardware = {
|
||||
# always enable bluetooth
|
||||
bluetooth.enable = true;
|
||||
|
||||
# always enable graphics drivers and enable a bunch of layers for it (including vulkan validation)
|
||||
graphics = {
|
||||
# always enable graphics drivers and enable a bunch of layers for it (including vulkan validation)
|
||||
graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
vulkan-validation-layers # helps catch and debug vulkan crashes
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hardware.enableAllFirmware = true; # enable all firmware regardless of license
|
||||
hardware.enableAllFirmware = true; # enable all firmware regardless of license
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ pkgs, ...}:
|
||||
{
|
||||
gtk = {
|
||||
enable = true;
|
||||
colorScheme = "dark";
|
||||
theme = {
|
||||
gtk = {
|
||||
enable = true;
|
||||
colorScheme = "dark";
|
||||
theme = {
|
||||
name = "Catppuccin-GTK-Grey-Dark-Compact";
|
||||
package = (pkgs.magnetic-catppuccin-gtk.override {
|
||||
accent = [ "grey" ];
|
||||
@@ -11,12 +11,12 @@
|
||||
tweaks = [ "black" ];
|
||||
size = "compact";
|
||||
});
|
||||
};
|
||||
iconTheme.name = "Papirus-Dark";
|
||||
};
|
||||
catppuccin.enable = true;
|
||||
catppuccin.flavor = "mocha";
|
||||
catppuccin.accent = "blue";
|
||||
catppuccin.gtk.icon.enable = true;
|
||||
catppuccin.cursors.enable = true;
|
||||
};
|
||||
iconTheme.name = "Papirus-Dark";
|
||||
};
|
||||
catppuccin.enable = true;
|
||||
catppuccin.flavor = "mocha";
|
||||
catppuccin.accent = "blue";
|
||||
catppuccin.gtk.icon.enable = true;
|
||||
catppuccin.cursors.enable = true;
|
||||
}
|
||||
|
||||
@@ -4,5 +4,6 @@ let
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.hypridle ];
|
||||
xdg.configFile."hypr/hypridle.conf".source = hypridleConf;
|
||||
xdg.configFile."hypr/hypridle.conf".source = lib.mkForce hypridleConf;
|
||||
xdg.configFile."hypr/hypridle.conf".backup = lib.mkForce false ;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,8 @@ in
|
||||
|
||||
};
|
||||
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
||||
source = flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
||||
source = lib.mkForce flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
||||
backup = lib.mkForce false;
|
||||
executable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
|
||||
@@ -5,6 +5,8 @@ let
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.hyprlock ];
|
||||
xdg.configFile."hypr/lock.png".source = lockPngSrc;
|
||||
xdg.configFile."hypr/hyprlock.conf".source = hyprlockConf;
|
||||
xdg.configFile."hypr/lock.png".source = lib.mkForce lockPngSrc;
|
||||
xdg.configFile."hypr/lock.png".backup = lib.mkForce false;
|
||||
xdg.configFile."hypr/hyprlock.conf".source = lib.mkForce hyprlockConf;
|
||||
xdg.configFile."hypr/hyprlock.conf".backup = lib.mkForce false;
|
||||
}
|
||||
|
||||
@@ -30,18 +30,21 @@ in
|
||||
'';
|
||||
};
|
||||
# Copy repo configs/scripts into ~/.config
|
||||
xdg.configFile."${targetRel}".source = repoConf;
|
||||
|
||||
xdg.configFile."${targetRel}".source = lib.mkForce repoConf;
|
||||
xdg.configFile."${targetRel}".backup = lib.mkForce false;
|
||||
xdg.configFile."${targetOverflowRel}" = {
|
||||
source = repoOverflowScript;
|
||||
source = lib.mkForce repoOverflowScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
xdg.configFile."${targetPerMonitor}" = {
|
||||
source = repoPerMonitorScript;
|
||||
source = lib.mkForce repoPerMonitorScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
xdg.configFile."${targetSwitchScript}" = {
|
||||
source = repoSwitchScript;
|
||||
source = lib.mkForce repoSwitchScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true; # makes it chmod +x
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,8 +9,10 @@ in
|
||||
xdg.enable = true;
|
||||
home.packages = [ pkgs.hyprshell ];
|
||||
# Link repo -> ~/.config/hyprshell/...
|
||||
xdg.configFile."hyprshell/config.ron".source = cfgRon;
|
||||
xdg.configFile."hyprshell/styles.css".source = cssFile;
|
||||
xdg.configFile."hyprshell/config.ron".source = lib.mkForce cfgRon;
|
||||
xdg.configFile."hyprshell/config.ron".backup = lib.mkForce false;
|
||||
xdg.configFile."hyprshell/styles.css".source = lib.mkForce cssFile;
|
||||
xdg.configFile."hyprshell/styles.css".backup = lib.mkForce false;
|
||||
# Autostart (systemd user service)
|
||||
systemd.user.services.hyprshell = {
|
||||
Unit = {
|
||||
|
||||
@@ -7,7 +7,8 @@ in
|
||||
{
|
||||
# Ensure script exists in ~/.config/hypr/scripts/
|
||||
xdg.configFile."${targetRel}" = {
|
||||
source = repoScript;
|
||||
source = lib.mkForce repoScript;
|
||||
backup = lib.mkForce false;
|
||||
executable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,10 +16,14 @@ in
|
||||
xdg.enable = true;
|
||||
home.packages = [ walkerPkg elephantPkg ];
|
||||
# ~/.config/walker/themes/*
|
||||
xdg.configFile."walker/themes/frosted/default.css".source = repoThemesDir + "/themes/frosted/default.css";
|
||||
xdg.configFile."walker/themes/frosted/default.css".source = lib.mkForce repoThemesDir + "/themes/frosted/default.css";
|
||||
xdg.configFile."walker/themes/frosted/default.css".backup = lib.mkForce false;
|
||||
xdg.configFile."walker/themes/frosted/style.css".source = repoThemesDir + "/themes/frosted/style.css";
|
||||
xdg.configFile."walker/themes/frosted/style.css".backup = lib.mkForce false;
|
||||
xdg.configFile."walker/config.toml".source = repoThemesDir + "/config.toml";
|
||||
# xdg.configFile."walker/themes/default.html".source = repoThemesDir + "/default.html";
|
||||
xdg.configFile."walker/config.toml".backup = lib.mkForce false;
|
||||
# xdg.configFile."walker/themes/default.html".source = lib.mkForce repoThemesDir + "/default.html";
|
||||
# xdg.configFile."walker/themes/default.html".backup = lib.mkForce false;
|
||||
# (services unchanged)
|
||||
systemd.user.services.elephant = { /* ... your existing service ... */ };
|
||||
systemd.user.services.walker = { /* ... your existing service ... */ };
|
||||
|
||||
@@ -6,13 +6,15 @@ in
|
||||
programs.waybar.enable = true;
|
||||
# Ensure config matches repo (HM-managed symlink, not user-editable)
|
||||
xdg.configFile."waybar/config" = {
|
||||
source = repoWaybarDir + "/config.jsonc";
|
||||
source = lib.mkForce repoWaybarDir + "/config.jsonc";
|
||||
backup = lib.mkForce false;
|
||||
force = true;
|
||||
};
|
||||
# Override HM's internally-generated waybar-style.css derivation
|
||||
# and use your repo file instead.
|
||||
xdg.configFile."waybar/style.css" = {
|
||||
source = lib.mkForce (repoWaybarDir + "/style.css");
|
||||
backup = lib.mkForce false;
|
||||
force = true;
|
||||
};
|
||||
# Prevent HM from also trying to generate style content via programs.waybar.style
|
||||
|
||||
@@ -30,15 +30,16 @@ in
|
||||
};
|
||||
# Hyprpaper config (hyprpaper reads this; it does NOT need to write it)
|
||||
# `ipc = true` enables `hyprctl hyprpaper ...` commands. :contentReference[oaicite:0]{index=0}
|
||||
xdg.configFile."hypr/hyprpaper.conf".text = ''
|
||||
xdg.configFile."hypr/hyprpaper.conf".text = lib.mkForce ''
|
||||
ipc = true
|
||||
splash = false
|
||||
'';
|
||||
xdg.configFile."hypr/hyprpaper.conf".backup = lib.mkForce false;
|
||||
# Workspace wallpaper daemon: listens to socket2, applies w-<id>=... mapping
|
||||
# Uses workspacev2 to get numeric workspace id. :contentReference[oaicite:1]{index=1}
|
||||
xdg.configFile."${daemonRel}" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
text = lib.mkForce ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
: "''${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR not set}"
|
||||
@@ -121,13 +122,14 @@ in
|
||||
handle "''${line}" || true
|
||||
done
|
||||
'';
|
||||
backup = lib.mkForce false;
|
||||
};
|
||||
|
||||
# CLI setter in the style of your inspiration script.
|
||||
# Usage: set-wallpaper.sh <workspace_id> <monitor> [wallpaper]
|
||||
xdg.configFile."${setRel}" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
text = lib.mkForce ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
@@ -170,6 +172,7 @@ in
|
||||
hyprctl hyprpaper wallpaper "''${mon}, ''${wp}, fill" >/dev/null
|
||||
fi
|
||||
'';
|
||||
backup = lib.mkForce false;
|
||||
};
|
||||
|
||||
# Services
|
||||
|
||||
@@ -7,6 +7,7 @@ in
|
||||
programs.alacritty.enable = true;
|
||||
# Override the config generated by programs.alacritty
|
||||
xdg.configFile."alacritty/alacritty.toml".source = lib.mkForce repoAlacrittyConf;
|
||||
xdg.configFile."alacritty/alacritty.toml".backup = lib.mkForce false
|
||||
catppuccin.alacritty.enable = true;
|
||||
catppuccin.alacritty.flavor = "mocha";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
# install with tree sitter enabled
|
||||
package = (pkgs.emacs-pgtk.override { withTreeSitter = true; });
|
||||
extraPackages = epkgs: [
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
# install with tree sitter enabled
|
||||
package = (pkgs.emacs-pgtk.override { withTreeSitter = true; });
|
||||
extraPackages = epkgs: [
|
||||
# also install all tree sitter grammars
|
||||
epkgs.manualPackages.treesit-grammars.with-all-grammars
|
||||
epkgs.nerd-icons # nerd fonts support
|
||||
@@ -45,23 +45,23 @@
|
||||
epkgs.sideline # mainly for flymake errors on the side
|
||||
epkgs.sideline-flymake # mainly for flymake errors on the side
|
||||
epkgs.sideline-eglot # mainly for flymake errors on the side
|
||||
];
|
||||
};
|
||||
home.sessionVariables = {
|
||||
EDITOR = "emacs";
|
||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||
};
|
||||
home.file = {
|
||||
emacs-init = {
|
||||
];
|
||||
};
|
||||
home.sessionVariables = {
|
||||
EDITOR = "emacs";
|
||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||
};
|
||||
home.file = {
|
||||
emacs-init = {
|
||||
source = ./early-init.el;
|
||||
target = ".emacs.d/early-init.el";
|
||||
};
|
||||
emacs = {
|
||||
};
|
||||
emacs = {
|
||||
source = ./init.el;
|
||||
target = ".emacs.d/init.el";
|
||||
};
|
||||
};
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
;;; package --- early init -*- lexical-binding: t -*-
|
||||
;;; Commentary:
|
||||
;;; Prevents white flash and better Emacs defaults
|
||||
;;; Code:
|
||||
(set-language-environment "UTF-8")
|
||||
(setq-default
|
||||
default-frame-alist
|
||||
'((background-color . "#1e1e2e")
|
||||
;;; Commentary:
|
||||
;;; Prevents white flash and better Emacs defaults
|
||||
;;; Code:
|
||||
(set-language-environment "UTF-8")
|
||||
(setq-default
|
||||
default-frame-alist
|
||||
'((background-color . "#1e1e2e")
|
||||
(bottom-divider-width . 1) ; Thin horizontal window divider
|
||||
(foreground-color . "#bac2de") ; Default foreground color
|
||||
(fullscreen . maximized) ; Maximize the window by default
|
||||
@@ -17,76 +17,76 @@
|
||||
(tool-bar-lines . 0) ; No tool bar
|
||||
(undecorated . t) ; Remove extraneous X decorations
|
||||
(vertical-scroll-bars . nil)) ; No vertical scroll-bars
|
||||
user-full-name "Henrov henrov" ; ME!
|
||||
;; memory configuration
|
||||
;; Higher garbage collection threshold, prevents frequent gc locks, reset later
|
||||
gc-cons-threshold most-positive-fixnum
|
||||
;; Ignore warnings for (obsolete) elisp compilations
|
||||
byte-compile-warnings '(not obsolete)
|
||||
;; And other log types completely
|
||||
warning-suppress-log-types '((comp) (bytecomp))
|
||||
;; Large files are okay in the new millenium.
|
||||
large-file-warning-threshold 100000000
|
||||
;; dont show garbage collection messages at startup, will reset later
|
||||
garbage-collection-messages nil
|
||||
;; native compilation
|
||||
package-native-compile t
|
||||
native-comp-warning-on-missing-source nil
|
||||
native-comp-async-report-warnings-errors 'silent
|
||||
;; Read more based on system pipe capacity
|
||||
read-process-output-max (max (* 10240 10240) read-process-output-max)
|
||||
;; scroll configuration
|
||||
scroll-margin 0 ; Lets scroll to the end of the margin
|
||||
scroll-conservatively 100000 ; Never recenter the window
|
||||
scroll-preserve-screen-position 1 ; Scrolling back and forth
|
||||
;; frame config
|
||||
;; Improve emacs startup time by not resizing to adjust for custom settings
|
||||
frame-inhibit-implied-resize t
|
||||
;; Dont resize based on character height / width but to exact pixels
|
||||
frame-resize-pixelwise t
|
||||
;; backups & files
|
||||
backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
|
||||
backup-by-copying t ; Don't clobber symlinks
|
||||
create-lockfiles nil ; Don't have temp files
|
||||
delete-old-versions t ; Cleanup automatically
|
||||
kept-new-versions 6 ; Update every few times
|
||||
kept-old-versions 2 ; And cleanup even more
|
||||
version-control t ; Version them backups
|
||||
delete-by-moving-to-trash t ; Dont delete, send to trash instead
|
||||
;; startup
|
||||
inhibit-startup-screen t ; I have already done the tutorial. Twice
|
||||
inhibit-startup-message t ; I know I am ready
|
||||
inhibit-startup-echo-area-message t ; Yep, still know it
|
||||
initial-scratch-message nil ; I know it is the scratch buffer!
|
||||
initial-buffer-choice nil
|
||||
inhibit-startup-buffer-menu t
|
||||
inhibit-x-resources t
|
||||
initial-major-mode 'fundamental-mode
|
||||
pgtk-wait-for-event-timeout 0.001 ; faster child frames
|
||||
ad-redefinition-action 'accept ; dont care about legacy things being redefined
|
||||
inhibit-compacting-font-caches t
|
||||
;; tabs
|
||||
tab-width 4 ; Always tab 4 spaces.
|
||||
indent-tabs-mode nil ; Never use actual tabs.
|
||||
;; rendering
|
||||
cursor-in-non-selected-windows nil ; dont render cursors other windows
|
||||
;; packages
|
||||
use-package-always-defer t
|
||||
load-prefer-newer t
|
||||
default-input-method nil
|
||||
use-dialog-box nil
|
||||
use-file-dialog nil
|
||||
use-package-expand-minimally t
|
||||
package-enable-at-startup nil
|
||||
use-package-enable-imenu-support t
|
||||
auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist.
|
||||
package-archives '(("melpa" . "https://melpa.org/packages/")
|
||||
user-full-name "Henrov henrov" ; ME!
|
||||
;; memory configuration
|
||||
;; Higher garbage collection threshold, prevents frequent gc locks, reset later
|
||||
gc-cons-threshold most-positive-fixnum
|
||||
;; Ignore warnings for (obsolete) elisp compilations
|
||||
byte-compile-warnings '(not obsolete)
|
||||
;; And other log types completely
|
||||
warning-suppress-log-types '((comp) (bytecomp))
|
||||
;; Large files are okay in the new millenium.
|
||||
large-file-warning-threshold 100000000
|
||||
;; dont show garbage collection messages at startup, will reset later
|
||||
garbage-collection-messages nil
|
||||
;; native compilation
|
||||
package-native-compile t
|
||||
native-comp-warning-on-missing-source nil
|
||||
native-comp-async-report-warnings-errors 'silent
|
||||
;; Read more based on system pipe capacity
|
||||
read-process-output-max (max (* 10240 10240) read-process-output-max)
|
||||
;; scroll configuration
|
||||
scroll-margin 0 ; Lets scroll to the end of the margin
|
||||
scroll-conservatively 100000 ; Never recenter the window
|
||||
scroll-preserve-screen-position 1 ; Scrolling back and forth
|
||||
;; frame config
|
||||
;; Improve emacs startup time by not resizing to adjust for custom settings
|
||||
frame-inhibit-implied-resize t
|
||||
;; Dont resize based on character height / width but to exact pixels
|
||||
frame-resize-pixelwise t
|
||||
;; backups & files
|
||||
backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
|
||||
backup-by-copying t ; Don't clobber symlinks
|
||||
create-lockfiles nil ; Don't have temp files
|
||||
delete-old-versions t ; Cleanup automatically
|
||||
kept-new-versions 6 ; Update every few times
|
||||
kept-old-versions 2 ; And cleanup even more
|
||||
version-control t ; Version them backups
|
||||
delete-by-moving-to-trash t ; Dont delete, send to trash instead
|
||||
;; startup
|
||||
inhibit-startup-screen t ; I have already done the tutorial. Twice
|
||||
inhibit-startup-message t ; I know I am ready
|
||||
inhibit-startup-echo-area-message t ; Yep, still know it
|
||||
initial-scratch-message nil ; I know it is the scratch buffer!
|
||||
initial-buffer-choice nil
|
||||
inhibit-startup-buffer-menu t
|
||||
inhibit-x-resources t
|
||||
initial-major-mode 'fundamental-mode
|
||||
pgtk-wait-for-event-timeout 0.001 ; faster child frames
|
||||
ad-redefinition-action 'accept ; dont care about legacy things being redefined
|
||||
inhibit-compacting-font-caches t
|
||||
;; tabs
|
||||
tab-width 4 ; Always tab 4 spaces.
|
||||
indent-tabs-mode nil ; Never use actual tabs.
|
||||
;; rendering
|
||||
cursor-in-non-selected-windows nil ; dont render cursors other windows
|
||||
;; packages
|
||||
use-package-always-defer t
|
||||
load-prefer-newer t
|
||||
default-input-method nil
|
||||
use-dialog-box nil
|
||||
use-file-dialog nil
|
||||
use-package-expand-minimally t
|
||||
package-enable-at-startup nil
|
||||
use-package-enable-imenu-support t
|
||||
auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist.
|
||||
package-archives '(("melpa" . "https://melpa.org/packages/")
|
||||
("gnu" . "https://elpa.gnu.org/packages/")
|
||||
("nongnu" . "https://elpa.nongnu.org/nongnu/")
|
||||
("melpa-stable" . "https://stable.melpa.org/packages/"))
|
||||
package-archive-priorities '(("gnu" . 99)
|
||||
package-archive-priorities '(("gnu" . 99)
|
||||
("nongnu" . 80)
|
||||
("melpa" . 70)
|
||||
("melpa-stable" . 50))
|
||||
)
|
||||
;;; early-init.el ends here
|
||||
)
|
||||
;;; early-init.el ends here
|
||||
|
||||
+252
-252
@@ -1,9 +1,9 @@
|
||||
;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
|
||||
|
||||
;;; Commentary:
|
||||
;;; Simple Emacs setup I carry everywhere
|
||||
;;; Commentary:
|
||||
;;; Simple Emacs setup I carry everywhere
|
||||
|
||||
;;; Code:
|
||||
;;; Code:
|
||||
(setq custom-file (locate-user-emacs-file "custom.el"))
|
||||
(load custom-file 'noerror) ;; no error on missing custom file
|
||||
|
||||
@@ -11,73 +11,73 @@
|
||||
(package-initialize)
|
||||
|
||||
(defun reset-custom-vars ()
|
||||
"Resets the custom variables that were set to crazy numbers"
|
||||
(setopt gc-cons-threshold (* 1024 1024 100))
|
||||
(setopt garbage-collection-messages t))
|
||||
"Resets the custom variables that were set to crazy numbers"
|
||||
(setopt gc-cons-threshold (* 1024 1024 100))
|
||||
(setopt garbage-collection-messages t))
|
||||
|
||||
(use-package emacs
|
||||
:custom
|
||||
(native-comp-async-query-on-exit t)
|
||||
(read-answer-short t)
|
||||
(use-short-answers t)
|
||||
(enable-recursive-minibuffers t)
|
||||
(which-func-update-delay 1.0)
|
||||
(visible-bell nil)
|
||||
(custom-buffer-done-kill t)
|
||||
(whitespace-line-column nil)
|
||||
(x-underline-at-descent-line t)
|
||||
(imenu-auto-rescan t)
|
||||
(uniquify-buffer-name-style 'forward)
|
||||
(confirm-nonexistent-file-or-buffer nil)
|
||||
(create-lockfiles nil)
|
||||
(make-backup-files nil)
|
||||
(kill-do-not-save-duplicates t)
|
||||
(sentence-end-double-space nil)
|
||||
(treesit-enabled-modes t)
|
||||
:init
|
||||
;; base visual
|
||||
(menu-bar-mode -1) ;; no menu bar
|
||||
(toggle-scroll-bar -1) ;; no scroll bar
|
||||
(tool-bar-mode -1) ;; no tool bar either
|
||||
(blink-cursor-mode -1) ;; stop blinking
|
||||
:custom
|
||||
(native-comp-async-query-on-exit t)
|
||||
(read-answer-short t)
|
||||
(use-short-answers t)
|
||||
(enable-recursive-minibuffers t)
|
||||
(which-func-update-delay 1.0)
|
||||
(visible-bell nil)
|
||||
(custom-buffer-done-kill t)
|
||||
(whitespace-line-column nil)
|
||||
(x-underline-at-descent-line t)
|
||||
(imenu-auto-rescan t)
|
||||
(uniquify-buffer-name-style 'forward)
|
||||
(confirm-nonexistent-file-or-buffer nil)
|
||||
(create-lockfiles nil)
|
||||
(make-backup-files nil)
|
||||
(kill-do-not-save-duplicates t)
|
||||
(sentence-end-double-space nil)
|
||||
(treesit-enabled-modes t)
|
||||
:init
|
||||
;; base visual
|
||||
(menu-bar-mode -1) ;; no menu bar
|
||||
(toggle-scroll-bar -1) ;; no scroll bar
|
||||
(tool-bar-mode -1) ;; no tool bar either
|
||||
(blink-cursor-mode -1) ;; stop blinking
|
||||
|
||||
;; font of the century
|
||||
(set-frame-font "Aporetic Sans Mono 12" nil t)
|
||||
;; font of the century
|
||||
(set-frame-font "Aporetic Sans Mono 12" nil t)
|
||||
|
||||
:bind
|
||||
(("C-<wheel-up>" . pixel-scroll-precision) ; dont zoom in please, just scroll
|
||||
:bind
|
||||
(("C-<wheel-up>" . pixel-scroll-precision) ; dont zoom in please, just scroll
|
||||
("C-<wheel-down>" . pixel-scroll-precision) ; dont zoom in either, just scroll
|
||||
("C-x k" . kill-current-buffer)) ; kill the buffer, dont ask
|
||||
:hook
|
||||
(text-mode . delete-trailing-whitespace-mode)
|
||||
(prog-mode . delete-trailing-whitespace-mode)
|
||||
(after-init . global-display-line-numbers-mode) ;; always show line numbers
|
||||
(after-init . column-number-mode) ;; column number in the mode line
|
||||
(after-init . size-indication-mode) ;; file size in the mode line
|
||||
(after-init . pixel-scroll-precision-mode) ;; smooth mouse scroll
|
||||
(after-init . electric-pair-mode) ;; i mean ... parens should auto create
|
||||
(after-init . reset-custom-vars)
|
||||
)
|
||||
:hook
|
||||
(text-mode . delete-trailing-whitespace-mode)
|
||||
(prog-mode . delete-trailing-whitespace-mode)
|
||||
(after-init . global-display-line-numbers-mode) ;; always show line numbers
|
||||
(after-init . column-number-mode) ;; column number in the mode line
|
||||
(after-init . size-indication-mode) ;; file size in the mode line
|
||||
(after-init . pixel-scroll-precision-mode) ;; smooth mouse scroll
|
||||
(after-init . electric-pair-mode) ;; i mean ... parens should auto create
|
||||
(after-init . reset-custom-vars)
|
||||
)
|
||||
|
||||
(use-package autorevert
|
||||
:ensure nil
|
||||
:custom
|
||||
(auto-revert-interval 3)
|
||||
(auto-revert-remote-files nil)
|
||||
(auto-revert-use-notify t)
|
||||
(auto-revert-avoid-polling nil)
|
||||
(auto-revert-verbose t)
|
||||
:hook
|
||||
(after-init . global-auto-revert-mode))
|
||||
:ensure nil
|
||||
:custom
|
||||
(auto-revert-interval 3)
|
||||
(auto-revert-remote-files nil)
|
||||
(auto-revert-use-notify t)
|
||||
(auto-revert-avoid-polling nil)
|
||||
(auto-revert-verbose t)
|
||||
:hook
|
||||
(after-init . global-auto-revert-mode))
|
||||
|
||||
(use-package recentf
|
||||
:ensure nil
|
||||
:commands (recentf-mode recentf-cleanup)
|
||||
:hook
|
||||
(after-init . recentf-mode)
|
||||
:custom
|
||||
(recentf-auto-cleanup 'never)
|
||||
(recentf-exclude
|
||||
:ensure nil
|
||||
:commands (recentf-mode recentf-cleanup)
|
||||
:hook
|
||||
(after-init . recentf-mode)
|
||||
:custom
|
||||
(recentf-auto-cleanup 'never)
|
||||
(recentf-exclude
|
||||
(list "\\.tar$" "\\.tbz2$" "\\.tbz$" "\\.tgz$" "\\.bz2$"
|
||||
"\\.bz$" "\\.gz$" "\\.gzip$" "\\.xz$" "\\.zip$"
|
||||
"\\.7z$" "\\.rar$"
|
||||
@@ -85,231 +85,231 @@
|
||||
"\\.\\(?:gz\\|gif\\|svg\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
|
||||
"-autoloads\\.el$" "autoload\\.el$"))
|
||||
|
||||
:config
|
||||
;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
|
||||
;; `recentf-save-list', allowing stale entries to be removed before the list
|
||||
;; is saved by `recentf-save-list', which is automatically added to
|
||||
;; `kill-emacs-hook' by `recentf-mode'.
|
||||
(add-hook 'kill-emacs-hook #'recentf-cleanup -90))
|
||||
:config
|
||||
;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
|
||||
;; `recentf-save-list', allowing stale entries to be removed before the list
|
||||
;; is saved by `recentf-save-list', which is automatically added to
|
||||
;; `kill-emacs-hook' by `recentf-mode'.
|
||||
(add-hook 'kill-emacs-hook #'recentf-cleanup -90))
|
||||
|
||||
(use-package savehist
|
||||
:ensure nil
|
||||
:commands (savehist-mode savehist-save)
|
||||
:hook
|
||||
(after-init . savehist-mode)
|
||||
:custom
|
||||
(savehist-autosave-interval 600)
|
||||
(savehist-additional-variables
|
||||
:ensure nil
|
||||
:commands (savehist-mode savehist-save)
|
||||
:hook
|
||||
(after-init . savehist-mode)
|
||||
:custom
|
||||
(savehist-autosave-interval 600)
|
||||
(savehist-additional-variables
|
||||
'(kill-ring ; clipboard
|
||||
register-alist ; macros
|
||||
mark-ring global-mark-ring ; marks
|
||||
search-ring regexp-search-ring)))
|
||||
|
||||
(use-package hl-line
|
||||
:ensure nil
|
||||
:custom
|
||||
(hl-line-sticky-flag nil)
|
||||
(global-hl-line-sticky-flag nil)
|
||||
:hook
|
||||
(after-init . global-hl-line-mode))
|
||||
:ensure nil
|
||||
:custom
|
||||
(hl-line-sticky-flag nil)
|
||||
(global-hl-line-sticky-flag nil)
|
||||
:hook
|
||||
(after-init . global-hl-line-mode))
|
||||
|
||||
(use-package saveplace
|
||||
:ensure nil
|
||||
:commands (save-place-mode save-place-local-mode)
|
||||
:hook
|
||||
(after-init . save-place-mode)
|
||||
:custom
|
||||
(save-place-limit 400))
|
||||
:ensure nil
|
||||
:commands (save-place-mode save-place-local-mode)
|
||||
:hook
|
||||
(after-init . save-place-mode)
|
||||
:custom
|
||||
(save-place-limit 400))
|
||||
|
||||
(use-package nerd-icons
|
||||
:custom
|
||||
;; disable bright icon colors
|
||||
(nerd-icons-color-icons nil))hells.nix
|
||||
:custom
|
||||
;; disable bright icon colors
|
||||
(nerd-icons-color-icons nil))hells.nix
|
||||
|
||||
(use-package doom-modeline
|
||||
:custom
|
||||
(inhibit-compacting-font-caches t) ;; speed
|
||||
(doom-modeline-buffer-file-name-style 'relative-from-project)
|
||||
(doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
|
||||
(doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
|
||||
(doom-modeline-buffer-state-icon nil) ;; the filename already shows me
|
||||
(doom-modeline-lsp nil) ;; lsp state is too distracting, too often
|
||||
:hook (after-init . doom-modeline-mode))
|
||||
:custom
|
||||
(inhibit-compacting-font-caches t) ;; speed
|
||||
(doom-modeline-buffer-file-name-style 'relative-from-project)
|
||||
(doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
|
||||
(doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
|
||||
(doom-modeline-buffer-state-icon nil) ;; the filename already shows me
|
||||
(doom-modeline-lsp nil) ;; lsp state is too distracting, too often
|
||||
:hook (after-init . doom-modeline-mode))
|
||||
|
||||
(load-theme 'catppuccin :no-confirm)
|
||||
|
||||
(use-package diminish :demand t) ;; declutter the modeline
|
||||
(use-package eldoc
|
||||
:diminish eldoc-mode
|
||||
:custom
|
||||
(eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
|
||||
:diminish eldoc-mode
|
||||
:custom
|
||||
(eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
|
||||
|
||||
(use-package eldoc-box
|
||||
:defer t
|
||||
:config
|
||||
(set-face-background 'eldoc-box-border (catppuccin-color 'green))
|
||||
(set-face-background 'eldoc-box-body (catppuccin-color 'base))
|
||||
:bind
|
||||
(("M-h" . eldoc-box-help-at-point)))
|
||||
:defer t
|
||||
:config
|
||||
(set-face-background 'eldoc-box-border (catppuccin-color 'green))
|
||||
(set-face-background 'eldoc-box-body (catppuccin-color 'base))
|
||||
:bind
|
||||
(("M-h" . eldoc-box-help-at-point)))
|
||||
|
||||
(use-package pulsar
|
||||
:commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
|
||||
:init
|
||||
(defface pulsar-catppuccin
|
||||
`((default :extend t)
|
||||
:commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
|
||||
:init
|
||||
(defface pulsar-catppuccin
|
||||
`((default :extend t)
|
||||
(((class color) (min-colors 88) (background light))
|
||||
:background ,(catppuccin-color 'sapphire))
|
||||
(((class color) (min-colors 88) (background dark))
|
||||
:background ,(catppuccin-color 'sapphire))
|
||||
(t :inverse-video t))
|
||||
"Alternative nord face for `pulsar-face'."
|
||||
:group 'pulsar-faces)
|
||||
:custom
|
||||
(pulsar-face 'pulsar-catppuccin)
|
||||
:hook
|
||||
(after-init . pulsar-global-mode))
|
||||
"Alternative nord face for `pulsar-face'."
|
||||
:group 'pulsar-faces)
|
||||
:custom
|
||||
(pulsar-face 'pulsar-catppuccin)
|
||||
:hook
|
||||
(after-init . pulsar-global-mode))
|
||||
|
||||
(use-package which-key
|
||||
:commands which-key-mode
|
||||
:diminish which-key-mode
|
||||
:hook
|
||||
(after-init . which-key-mode))
|
||||
:commands which-key-mode
|
||||
:diminish which-key-mode
|
||||
:hook
|
||||
(after-init . which-key-mode))
|
||||
|
||||
(use-package expreg
|
||||
:bind ("M-m" . expreg-expand))
|
||||
:bind ("M-m" . expreg-expand))
|
||||
|
||||
(use-package vundo) ;; undo tree
|
||||
|
||||
;; better structured editing
|
||||
(use-package puni
|
||||
:commands puni-global-mode
|
||||
:hook
|
||||
(after-init . puni-global-mode))
|
||||
:commands puni-global-mode
|
||||
:hook
|
||||
(after-init . puni-global-mode))
|
||||
|
||||
(use-package avy
|
||||
:bind
|
||||
("M-i" . avy-goto-char-2)
|
||||
:custom
|
||||
(avy-background t))
|
||||
:bind
|
||||
("M-i" . avy-goto-char-2)
|
||||
:custom
|
||||
(avy-background t))
|
||||
|
||||
(use-package consult
|
||||
:bind
|
||||
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
||||
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
||||
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g i" . consult-imenu) ;; consult version is interactive
|
||||
("M-g r" . consult-ripgrep) ;; find in project also works
|
||||
:custom
|
||||
(consult-narrow-key "<"))
|
||||
:bind
|
||||
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
||||
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
||||
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
||||
("M-g i" . consult-imenu) ;; consult version is interactive
|
||||
("M-g r" . consult-ripgrep) ;; find in project also works
|
||||
:custom
|
||||
(consult-narrow-key "<"))
|
||||
|
||||
(use-package vertico
|
||||
:commands vertico-mode
|
||||
:custom
|
||||
(read-file-name-completion-ignore-case t)
|
||||
(read-buffer-completion-ignore-case t)
|
||||
(completion-ignore-case t)
|
||||
(enable-recursive-minibuffers t)
|
||||
(minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
:init
|
||||
(vertico-mode)
|
||||
:hook
|
||||
(minibuffer-setup-hook . cursor-intangible-mode))
|
||||
:commands vertico-mode
|
||||
:custom
|
||||
(read-file-name-completion-ignore-case t)
|
||||
(read-buffer-completion-ignore-case t)
|
||||
(completion-ignore-case t)
|
||||
(enable-recursive-minibuffers t)
|
||||
(minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
:init
|
||||
(vertico-mode)
|
||||
:hook
|
||||
(minibuffer-setup-hook . cursor-intangible-mode))
|
||||
|
||||
(use-package marginalia
|
||||
:commands marginalia-mode
|
||||
:hook (after-init . marginalia-mode))
|
||||
:commands marginalia-mode
|
||||
:hook (after-init . marginalia-mode))
|
||||
|
||||
(use-package crux
|
||||
:bind
|
||||
("C-c M-e" . crux-find-user-init-file)
|
||||
("C-c C-w" . crux-transpose-windows)
|
||||
("C-c M-d" . crux-find-current-directory-dir-locals-file)
|
||||
("C-a" . crux-move-beginning-of-line))
|
||||
:bind
|
||||
("C-c M-e" . crux-find-user-init-file)
|
||||
("C-c C-w" . crux-transpose-windows)
|
||||
("C-c M-d" . crux-find-current-directory-dir-locals-file)
|
||||
("C-a" . crux-move-beginning-of-line))
|
||||
|
||||
(use-package magit
|
||||
:bind (("C-M-g" . magit-status)))
|
||||
:bind (("C-M-g" . magit-status)))
|
||||
|
||||
(use-package nerd-icons-corfu
|
||||
:commands nerd-icons-corfu-formatter
|
||||
:defines corfu-margin-formatters)
|
||||
:commands nerd-icons-corfu-formatter
|
||||
:defines corfu-margin-formatters)
|
||||
|
||||
(use-package corfu
|
||||
:commands global-corfu-mode
|
||||
:custom
|
||||
(corfu-cycle t)
|
||||
(corfu-auto t)
|
||||
(corfu-auto-delay 1)
|
||||
(corfu-auto-prefix 3)
|
||||
(corfu-separator ?_)
|
||||
:hook
|
||||
(after-init . global-corfu-mode)
|
||||
:config
|
||||
(add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
|
||||
:commands global-corfu-mode
|
||||
:custom
|
||||
(corfu-cycle t)
|
||||
(corfu-auto t)
|
||||
(corfu-auto-delay 1)
|
||||
(corfu-auto-prefix 3)
|
||||
(corfu-separator ?_)
|
||||
:hook
|
||||
(after-init . global-corfu-mode)
|
||||
:config
|
||||
(add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
|
||||
|
||||
(use-package cape)
|
||||
|
||||
(use-package orderless
|
||||
:custom
|
||||
(completion-styles '(orderless partial-completion basic))
|
||||
(completion-category-defaults nil)
|
||||
(completion-category-overrides nil))
|
||||
:custom
|
||||
(completion-styles '(orderless partial-completion basic))
|
||||
(completion-category-defaults nil)
|
||||
(completion-category-overrides nil))
|
||||
|
||||
(use-package yasnippet
|
||||
:commands yas-global-mode
|
||||
:diminish yas-minor-mode
|
||||
:hook
|
||||
(after-init . yas-global-mode))
|
||||
:commands yas-global-mode
|
||||
:diminish yas-minor-mode
|
||||
:hook
|
||||
(after-init . yas-global-mode))
|
||||
|
||||
(use-package yasnippet-snippets :after yasnippet)
|
||||
|
||||
(use-package exec-path-from-shell
|
||||
:commands exec-path-from-shell-initialize
|
||||
:custom
|
||||
(exec-path-from-shell-arguments nil)
|
||||
:hook
|
||||
(after-init . exec-path-from-shell-initialize))
|
||||
:commands exec-path-from-shell-initialize
|
||||
:custom
|
||||
(exec-path-from-shell-arguments nil)
|
||||
:hook
|
||||
(after-init . exec-path-from-shell-initialize))
|
||||
|
||||
(use-package nixpkgs-fmt
|
||||
:custom
|
||||
(nixpkgs-fmt-command "nixfmt"))
|
||||
:custom
|
||||
(nixpkgs-fmt-command "nixfmt"))
|
||||
|
||||
(use-package eat
|
||||
:bind
|
||||
(("C-c e p" . eat-project)
|
||||
:bind
|
||||
(("C-c e p" . eat-project)
|
||||
("C-c e t" . eat)))
|
||||
|
||||
(use-package f :demand t)
|
||||
|
||||
(use-package envrc
|
||||
:commands envrc-global-mode
|
||||
:hook
|
||||
(after-init . envrc-global-mode))
|
||||
:commands envrc-global-mode
|
||||
:hook
|
||||
(after-init . envrc-global-mode))
|
||||
|
||||
(use-package gptel
|
||||
:commands gptel-make-anthropic f-read-text
|
||||
:config
|
||||
(gptel-make-anthropic "Claude"
|
||||
:stream t :key (f-read-text "/run/secrets/claude_key")))
|
||||
:commands gptel-make-anthropic f-read-text
|
||||
:config
|
||||
(gptel-make-anthropic "Claude"
|
||||
:stream t :key (f-read-text "/run/secrets/claude_key")))
|
||||
|
||||
(use-package sideline-flymake)
|
||||
(use-package sideline-eglot)
|
||||
(use-package sideline
|
||||
:custom
|
||||
(sideline-backends-right '(sideline-flymake sideline-eglot))
|
||||
:hook
|
||||
(eglot-managed-mode . sideline-mode)
|
||||
(flymake-mode . sideline-mode))
|
||||
:custom
|
||||
(sideline-backends-right '(sideline-flymake sideline-eglot))
|
||||
:hook
|
||||
(eglot-managed-mode . sideline-mode)
|
||||
(flymake-mode . sideline-mode))
|
||||
|
||||
(use-package eglot
|
||||
:custom
|
||||
(eglot-extend-to-xref t)
|
||||
(eglot-ignored-server-capabilities '(:inlayHintProvider))
|
||||
(jsonrpc-event-hook nil)
|
||||
:hook
|
||||
(eglot-managed-mode . eldoc-box-hover-mode)
|
||||
(before-save . eldoc-format-buffer)
|
||||
:bind
|
||||
(:map eglot-mode-map
|
||||
:custom
|
||||
(eglot-extend-to-xref t)
|
||||
(eglot-ignored-server-capabilities '(:inlayHintProvider))
|
||||
(jsonrpc-event-hook nil)
|
||||
:hook
|
||||
(eglot-managed-mode . eldoc-box-hover-mode)
|
||||
(before-save . eldoc-format-buffer)
|
||||
:bind
|
||||
(:map eglot-mode-map
|
||||
("C-c l a" . eglot-code-actions)
|
||||
("C-c l r" . eglot-rename)
|
||||
("C-c l h" . eldoc)
|
||||
@@ -317,58 +317,58 @@
|
||||
("C-c l w" . eglot-reconnect)))
|
||||
|
||||
(use-package proced
|
||||
:custom
|
||||
(proced-auto-update-flag t)
|
||||
(proced-auto-update-interval 3)
|
||||
(proced-enable-color-flag t)
|
||||
(proced-show-remote-processes t))
|
||||
:custom
|
||||
(proced-auto-update-flag t)
|
||||
(proced-auto-update-interval 3)
|
||||
(proced-enable-color-flag t)
|
||||
(proced-show-remote-processes t))
|
||||
|
||||
(use-package org
|
||||
:ensure t
|
||||
:defer t
|
||||
:commands (org-mode org-capture org-agenda)
|
||||
:init
|
||||
(defvar org-journal-file "~/nextcloud/org/journal.org")
|
||||
(defvar org-archive-file "~/nextcloud/org/archive.org")
|
||||
(defvar org-notes-file "~/nextcloud/org/notes.org")
|
||||
(defvar org-inbox-file "~/nextcloud/org/inbox.org")
|
||||
(defvar org-work-file "~/nextcloud/org/work.org")
|
||||
(defun my/org-capture-project-target-heading ()
|
||||
"Determine Org target headings from the current file's project path.
|
||||
:ensure t
|
||||
:defer t
|
||||
:commands (org-mode org-capture org-agenda)
|
||||
:init
|
||||
(defvar org-journal-file "~/nextcloud/org/journal.org")
|
||||
(defvar org-archive-file "~/nextcloud/org/archive.org")
|
||||
(defvar org-notes-file "~/nextcloud/org/notes.org")
|
||||
(defvar org-inbox-file "~/nextcloud/org/inbox.org")
|
||||
(defvar org-work-file "~/nextcloud/org/work.org")
|
||||
(defun my/org-capture-project-target-heading ()
|
||||
"Determine Org target headings from the current file's project path.
|
||||
|
||||
This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
|
||||
It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
|
||||
for an Org capture template.
|
||||
This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
|
||||
It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
|
||||
for an Org capture template.
|
||||
|
||||
If the current buffer is not visi
|
||||
If the current buffer is not visi
|
||||
ting a file within such a
|
||||
project structure, it returns nil, causing capture to default to
|
||||
the top of the file."
|
||||
(when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
|
||||
project structure, it returns nil, causing capture to default to
|
||||
the top of the file."
|
||||
(when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
|
||||
(let ((path-parts (split-string path "/" t " ")))
|
||||
(when-let* ((projects-pos (cl-position "projects" path-parts :test #'string=))
|
||||
(company (nth (+ 1 projects-pos) path-parts))
|
||||
(project (nth (+ 2 projects-pos) path-parts)))
|
||||
;; Return a list of headlines for Org to find or create.
|
||||
(list company project)))))
|
||||
:bind
|
||||
(("C-c c" . org-capture)
|
||||
:bind
|
||||
(("C-c c" . org-capture)
|
||||
("C-c i" . org-store-link)
|
||||
("C-c a" . org-agenda)
|
||||
:map org-mode-map
|
||||
("C-c t" . org-toggle-inline-images)
|
||||
("C-c l" . org-toggle-link-display))
|
||||
:custom
|
||||
(org-agenda-files (list org-inbox-file org-journal-file))
|
||||
(org-directory "~/nextcloud/org")
|
||||
(org-default-notes-file org-inbox-file)
|
||||
(org-archive-location (concat org-archive-file "::* From %s"))
|
||||
(org-log-done 'time)
|
||||
(org-log-into-drawer t)
|
||||
(org-hide-emphasis-markers t)
|
||||
(org-src-fontify-natively t)
|
||||
(org-src-tab-acts-natively t)
|
||||
(org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
|
||||
:custom
|
||||
(org-agenda-files (list org-inbox-file org-journal-file))
|
||||
(org-directory "~/nextcloud/org")
|
||||
(org-default-notes-file org-inbox-file)
|
||||
(org-archive-location (concat org-archive-file "::* From %s"))
|
||||
(org-log-done 'time)
|
||||
(org-log-into-drawer t)
|
||||
(org-hide-emphasis-markers t)
|
||||
(org-src-fontify-natively t)
|
||||
(org-src-tab-acts-natively t)
|
||||
(org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
|
||||
"* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n)")
|
||||
("j" "Journal" entry (file+olp+datetree org-journal-file)
|
||||
"* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
|
||||
@@ -379,22 +379,22 @@ ting a file within such a
|
||||
"* TODO %? \n CLOCK: %U"
|
||||
))
|
||||
)
|
||||
:config
|
||||
;; Enable syntax highlighting in code blocks
|
||||
(add-hook 'org-mode-hook 'turn-on-font-lock)
|
||||
(add-hook 'org-mode-hook 'org-indent-mode))
|
||||
:config
|
||||
;; Enable syntax highlighting in code blocks
|
||||
(add-hook 'org-mode-hook 'turn-on-font-lock)
|
||||
(add-hook 'org-mode-hook 'org-indent-mode))
|
||||
|
||||
;; extras
|
||||
(use-package comp-run
|
||||
:ensure nil
|
||||
:config
|
||||
(push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
|
||||
(push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
|
||||
:ensure nil
|
||||
:config
|
||||
(push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
|
||||
(push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
|
||||
|
||||
(use-package rustic
|
||||
:custom
|
||||
(rustic-lsp-client 'eglot))
|
||||
:custom
|
||||
(rustic-lsp-client 'eglot))
|
||||
|
||||
(provide 'init)
|
||||
|
||||
;;; init.el ends here
|
||||
;;; init.el ends here
|
||||
|
||||
@@ -9,7 +9,8 @@ in
|
||||
{
|
||||
xdg.enable = true;
|
||||
# Stable theme file so kitty.conf can include it without /nix/store paths
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = catppuccinMochaConf;
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = lib.mkForce catppuccinMochaConf;
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".backup = lib.mkForce false;
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
# Home Manager generates ~/.config/kitty/kitty.conf; we append in-order:
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
hostname,
|
||||
pkgs,
|
||||
lib,
|
||||
modulesPath,
|
||||
user,
|
||||
config,
|
||||
...
|
||||
hostname,
|
||||
pkgs,
|
||||
lib,
|
||||
modulesPath,
|
||||
user,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
../../hardware/hardware.nix
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
../../hardware/hardware.nix
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
@@ -19,19 +19,19 @@ boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
{ device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/811D-0676";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
{ device = "/dev/disk/by-uuid/811D-0676";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
|
||||
];
|
||||
[ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
@@ -37,13 +37,13 @@ nmcli connection show --active
|
||||
nmcli device status
|
||||
|
||||
find ~/Repos/nixos/henrovnix_ok \
|
||||
-type d -name ".*" -prune -o \
|
||||
-type f -print0 \
|
||||
-type d -name ".*" -prune -o \
|
||||
-type f -print0 \
|
||||
| xargs -0 sed -i 's/=<defaultUser>=/YOUR_USER/g'
|
||||
|
||||
find ~/Repos/nixos/henrovnix_ok \
|
||||
-type d -name ".*" -prune -o \
|
||||
-type f -print0 \
|
||||
-type d -name ".*" -prune -o \
|
||||
-type f -print0 \
|
||||
| xargs -0 sed -i 's/machine1/YOUR_HOSTNAME/g'
|
||||
|
||||
mv ./machines/machine1 ./machines/YOUR_HOSTNAME
|
||||
|
||||
Reference in New Issue
Block a user