aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/conky/default.nix76
-rw-r--r--home/conky/main.lua45
-rw-r--r--home/default.nix5
-rw-r--r--home/firefox.nix (renamed from home/firefox/default.nix)0
-rw-r--r--home/helix/default.nix156
-rw-r--r--home/lf.nix40
-rw-r--r--roles/shared.nix2
7 files changed, 3 insertions, 321 deletions
diff --git a/home/conky/default.nix b/home/conky/default.nix
deleted file mode 100644
index 1fc628e..0000000
--- a/home/conky/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- config,
- pkgs-unstable,
- lib,
- ...
-}:
-let
- luaMain = builtins.readFile ./main.lua;
-in
-{
- services.conky = {
- enable = true;
- package =
- (pkgs-unstable.conky.override {
- curlSupport = true;
- journalSupport = true;
- luaCairoSupport = true;
- luaSupport = true;
- pulseSupport = true;
- waylandSupport = true;
- x11Support = true;
- }).overrideAttrs
- (old: {
- buildInputs = old.buildInputs ++ [
- pkgs-unstable.cairo
- pkgs-unstable.wayland
- pkgs-unstable.libGL
- pkgs-unstable.expat
- pkgs-unstable.xorg.libXfixes
- ];
- });
-
- # https://conky.cc/config_settings
- extraConfig = ''
- conky.config = {
- -- wayland
- out_to_wayland = false,
- out_to_x = true,
- own_window_class = 'conky',
- own_window_type ='override',
- own_window = true,
- own_window_transparent = true,
- own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager',
- double_buffer = true,
-
- alignment = "top_right",
- gap_x = 60,
- gap_y = 60,
- minimum_width = 400,
- minimum_height = 200,
- maximum_width = 400,
-
- -- Colors and fonts
- draw_shades = false,
- draw_outline = false,
- draw_borders = false,
- default_color = "white",
- default_shade_color = "black",
- default_outline_color = "black",
- color1 = "lightblue",
-
- -- Text
- use_xft = yes,
- font = "Liberation Mono:size=10",
- uppercase = false,
-
- -- Lua configuration
- lua_load = '${config.home.homeDirectory}/.config/conky/main.lua',
- lua_draw_hook_post = "conky_main"
- };
-
- conky.text = [[ ]]
- '';
- };
- xdg.configFile."conky/main.lua".text = luaMain;
-}
diff --git a/home/conky/main.lua b/home/conky/main.lua
deleted file mode 100644
index 04eac69..0000000
--- a/home/conky/main.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-require("cairo")
-require("cairo_xlib")
-
-function conky_main()
- if conky_window == nil then
- print("No window")
- return
- end
-
- local cairo_surface = cairo_xlib_surface_create(
- conky_window.display,
- conky_window.drawable,
- conky_window.visual,
- conky_window.width,
- conky_window.height
- )
- local c = cairo_create(cairo_surface)
-
- cairo_select_font_face(c, "Liberation Mono", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
- cairo_set_font_size(c, 12)
- cairo_set_source_rgba(c, 1, 1, 1, 1)
- cairo_move_to(c, 100, 100)
- cairo_show_text(c, "hello world")
- cairo_stroke(c)
-
- -- Settings.
- local line_width = 5
- local top_left_x = 20
- local top_left_y = 20
- local rec_width = 100
- local rec_height = 50
- local red = 1
- local green = 0
- local blue = 0
- local alpha = 1
-
- -- Draw it.
- cairo_set_line_width(c, line_width)
- cairo_rectangle(c, top_left_x, top_left_y, rec_width, rec_height)
- cairo_set_source_rgba(c, red, green, blue, alpha)
-
- cairo_destroy(c)
- cairo_surface_destroy(cairo_surface)
- print("Draw")
-end
diff --git a/home/default.nix b/home/default.nix
index 7254058..ebf4956 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -13,9 +13,6 @@ let
in
{
imports = [
- # ./conky
- # ./helix
- # ./lf
# ./quickshell
(import ./nvim { inherit unstable; })
./cargo.nix
@@ -23,7 +20,7 @@ in
./dav
./dunst.nix
./fastfetch.nix
- ./firefox
+ ./firefox.nix
./fish.nix
./git.nix
./hyprland.nix
diff --git a/home/firefox/default.nix b/home/firefox.nix
index 228843c..228843c 100644
--- a/home/firefox/default.nix
+++ b/home/firefox.nix
diff --git a/home/helix/default.nix b/home/helix/default.nix
deleted file mode 100644
index 37c8529..0000000
--- a/home/helix/default.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ inputs, pkgs, ... }:
-{
- programs.helix = {
- extraPackages = [ ];
- enable = true;
- defaultEditor = false;
- settings = {
- theme = "catppuccin_mocha";
- editor = {
- auto-format = true;
- auto-pairs = false;
- bufferline = "multiple";
- color-modes = true;
- completion-replace = true;
- completion-trigger-len = 1;
- cursorline = true;
- indent-guides.render = true;
- soft-wrap.enable = true;
- statusline.center = [ "position-percentage" ];
- true-color = true;
- whitespace = {
- render = "all";
- characters = {
- newline = "↴";
- tab = "⇥";
- };
- };
- };
- keys.normal.space.u = {
- f = ":format"; # format using LSP formatter
- w = ":set whitespace.render all";
- W = ":set whitespace.render none";
- };
- editor.cursor-shape = {
- insert = "bar";
- normal = "block";
- select = "underline";
- };
- editor.lsp = {
- display-messages = true;
- display-inlay-hints = true;
- display-signature-help-docs = true;
- };
- };
- languages = {
- language-server = {
- vale-ls = {
- command = "${pkgs.vale-ls}/bin/vale-ls";
- };
- rust-analyzer = {
- config = {
- checkOnSave = {
- command = "${pkgs.clippy}/bin/clippy";
- };
- cargo = {
- allFeatures = true;
- };
- };
- };
- biome = {
- command = "${pkgs.biome}/bin/biome";
- args = [ "lsp-proxy" ];
- };
- ruff = {
- command = "${pkgs.ruff}/bin/ruff";
- args = [
- "server"
- "--preview"
- "--isolated"
- ];
- };
- pyright = {
- command = "${pkgs.pyright}/bin/pyright-langserver";
- args = [ "--stdio" ];
- };
- };
- language = [
- {
- name = "asciidoc";
- language-servers = [ "vale-ls" ];
- scope = "source.adoc";
- file-types = [ "adoc" ];
- grammar = "asciidoc";
- }
- {
- name = "rust";
- auto-format = true;
- }
- {
- name = "python";
- language-servers = [
- "ruff"
- "pyright"
- ];
- auto-format = true;
- }
- {
- name = "latex";
- language-servers = [
- "texlab"
- "vale-ls"
- ];
- auto-format = true;
- formatter = {
- command = "${pkgs.tex-fmt}/bin/tex-fmt";
- args = [
- "--stdin"
- "--keep"
- ];
- };
- }
- {
- name = "nix";
- auto-format = true;
- formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
- }
- {
- name = "markdown";
- auto-format = true;
- formatter = {
- command = "${pkgs.dprint}/bin/dprint";
- args = [
- "fmt"
- "--stdin"
- "md"
- ];
- };
- language-servers = [
- "vale-ls"
- "marksman"
- ];
- }
- {
- name = "toml";
- auto-format = true;
- }
- {
- name = "javascript";
- language-servers = [
- {
- name = "typescript-language-server";
- except-features = [ "format" ];
- }
- "biome"
- ];
- auto-format = true;
- }
- {
- name = "json";
- language-servers = [ "biome" ];
- auto-format = true;
- }
- ];
- };
- };
-}
diff --git a/home/lf.nix b/home/lf.nix
deleted file mode 100644
index 4923fcb..0000000
--- a/home/lf.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-{
- programs.lf = {
- enable = true;
- commands = {
- editor-open = ''$$EDITOR $f'';
- };
- settings = {
- preview = true;
- hidden = true;
- drawbox = true;
- icons = true;
- ignorecase = true;
- timefmt = "2006-01-02T15:04:05.999Z";
- };
- previewer.source = "/home/petri/.config/lf/pv.sh";
- keybindings = {
- ee = "editor-open";
- };
- };
-
- xdg.configFile."/home/petri/.config/lf/icons".source = ./icons;
- xdg.configFile."/home/petri/.config/lf/pv.sh" = {
- executable = true;
- source = pkgs.writeShellScript "pv" ''
- case "$1" in
- *.jpg*) timg -I "$1";;
- *.png*) timg -I "$1";;
- *.webp*) timg -I "$1";;
- *.avif*) timg -I "$1";;
- *.tar*) tar tf "$1";;
- *.zip) unzip -l "$1";;
- *.rar) unrar l "$1";;
- *.7z) 7z l "$1";;
- *.pdf) pdftotext "$1" -;;
- *) pistol "$1";;
- esac
- '';
- };
-}
diff --git a/roles/shared.nix b/roles/shared.nix
index 7e4a5eb..3169d58 100644
--- a/roles/shared.nix
+++ b/roles/shared.nix
@@ -378,6 +378,7 @@
"umask=0007"
"uid=1000"
"use_cache=1"
+ "max_stat_cache_size=20000"
"use_path_request_style"
"url=https://s3.tammi.cc"
"passwd_file=${config.age.secrets.s3fs.path}"
@@ -395,6 +396,7 @@
"umask=0007"
"uid=1000"
"use_cache=1"
+ "max_stat_cache_size=20000"
"use_path_request_style"
"url=https://s3.tammi.cc"
"passwd_file=${config.age.secrets.s3fs.path}"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-29 09:45:35 +0000