Format code with alejandra
This commit is contained in:
@ -20,11 +20,9 @@
|
||||
./features/suites/cli
|
||||
./features/suites/desktop
|
||||
./features/suites/development
|
||||
|
||||
];
|
||||
|
||||
hostName = "aspi";
|
||||
is-nixos = true;
|
||||
terminal = "kitty";
|
||||
|
||||
}
|
||||
|
@ -4,10 +4,8 @@
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [ alacritty ];
|
||||
}: {
|
||||
home.packages = with pkgs; [alacritty];
|
||||
|
||||
home.file = {
|
||||
".config/alacritty/theme".source = "${inputs.alacritty-theme}";
|
||||
|
@ -3,13 +3,11 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme;
|
||||
in
|
||||
{
|
||||
}: let
|
||||
inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
|
||||
in {
|
||||
# Do not make conditional, just toggle things on and off
|
||||
imports = [ inputs.nix-colors.homeManagerModules.default ]; # TODO: what does this do
|
||||
imports = [inputs.nix-colors.homeManagerModules.default]; # TODO: what does this do
|
||||
|
||||
# home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
|
||||
gtk = {
|
||||
@ -29,6 +27,5 @@ in
|
||||
name = "macOS-BigSur";
|
||||
size = 24;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
@ -4,24 +4,19 @@
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
with lib; let
|
||||
doomRepoUrl = "https://github.com/doomemacs/doomemacs";
|
||||
configRepoUrl = "https://gitlab.julian-mutter.de/julian/emacs-config";
|
||||
in
|
||||
{
|
||||
home.sessionPath = [ "/home/julian/.config/emacs/bin" ];
|
||||
in {
|
||||
home.sessionPath = ["/home/julian/.config/emacs/bin"];
|
||||
|
||||
home.packages =
|
||||
with pkgs;
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
binutils # native-comp needs 'as', provided by this
|
||||
|
||||
## Doom dependencies
|
||||
git
|
||||
(ripgrep.override { withPCRE2 = true; })
|
||||
(ripgrep.override {withPCRE2 = true;})
|
||||
|
||||
## Optional dependencies
|
||||
fd # faster projectile indexing
|
||||
@ -30,12 +25,13 @@ in
|
||||
|
||||
## Module dependencies
|
||||
(aspellWithDicts (
|
||||
ds: with ds; [
|
||||
en
|
||||
en-computers
|
||||
en-science
|
||||
de
|
||||
]
|
||||
ds:
|
||||
with ds; [
|
||||
en
|
||||
en-computers
|
||||
en-science
|
||||
de
|
||||
]
|
||||
))
|
||||
|
||||
hunspell
|
||||
@ -46,6 +42,8 @@ in
|
||||
|
||||
# Code formatters for use with doom emacs
|
||||
nixfmt-rfc-style # nix
|
||||
alejandra # nix
|
||||
|
||||
nixd # nix lsp
|
||||
dockfmt # docker
|
||||
google-java-format # java
|
||||
@ -64,7 +62,7 @@ in
|
||||
]
|
||||
++ lib.optional config.is-nixos emacs;
|
||||
|
||||
home.activation.installDoomEmacs = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
home.activation.installDoomEmacs = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
if [ ! -d "/home/julian/.config/emacs" ]; then
|
||||
$DRY_RUN_CMD ${pkgs.git}/bin/git clone --depth=1 --single-branch "${doomRepoUrl}" "/home/julian/.config/emacs"
|
||||
fi
|
||||
|
@ -3,10 +3,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
with lib; {
|
||||
home.file = {
|
||||
".config/starship.toml".source = ./starship.toml;
|
||||
".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;
|
||||
|
@ -4,10 +4,7 @@
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
with lib; {
|
||||
fonts.fontconfig.enable = true; # required to autoload fonts from packages
|
||||
home.packages = with pkgs; [
|
||||
nerd-fonts.fira-code
|
||||
|
@ -9,6 +9,5 @@
|
||||
settings = {
|
||||
general.adjustment-method = "wayland";
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
@ -4,14 +4,12 @@
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
palette
|
||||
;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
# inputs.hyprland.homeManagerModules.default
|
||||
./waybar
|
||||
@ -30,7 +28,7 @@ in
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-wlr];
|
||||
config.hyprland = {
|
||||
default = [
|
||||
"wlr"
|
||||
@ -147,7 +145,7 @@ in
|
||||
monitor = ",preferred,auto,auto";
|
||||
|
||||
# Autostart
|
||||
exec-once = [ "firefox" ];
|
||||
exec-once = ["firefox"];
|
||||
|
||||
# Look and Feel
|
||||
general = {
|
||||
@ -356,26 +354,26 @@ in
|
||||
"$mod CTRL, 0, movetoworkspacesilent, 10"
|
||||
]
|
||||
++
|
||||
# Screen lock
|
||||
(
|
||||
let
|
||||
swaylock = lib.getExe config.programs.swaylock.package;
|
||||
in
|
||||
# Screen lock
|
||||
(
|
||||
let
|
||||
swaylock = lib.getExe config.programs.swaylock.package;
|
||||
in
|
||||
lib.optionals config.programs.swaylock.enable [
|
||||
"$mod,TAB,exec,${swaylock} --daemonize"
|
||||
]
|
||||
)
|
||||
)
|
||||
++
|
||||
# Notification manager
|
||||
(
|
||||
let
|
||||
makoctl = lib.getExe' config.services.mako.package "makoctl";
|
||||
in
|
||||
# Notification manager
|
||||
(
|
||||
let
|
||||
makoctl = lib.getExe' config.services.mako.package "makoctl";
|
||||
in
|
||||
lib.optionals config.services.mako.enable [
|
||||
"$mod,w,exec,${makoctl} dismiss"
|
||||
"$mod SHIFT,W,exec,${makoctl} restore"
|
||||
]
|
||||
);
|
||||
);
|
||||
|
||||
# plugin = {
|
||||
# hyprbars = {
|
||||
|
@ -4,8 +4,7 @@
|
||||
lib,
|
||||
outputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
getHostname = x: lib.last (lib.splitString "@" x);
|
||||
# remoteColorschemes = lib.mapAttrs' (n: v: {
|
||||
# name = getHostname n;
|
||||
@ -19,18 +18,17 @@ let
|
||||
# Make sure it's using the same hyprland package as we are
|
||||
hyprland = config.wayland.windowManager.hyprland.package;
|
||||
}).overrideAttrs
|
||||
(old: {
|
||||
# Yeet the initialization notification (I hate it)
|
||||
postPatch =
|
||||
(old.postPatch or "")
|
||||
+ ''
|
||||
${lib.getExe pkgs.gnused} -i '/Initialized successfully/d' main.cpp
|
||||
'';
|
||||
});
|
||||
in
|
||||
{
|
||||
(old: {
|
||||
# Yeet the initialization notification (I hate it)
|
||||
postPatch =
|
||||
(old.postPatch or "")
|
||||
+ ''
|
||||
${lib.getExe pkgs.gnused} -i '/Initialized successfully/d' main.cpp
|
||||
'';
|
||||
});
|
||||
in {
|
||||
wayland.windowManager.hyprland = {
|
||||
plugins = [ hyprbars ];
|
||||
plugins = [hyprbars];
|
||||
settings = {
|
||||
"plugin:hyprbars" = {
|
||||
bar_height = 25;
|
||||
@ -40,25 +38,23 @@ in
|
||||
# bar_text_size = config.fontProfiles.regular.size;
|
||||
bar_part_of_window = true;
|
||||
bar_precedence_over_border = true;
|
||||
hyprbars-button =
|
||||
let
|
||||
closeAction = "hyprctl dispatch killactive";
|
||||
hyprbars-button = let
|
||||
closeAction = "hyprctl dispatch killactive";
|
||||
|
||||
isOnSpecial = ''hyprctl activewindow -j | jq -re 'select(.workspace.name == "special")' >/dev/null'';
|
||||
moveToSpecial = "hyprctl dispatch movetoworkspacesilent special";
|
||||
moveToActive = "hyprctl dispatch movetoworkspacesilent name:$(hyprctl -j activeworkspace | jq -re '.name')";
|
||||
minimizeAction = "${isOnSpecial} && ${moveToActive} || ${moveToSpecial}";
|
||||
isOnSpecial = ''hyprctl activewindow -j | jq -re 'select(.workspace.name == "special")' >/dev/null'';
|
||||
moveToSpecial = "hyprctl dispatch movetoworkspacesilent special";
|
||||
moveToActive = "hyprctl dispatch movetoworkspacesilent name:$(hyprctl -j activeworkspace | jq -re '.name')";
|
||||
minimizeAction = "${isOnSpecial} && ${moveToActive} || ${moveToSpecial}";
|
||||
|
||||
maximizeAction = "hyprctl dispatch fullscreen 1";
|
||||
in
|
||||
[
|
||||
# Red close button
|
||||
# "${rgb config.colorscheme.colors.red},12,,${closeAction}"
|
||||
# # Yellow "minimize" (send to special workspace) button
|
||||
# "${rgb config.colorscheme.colors.yellow},12,,${minimizeAction}"
|
||||
# # Green "maximize" (fullscreen) button
|
||||
# "${rgb config.colorscheme.colors.green},12,,${maximizeAction}"
|
||||
];
|
||||
maximizeAction = "hyprctl dispatch fullscreen 1";
|
||||
in [
|
||||
# Red close button
|
||||
# "${rgb config.colorscheme.colors.red},12,,${closeAction}"
|
||||
# # Yellow "minimize" (send to special workspace) button
|
||||
# "${rgb config.colorscheme.colors.yellow},12,,${minimizeAction}"
|
||||
# # Green "maximize" (fullscreen) button
|
||||
# "${rgb config.colorscheme.colors.green},12,,${maximizeAction}"
|
||||
];
|
||||
};
|
||||
|
||||
# windowrulev2 =
|
||||
|
@ -5,13 +5,12 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
palette
|
||||
;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.hyprlock.enable = true;
|
||||
programs.hyprlock.settings = {
|
||||
general = {
|
||||
|
@ -5,14 +5,13 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
palette
|
||||
;
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [ libnotify ];
|
||||
in {
|
||||
home.packages = with pkgs; [libnotify];
|
||||
|
||||
services.mako = {
|
||||
enable = true;
|
||||
|
@ -3,8 +3,7 @@
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
swaylock = "${config.programs.swaylock.package}/bin/swaylock";
|
||||
pgrep = "${pkgs.procps}/bin/pgrep";
|
||||
pactl = "${pkgs.pulseaudio}/bin/pactl";
|
||||
@ -15,24 +14,21 @@ let
|
||||
lockTime = 4 * 60; # TODO: configurable desktop (10 min)/laptop (4 min)
|
||||
|
||||
# Makes two timeouts: one for when the screen is not locked (lockTime+timeout) and one for when it is.
|
||||
afterLockTimeout =
|
||||
afterLockTimeout = {
|
||||
timeout,
|
||||
command,
|
||||
resumeCommand ? null,
|
||||
}: [
|
||||
{
|
||||
timeout,
|
||||
command,
|
||||
resumeCommand ? null,
|
||||
}:
|
||||
[
|
||||
{
|
||||
timeout = lockTime + timeout;
|
||||
inherit command resumeCommand;
|
||||
}
|
||||
{
|
||||
command = "${isLocked} && ${command}";
|
||||
inherit resumeCommand timeout;
|
||||
}
|
||||
];
|
||||
in
|
||||
{
|
||||
timeout = lockTime + timeout;
|
||||
inherit command resumeCommand;
|
||||
}
|
||||
{
|
||||
command = "${isLocked} && ${command}";
|
||||
inherit resumeCommand timeout;
|
||||
}
|
||||
];
|
||||
in {
|
||||
services.swayidle = {
|
||||
enable = true;
|
||||
systemdTarget = "graphical-session.target";
|
||||
@ -45,18 +41,18 @@ in
|
||||
}
|
||||
]
|
||||
++
|
||||
# Turn off displays (hyprland)
|
||||
(lib.optionals config.wayland.windowManager.hyprland.enable (afterLockTimeout {
|
||||
timeout = 300;
|
||||
command = "${hyprctl} dispatch dpms off";
|
||||
resumeCommand = "${hyprctl} dispatch dpms on";
|
||||
}))
|
||||
# Turn off displays (hyprland)
|
||||
(lib.optionals config.wayland.windowManager.hyprland.enable (afterLockTimeout {
|
||||
timeout = 300;
|
||||
command = "${hyprctl} dispatch dpms off";
|
||||
resumeCommand = "${hyprctl} dispatch dpms on";
|
||||
}))
|
||||
++
|
||||
# Turn off displays (sway)
|
||||
(lib.optionals config.wayland.windowManager.sway.enable (afterLockTimeout {
|
||||
timeout = 300;
|
||||
command = "${swaymsg} 'output * dpms off'";
|
||||
resumeCommand = "${swaymsg} 'output * dpms on'";
|
||||
}));
|
||||
# Turn off displays (sway)
|
||||
(lib.optionals config.wayland.windowManager.sway.enable (afterLockTimeout {
|
||||
timeout = 300;
|
||||
command = "${swaymsg} 'output * dpms off'";
|
||||
resumeCommand = "${swaymsg} 'output * dpms on'";
|
||||
}));
|
||||
};
|
||||
}
|
||||
|
@ -2,11 +2,9 @@
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
inherit (config.colorscheme) colors;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
@ -5,11 +5,9 @@
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
@ -3,9 +3,8 @@
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = [ pkgs.waypipe ];
|
||||
}: {
|
||||
home.packages = [pkgs.waypipe];
|
||||
systemd.user.services = {
|
||||
waypipe-client = {
|
||||
Unit.Description = "Runs waypipe on startup to support SSH forwarding";
|
||||
@ -14,7 +13,7 @@
|
||||
ExecStart = "${lib.getExe (config.lib.nixGL.wrap pkgs.waypipe)} --socket %h/.waypipe/client.sock client";
|
||||
ExecStopPost = "${lib.getExe' pkgs.coreutils "rm"} -f %h/.waypipe/client.sock";
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
Install.WantedBy = ["graphical-session.target"];
|
||||
};
|
||||
waypipe-server = {
|
||||
Unit.Description = "Runs waypipe on startup to support SSH forwarding";
|
||||
@ -24,7 +23,7 @@
|
||||
ExecStart = "${lib.getExe (config.lib.nixGL.wrap pkgs.waypipe)} --socket %h/.waypipe/server.sock --title-prefix '[%H] ' --login-shell --display wayland-waypipe server -- ${lib.getExe' pkgs.coreutils "sleep"} infinity";
|
||||
ExecStopPost = "${lib.getExe' pkgs.coreutils "rm"} -f %h/.waypipe/server.sock %t/wayland-waypipe";
|
||||
};
|
||||
Install.WantedBy = [ "default.target" ];
|
||||
Install.WantedBy = ["default.target"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -5,14 +5,13 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
palette
|
||||
;
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [ wlogout ];
|
||||
in {
|
||||
home.packages = with pkgs; [wlogout];
|
||||
|
||||
# xdg.configFile."wlogout/style.css".text = ''
|
||||
# * {
|
||||
|
@ -5,14 +5,13 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
|
||||
palette
|
||||
;
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [ wofi ];
|
||||
in {
|
||||
home.packages = with pkgs; [wofi];
|
||||
|
||||
xdg.configFile."wofi/config".source = ./config;
|
||||
xdg.configFile."wofi/style.css".text = ''
|
||||
|
@ -1,8 +1,6 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
{config, ...}: let
|
||||
inherit (config.colorscheme) colors;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.zathura = {
|
||||
enable = true;
|
||||
options = {
|
||||
|
@ -3,9 +3,8 @@
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ../rofi ];
|
||||
}: {
|
||||
imports = [../rofi];
|
||||
|
||||
services.dunst.enable = true;
|
||||
|
||||
@ -32,11 +31,13 @@
|
||||
package = pkgs.i3-gaps;
|
||||
};
|
||||
|
||||
xsession.importedVariables = [ ];
|
||||
xsession.importedVariables = [];
|
||||
|
||||
# Overwrite default home-manager config file
|
||||
xdg.configFile."i3/config".source = lib.mkForce (
|
||||
if config.hostName == "kardorf" then ./i3/config-kardorf else ./i3/config
|
||||
if config.hostName == "kardorf"
|
||||
then ./i3/config-kardorf
|
||||
else ./i3/config
|
||||
);
|
||||
|
||||
home.file = {
|
||||
@ -48,5 +49,5 @@
|
||||
".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml;
|
||||
};
|
||||
|
||||
home.sessionPath = [ "/home/julian/.config/i3/scripts" ];
|
||||
home.sessionPath = ["/home/julian/.config/i3/scripts"];
|
||||
}
|
||||
|
@ -3,9 +3,7 @@
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
shellIntegration.enableFishIntegration = true;
|
||||
|
@ -3,11 +3,8 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
||||
imports = [ inputs.nixvim.homeManagerModules.nixvim ];
|
||||
}: {
|
||||
imports = [inputs.nixvim.homeManagerModules.nixvim];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
@ -39,7 +36,6 @@
|
||||
opts = {
|
||||
number = false;
|
||||
relativenumber = false;
|
||||
|
||||
};
|
||||
clipboard.register = "unnamedplus"; # Use system clipboard
|
||||
|
||||
@ -93,9 +89,9 @@
|
||||
conform-nvim = {
|
||||
enable = true;
|
||||
settings.formatters_by_ft = with pkgs; {
|
||||
lua = [ "stylua" ];
|
||||
python = [ "black" ];
|
||||
nix = [ "nixfmt" ];
|
||||
lua = ["stylua"];
|
||||
python = ["black"];
|
||||
nix = ["nixfmt"];
|
||||
};
|
||||
# extraOptions = {
|
||||
# default_format_opts.lsp_format = "fallback";
|
||||
@ -107,9 +103,9 @@
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
settings.sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
{ name = "path"; }
|
||||
{ name = "buffer"; }
|
||||
{name = "nvim_lsp";}
|
||||
{name = "path";}
|
||||
{name = "buffer";}
|
||||
];
|
||||
settings.mapping = {
|
||||
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
|
||||
@ -157,8 +153,6 @@
|
||||
lua_ls.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
@ -2,9 +2,7 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
home.sessionVariables = {
|
||||
FLAKE = "/home/julian/.dotfiles";
|
||||
};
|
||||
@ -14,5 +12,5 @@
|
||||
"hs" = "nh home switch";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [ nh ];
|
||||
home.packages = with pkgs; [nh];
|
||||
}
|
||||
|
@ -2,13 +2,11 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
# this would need you to config rofi using home-manager
|
||||
# programs.rofi = { enable = true; };
|
||||
|
||||
home.packages = with pkgs; [ rofi ];
|
||||
home.packages = with pkgs; [rofi];
|
||||
|
||||
home.file = {
|
||||
".config/rofi/config.rasi".source = ./config.rasi;
|
||||
|
@ -1,9 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
bat
|
||||
du-dust # Like du tree but better
|
||||
|
@ -2,9 +2,7 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
services.blueman-applet.enable = true;
|
||||
services.nextcloud-client.enable = true;
|
||||
services.nextcloud-client.startInBackground = true;
|
||||
@ -17,7 +15,7 @@
|
||||
enable = true;
|
||||
extensions = [
|
||||
# Tampermonkey
|
||||
{ id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; }
|
||||
{id = "dhdgffkkebhmkfjojejmpbldmpobfkfo";}
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -1,10 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
watchexec # Run command when any file in current dir changes
|
||||
android-tools # adb
|
||||
@ -29,7 +23,8 @@
|
||||
julia-bin
|
||||
(texlive.combine {
|
||||
# for rendering latex in inkscape
|
||||
inherit (texlive)
|
||||
inherit
|
||||
(texlive)
|
||||
scheme-medium
|
||||
standalone
|
||||
amsmath
|
||||
|
@ -7,8 +7,7 @@
|
||||
misc.assume_yes = true;
|
||||
misc.no_retry = true;
|
||||
|
||||
pre_commands."Update flake" =
|
||||
"git -C /home/julian/.dotfiles checkout origin/flake-updates -- flake.lock";
|
||||
pre_commands."Update flake" = "git -C /home/julian/.dotfiles checkout origin/flake-updates -- flake.lock";
|
||||
|
||||
linux.nix_arguments = "--flake /home/julian/.dotfiles";
|
||||
linux.home_manager_arguments = [
|
||||
|
@ -3,9 +3,7 @@
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
programs.wezterm = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
|
@ -2,8 +2,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
programs.zoxide.enable = true;
|
||||
programs.zoxide.enableFishIntegration = true;
|
||||
|
||||
@ -36,29 +35,29 @@
|
||||
manager.prepend_keymap = [
|
||||
# Override defaults
|
||||
{
|
||||
on = [ "e" ];
|
||||
on = ["e"];
|
||||
run = ''shell --orphan --confirm "pcmanfm &"'';
|
||||
desc = "Open gui file manager";
|
||||
}
|
||||
{
|
||||
on = [ "<C-o>" ];
|
||||
on = ["<C-o>"];
|
||||
run = ''shell "$SHELL" --block --confirm'';
|
||||
desc = "Open shell here";
|
||||
}
|
||||
{
|
||||
on = [ "<C-n>" ];
|
||||
on = ["<C-n>"];
|
||||
run = ''shell 'dragon -x -i -T "$1"' --confirm'';
|
||||
desc = "Dragndrop via dragon";
|
||||
}
|
||||
{
|
||||
on = [ "<Enter>" ];
|
||||
on = ["<Enter>"];
|
||||
run = "plugin --sync smart-enter";
|
||||
desc = "Enter the child directory, or open the file";
|
||||
}
|
||||
];
|
||||
input.prepend_keymap = [
|
||||
{
|
||||
on = [ "<Esc>" ];
|
||||
on = ["<Esc>"];
|
||||
run = "close";
|
||||
desc = "Cancel input";
|
||||
}
|
||||
|
@ -2,13 +2,12 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
home.file = {
|
||||
".config/starship.toml".source = ./starship.toml;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [ starship ];
|
||||
home.packages = with pkgs; [starship];
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
@ -28,14 +27,14 @@
|
||||
enable = true;
|
||||
plugins = [
|
||||
# list of plugins: https://github.com/unixorn/awesome-zsh-plugins
|
||||
{ name = "agkozak/zsh-z"; }
|
||||
{name = "agkozak/zsh-z";}
|
||||
{
|
||||
name = "zsh-users/zsh-completions";
|
||||
}
|
||||
|
||||
# make it behave like fish
|
||||
{ name = "zsh-users/zsh-autosuggestions"; }
|
||||
{ name = "zsh-users/zsh-history-substring-search"; }
|
||||
{name = "zsh-users/zsh-autosuggestions";}
|
||||
{name = "zsh-users/zsh-history-substring-search";}
|
||||
{
|
||||
name = "zsh-users/zsh-syntax-highlighting";
|
||||
} # must be last sourced plugin
|
||||
|
@ -5,13 +5,14 @@
|
||||
config,
|
||||
outputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
../features/fonts
|
||||
# ../features/cli
|
||||
# ../features/helix
|
||||
] ++ (builtins.attrValues outputs.homeManagerModules);
|
||||
}: {
|
||||
imports =
|
||||
[
|
||||
../features/fonts
|
||||
# ../features/cli
|
||||
# ../features/helix
|
||||
]
|
||||
++ (builtins.attrValues outputs.homeManagerModules);
|
||||
|
||||
nix = {
|
||||
package = lib.mkDefault pkgs.nix;
|
||||
@ -39,7 +40,7 @@
|
||||
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||
stateVersion = lib.mkDefault "23.11";
|
||||
|
||||
sessionPath = [ "$HOME/.local/bin" ];
|
||||
sessionPath = ["$HOME/.local/bin"];
|
||||
};
|
||||
|
||||
# TODO: colorscheme
|
||||
@ -51,5 +52,4 @@
|
||||
# home.file = {
|
||||
# ".colorscheme.json".text = builtins.toJSON config.colorscheme;
|
||||
# };
|
||||
|
||||
}
|
||||
|
@ -6,9 +6,11 @@
|
||||
# inherit pkgs;
|
||||
# inherit lib;
|
||||
# };
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
package-names = with pkgs; {
|
||||
"x-scheme-handler/tg" = telegram-desktop;
|
||||
"x-scheme-handler/mailto" = thunderbird;
|
||||
@ -40,6 +42,7 @@ let
|
||||
"inode/directory" = pcmanfm;
|
||||
};
|
||||
in
|
||||
lib.mapAttrs (mimeType: package: [
|
||||
"${package}/share/applications/${package.pname}.desktop"
|
||||
]) package-names
|
||||
lib.mapAttrs (mimeType: package: [
|
||||
"${package}/share/applications/${package.pname}.desktop"
|
||||
])
|
||||
package-names
|
||||
|
@ -1,9 +1,5 @@
|
||||
# Only apply this to home-manager standalone
|
||||
{
|
||||
outputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{outputs, ...}: {
|
||||
# Apply overlays
|
||||
nixpkgs = {
|
||||
overlays = builtins.attrValues outputs.overlays;
|
||||
@ -43,6 +39,5 @@
|
||||
];
|
||||
|
||||
# nix.settings. # warn-dirty = false; # TODO: do I want this
|
||||
|
||||
};
|
||||
}
|
||||
|
@ -17,11 +17,9 @@
|
||||
./features/suites/cli
|
||||
./features/suites/desktop
|
||||
./features/suites/development
|
||||
|
||||
];
|
||||
|
||||
hostName = "kardorf";
|
||||
is-nixos = true;
|
||||
terminal = "kitty";
|
||||
|
||||
}
|
||||
|
@ -1,8 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./global
|
||||
|
||||
@ -34,8 +30,7 @@
|
||||
|
||||
# Autostart link
|
||||
home.file = {
|
||||
".config/autostart/sheet-organizer.desktop".source =
|
||||
"${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
|
||||
".config/autostart/sheet-organizer.desktop".source = "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
|
||||
".config/sheet-organizer/config.toml".text = ''
|
||||
working_directory = "/home/julian/Klavier"
|
||||
'';
|
||||
|
@ -2,8 +2,7 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
../global
|
||||
|
||||
@ -21,9 +20,9 @@
|
||||
# terminal = "kitty";
|
||||
|
||||
home.packages =
|
||||
lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; })
|
||||
[
|
||||
./fonts.nix
|
||||
./packages.nix
|
||||
];
|
||||
lib.lists.concatMap (packages-list-file: import packages-list-file {inherit pkgs;})
|
||||
[
|
||||
./fonts.nix
|
||||
./packages.nix
|
||||
];
|
||||
}
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
with pkgs;
|
||||
[
|
||||
{pkgs, ...}:
|
||||
with pkgs; [
|
||||
nerd-fonts.fira-code
|
||||
font-awesome
|
||||
dejavu_fonts
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
with pkgs;
|
||||
[
|
||||
{pkgs, ...}:
|
||||
with pkgs; [
|
||||
# Rust setup
|
||||
rustc
|
||||
rustfmt
|
||||
|
Reference in New Issue
Block a user