added more stuff
This commit is contained in:
fwastring
parent
369cfc5d52
commit
6eacd76d61
13 changed files with 237 additions and 60 deletions
|
|
@ -15,11 +15,6 @@
|
|||
frame_color = "#eceff1";
|
||||
corner_radius = 10;
|
||||
};
|
||||
# urgency_normal = {
|
||||
# background = "#181818";
|
||||
# foreground = "#dfdfdf";
|
||||
# timeout = 10;
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ in
|
|||
lg = "lazygit";
|
||||
ka = "kubectl apply -f";
|
||||
t = "timew";
|
||||
a = "nix develop; opencode";
|
||||
todo = "jira issue list -a 'Fredrik Wastring' -s ~Done -s ~Closed -s ~Released --plain";
|
||||
cam = "jira issue create && jira issue assign && jira issue move";
|
||||
e = "kubectx";
|
||||
|
|
@ -104,7 +105,7 @@ in
|
|||
set -e GOROOT
|
||||
set -x -U GOPATH $HOME/.go
|
||||
gh completion -s fish > ~/.config/fish/completions/gh.fish
|
||||
set -gx PATH $PATH $HOME/.krew/bin
|
||||
set -gx PATH $PATH $HOME/scripts
|
||||
|
||||
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -38,6 +38,46 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
xdg.configFile."bongocat/bongocat.conf".text = ''
|
||||
# Position & Size
|
||||
cat_height=80
|
||||
cat_align=center
|
||||
cat_x_offset=-500
|
||||
cat_y_offset=-15
|
||||
|
||||
# Appearance
|
||||
enable_antialiasing=1
|
||||
overlay_height=80
|
||||
overlay_opacity=0
|
||||
overlay_position=top
|
||||
# mirror_x=0
|
||||
# mirror_y=0
|
||||
|
||||
# Input device (run bongocat-find-devices to find yours)
|
||||
keyboard_device=/dev/input/event10
|
||||
|
||||
# Multi-monitor (optional - auto-detects by default)
|
||||
# monitor=eDP-1
|
||||
|
||||
# Sleep mode (optional)
|
||||
# idle_sleep_timeout=300
|
||||
# enable_scheduled_sleep=0
|
||||
# sleep_begin=22:00
|
||||
# sleep_end=06:00
|
||||
'';
|
||||
systemd.user.services.bongocat = {
|
||||
Unit = {
|
||||
Description = "BongoCat watcher";
|
||||
After = [ "graphical-session.target" ];
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.wayland-bongocat}/bin/bongocat --watch-config -c %h/.config/bongocat/bongocat.conf";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
Install = { WantedBy = [ "graphical-session.target" ]; };
|
||||
};
|
||||
|
||||
|
||||
home.username = "fw";
|
||||
home.homeDirectory = "/home/fw";
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
# GUI
|
||||
feishin
|
||||
vscode
|
||||
signal-desktop
|
||||
thunderbird
|
||||
discord
|
||||
|
|
@ -68,16 +69,14 @@
|
|||
ipcalc
|
||||
vial
|
||||
via
|
||||
remmina
|
||||
brightnessctl
|
||||
speedcrunch
|
||||
trilium-desktop
|
||||
libreoffice
|
||||
|
||||
gnumake
|
||||
remmina
|
||||
brightnessctl
|
||||
speedcrunch
|
||||
wayland-bongocat
|
||||
opencode
|
||||
|
||||
dbeaver-bin
|
||||
(
|
||||
(
|
||||
let
|
||||
base = pkgs.appimageTools.defaultFhsEnvArgs;
|
||||
in
|
||||
|
|
@ -96,7 +95,7 @@
|
|||
++ (with pkgs; [
|
||||
pkg-config
|
||||
ncurses
|
||||
icu
|
||||
icu
|
||||
# Feel free to add more packages here if needed.
|
||||
]);
|
||||
profile = "export FHS=1";
|
||||
|
|
@ -106,12 +105,8 @@
|
|||
)
|
||||
)
|
||||
|
||||
# ansible
|
||||
# freecad-wayland
|
||||
|
||||
# TUI
|
||||
codex
|
||||
gemini-cli
|
||||
|
||||
# Browsers
|
||||
librewolf
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ with lib;
|
|||
"$mod, u, focusurgentorlast"
|
||||
"$mod, tab, focuscurrentorlast"
|
||||
"$mod, f, fullscreen"
|
||||
"$mod, b, exec, pkill -USR1 waybar"
|
||||
"$mod, b, exec, pkill -USR1 waybar && pkill -USR1 bongocat"
|
||||
|
||||
# Screen resize
|
||||
"$mod CTRL, h, resizeactive, -20 0"
|
||||
|
|
@ -306,19 +306,6 @@ with lib;
|
|||
"$mod, mouse:273, resizewindow"
|
||||
];
|
||||
|
||||
windowrulev2 = [
|
||||
"float, class:^(org.pulseaudio.pavucontrol)$"
|
||||
"size 500 400, class:^(org.pulseaudio.pavucontrol)"
|
||||
"move onscreen cursor -250 10, class:^(org.pulseaudio.pavucontrol)"
|
||||
"float, title:^(Bluetooth Devices)$"
|
||||
"size 500 400, title:^(Bluetooth Devices)"
|
||||
"move onscreen cursor -250 10, title:^(Bluetooth Devices)"
|
||||
|
||||
"float, class:^(.playerctl-gtk-wrapped)$"
|
||||
"size 300 50, class:^(.playerctl-gtk-wrapped)"
|
||||
"move onscreen cursor -150 30, class:^(.playerctl-gtk-wrapped)"
|
||||
];
|
||||
|
||||
env = [
|
||||
"NIXOS_OZONE_WL,1"
|
||||
"_JAVA_AWT_WM_NONREPARENTING,1"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
psesPkg = inputs.powershell-es.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
|
|
@ -331,6 +332,25 @@ with lib;
|
|||
jsonls.enable = true;
|
||||
ts_ls.enable = true;
|
||||
helm_ls.enable = true;
|
||||
ansiblels = {
|
||||
enable = true;
|
||||
package = pkgs.vscode-extensions.redhat.ansible;
|
||||
};
|
||||
jinja_lsp = {
|
||||
enable = true;
|
||||
package = pkgs.jinja-lsp;
|
||||
filetypes = [
|
||||
"j2"
|
||||
"jinja"
|
||||
];
|
||||
};
|
||||
powershell_es = {
|
||||
enable = true;
|
||||
package = psesPkg;
|
||||
extraOptions = {
|
||||
bundle_path = "${psesPkg}/share/powershell/Modules";
|
||||
};
|
||||
};
|
||||
|
||||
nginx_language_server.enable = config.nixvim.lsp_jobb;
|
||||
dockerls.enable = config.nixvim.lsp_jobb;
|
||||
|
|
|
|||
52
moduler/services/filebrowser/default.nix
Normal file
52
moduler/services/filebrowser/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
filebrowser = {
|
||||
enable = mkEnableOption "enables filebrowser";
|
||||
port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 8887;
|
||||
description = "The port filebrowser listens on.";
|
||||
};
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
defaultText = literalExpression "127.0.0.1";
|
||||
description = "The hostname that filebrowser binds to";
|
||||
};
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
defaultText = literalExpression "files.wastring.com";
|
||||
description = "The hostname that filebrowser binds to";
|
||||
};
|
||||
};
|
||||
};
|
||||
config = mkMerge [
|
||||
(mkIf config.filebrowser.enable {
|
||||
|
||||
services.filebrowser = {
|
||||
enable = true;
|
||||
settings = {
|
||||
address = config.filebrowser.host;
|
||||
port = config.filebrowser.port;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${config.filebrowser.domain} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${toString config.filebrowser.host}:${toString config.filebrowser.port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
}
|
||||
|
|
@ -4,35 +4,39 @@
|
|||
enable = true;
|
||||
mouse = true;
|
||||
prefix = "C-a";
|
||||
terminal = "st";
|
||||
terminal = "tmux-256color";
|
||||
keyMode = "vi";
|
||||
escapeTime = 0;
|
||||
baseIndex = 1;
|
||||
baseIndex = 1;
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.sensible
|
||||
tmuxPlugins.pain-control
|
||||
{ plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; }
|
||||
tmuxPlugins.session-wizard
|
||||
tmuxPlugins.logging
|
||||
tmuxPlugins.resurrect
|
||||
tmuxPlugins.continuum
|
||||
tmuxPlugins.open
|
||||
{ plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; }
|
||||
];
|
||||
extraConfig = ''
|
||||
set -g set-clipboard on
|
||||
set -g set-clipboard on
|
||||
|
||||
set -g base-index 1
|
||||
set-window-option -g pane-base-index 1
|
||||
set -g base-index 1
|
||||
set-window-option -g pane-base-index 1
|
||||
|
||||
set-window-option -g mode-keys vi
|
||||
set-window-option -g mode-keys vi
|
||||
|
||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
||||
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard"
|
||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
||||
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard"
|
||||
|
||||
set -g default-terminal "st-256color"
|
||||
set -g terminal-overrides "st-256color"
|
||||
# set -g default-terminal "xterm-kitty"
|
||||
# set -g terminal-overrides "xterm-kitty"
|
||||
set -g @continuum-restore 'on'
|
||||
|
||||
set -g default-terminal "tmux-256color"
|
||||
set -ga terminal-overrides ",xterm-256color:Tc"
|
||||
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
|
||||
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'
|
||||
|
||||
set -ga terminal-overrides ",xterm-256color:Tc"
|
||||
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
|
||||
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue