Compare commits

..

9 Commits

Author SHA1 Message Date
mandlm 171e5b2464
feat: add zoxide 2023-12-11 20:05:05 +01:00
mandlm 19620b549b
feat: add nushell 2023-12-11 20:04:57 +01:00
mandlm 36d1bb4252
feat: use carapace for completion 2023-12-11 08:14:36 +01:00
mandlm deaeb9d3b3
chore: nix flake update 2023-12-11 07:40:55 +01:00
mandlm 78eed10369
feat: install gthumb 2023-12-11 07:39:52 +01:00
mandlm 5bf65163a6
feat: add cargo-bin to path 2023-12-11 07:39:52 +01:00
mandlm ad6f261bca
feat: configure swaylock-fancy 2023-12-11 07:39:52 +01:00
mandlm bbd480f511
feat: make zoom windows floating 2023-12-11 07:39:52 +01:00
mandlm bc480b218a
chore: update to nixos 23.11 2023-12-11 07:39:52 +01:00
11 changed files with 96 additions and 14 deletions

View File

@ -54,7 +54,7 @@
keyMap = "de-latin1-nodeadkeys";
};
fonts.fonts = with pkgs; [
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "DejaVuSansMono" "NerdFontsSymbolsOnly" ]; })
dejavu_fonts
fira-code
@ -92,6 +92,15 @@
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-wlr
pkgs.xdg-desktop-portal-gtk
];
config = {
common = {
default = [ "wlr" "gtk" ];
};
};
};
services.udev.packages = [ pkgs.yubikey-personalization ];

View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1700814205,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"lastModified": 1702195709,
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1701263465,
"narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
"lastModified": 1701952659,
"narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
"rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github"
},
"original": {
@ -39,11 +39,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1701068326,
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
"lastModified": 1702151865,
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"type": "github"
},
"original": {

View File

@ -0,0 +1,9 @@
{ config, lib, pkgs, user, theme, ... }:
{
programs.carapace = {
enable = true;
enableZshIntegration = true;
enableNushellIntegration = true;
};
}

View File

@ -5,6 +5,7 @@
direnv = {
enable = true;
enableZshIntegration = true;
enableNushellIntegration = true;
nix-direnv.enable = true;
};
};

View File

@ -86,6 +86,7 @@ local servers = {
},
},
["marksman"] = {},
["nushell"] = {},
["pylsp"] = {
pylsp = {
plugins = {

38
home-manager/nushell.nix Normal file
View File

@ -0,0 +1,38 @@
{ config, lib, pkgs, user, theme, ... }:
{
programs.nushell = {
enable = true;
extraConfig = ''
let carapace_completer = {|spans|
carapace $spans.0 nushell $spans | from json
}
$env.config = {
show_banner: false,
completions: {
case_sensitive: false # case-sensitive completions
quick: true # set to false to prevent auto-selecting completions
partial: true # set to false to prevent partial filling of the prompt
algorithm: "fuzzy" # prefix or fuzzy
external: {
# set to false to prevent nushell looking into $env.PATH to find more suggestions
enable: true
# set to lower can improve completion performance at the cost of omitting some options
max_results: 100
completer: $carapace_completer # check 'carapace_completer'
}
}
}
$env.PATH = ($env.PATH |
split row (char esep) |
prepend /home/myuser/.apps |
append /usr/bin/env
)
'';
shellAliases = {
vi = "hx";
vim = "hx";
nano = "hx";
};
};
}

View File

@ -13,7 +13,6 @@ in
home.packages = with pkgs; [
xdg-utils
swaylock-fancy
shotman
wl-clipboard
];
@ -33,6 +32,11 @@ in
};
};
programs.swaylock = {
enable = true;
package = pkgs.swaylock-fancy;
};
home.pointerCursor = {
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
@ -78,12 +82,15 @@ in
"*" = {
hide_cursor = "5000";
};
};
defaultWorkspace = "1";
focus.newWindow = "urgent";
floating.criteria = [{ app_id = "zoom"; floating = true; }];
fonts = {
names = [ font.name ];
size = font.size;

10
home-manager/zoxide.nix Normal file
View File

@ -0,0 +1,10 @@
{ config, lib, pkgs, user, theme, ... }:
{
programs.zoxide = {
enable = true;
enableNushellIntegration = true;
enableZshIntegration = true;
};
}

View File

@ -5,8 +5,8 @@ in
{
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
# enableAutosuggestions = true;
# enableCompletion = true;
history.size = 10000;
initExtra = ''

View File

@ -4,6 +4,9 @@
home = {
username = "${user}";
homeDirectory = "/home/${user}";
sessionPath = [
"$HOME/.cargo/bin/"
];
packages = with pkgs; [
unstable.eza
@ -30,6 +33,7 @@
gnome.simple-scan
calibre
libreoffice
gthumb
];
stateVersion = "22.05";
@ -43,10 +47,13 @@
./home-manager/kitty.nix
./home-manager/neovim
./home-manager/gpg
./home-manager/carapace.nix
./home-manager/zsh.nix
./home-manager/nushell.nix
./home-manager/starship.nix
./home-manager/sway
./home-manager/direnv.nix
./home-manager/bat.nix
./home-manager/zoxide.nix
];
}

View File

@ -8,7 +8,7 @@
isNormalUser = true;
uid = 1000;
home = "/home/mandlm";
shell = pkgs.zsh;
shell = pkgs.nushell;
extraGroups = [ "wheel" "networkmanager" "audio" "video" "input" "docker" "scanner" "lp" ];
hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];