emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adding filen, fixing up emacs and lsps

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-18 13:01:44 -05:00
parent 61ef5654ee
commit b8c6aa3ec0
17 changed files with 229 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739844449, "lastModified": 1739895788,
"narHash": "sha256-NtddqudRBSTT1FTkBKEo+CRhZjSwRvimyeAxoRcXTKo=", "narHash": "sha256-il5UJ8RpJA7DeeeguiBxQnDPGpRnqPJvQR5JS76pEH4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "53b218d3d3d187724e86b2a63ce9a960d005faac", "rev": "d3b44edf424120461ea2c3e4f0db3857d19fa21d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,11 +712,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1739824279, "lastModified": 1739876011,
"narHash": "sha256-373u7+WYbKZDZ6gerTcXjdcqR0bR33nRfOU5XcY/MBY=", "narHash": "sha256-dER5F0i3gkEamO8WKHYO8JbTQZUY5PFmj9Vyl+gj8zI=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "fad7cbe279fb9a550896de1179982ce2d4734e5c", "rev": "da9eb08bcff07dafcd1d563d89c43ab00ba5d07e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739820990, "lastModified": 1739872242,
"narHash": "sha256-v+MmVqFyjzL9xzyRzfX+1qMIGgoHcW73P9b8RrM922k=", "narHash": "sha256-rk9yKCwmOrezXbRN/lqQsQxu/Wuv8HFKTs5RiDK9GUU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "44c9797844ca7ce8a708d5034f1259ce3fc6bd2a", "rev": "ad49e5820a857dea88cfb26ef71d56ffe88ca91d",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -83,7 +83,8 @@
home-manager, home-manager,
self, self,
... ...
}@inputs: } @inputs:
let let
inherit (nixpkgs.lib) genAttrs replaceStrings; inherit (nixpkgs.lib) genAttrs replaceStrings;
inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive; inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive;

5
homes/emenel/default.nix
View file

@ -111,10 +111,6 @@
enable = true; enable = true;
package = pkgs.playerctl; package = pkgs.playerctl;
}; };
syncthing = {
enable = true;
# tray.enable = true;
};
borgmatic = { borgmatic = {
enable = true; enable = true;
}; };
@ -137,6 +133,7 @@
MOZ_ENABLE_WAYLAND = 1; MOZ_ENABLE_WAYLAND = 1;
XCURSOR_SIZE = 32; XCURSOR_SIZE = 32;
XCURSOR_THEME = "Bibata-Modern-Classic"; XCURSOR_THEME = "Bibata-Modern-Classic";
DISPLAY = ":0";
}; };
}; };

2
homes/emenel/dotfiles/dot_config/isd_tui/config.yaml Normal file
View file

@ -0,0 +1,2 @@
cache_input: False
editor: "auto"

3
homes/emenel/dotfiles/dot_local/bin/dim-all-monitors
View file

@ -1,2 +1,3 @@
#!/bin/sh #!/bin/sh
brillo -e -O && brillo -e -u 150000 -S 15 brillo -e -O
brillo -e -u 150000 -S 15

2
homes/emenel/dotfiles/dot_local/bin/lock-power-off-monitors
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
brillo -e -O && niri msg action power-off-monitors niri msg action power-off-monitors

2
homes/emenel/dotfiles/dot_local/bin/lock-suspend
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
brillo -e -O && systemctl suspend systemctl suspend

2
homes/emenel/dotfiles/dot_local/bin/on-unlock
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
shikanectl reload && brillo -e -u 150000 -I brillo -e -u 15000 -I

2
homes/emenel/dotfiles/dot_local/bin/session-lock Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
pidof hyprlock || hyprlock

1
hosts/eddie/configuration.nix
View file

@ -442,6 +442,7 @@
iosevka iosevka
spleen spleen
fira-code-symbols fira-code-symbols
blackout
powerline-fonts powerline-fonts
noto-fonts-color-emoji noto-fonts-color-emoji
noto-fonts noto-fonts

10
modules/home/desktop.nix
View file

@ -1,8 +1,13 @@
{ pkgs, nix-config, ... }: { pkgs, nix-config, lib, ... }:
{ {
home.packages = with pkgs; [ home.packages = lib.mkMerge [
(with nix-config.packages.x86_64-linux; [
filen-desktop
])
(with pkgs; [
appimage-run appimage-run
libappimage libappimage
transmission_4-gtk transmission_4-gtk
@ -116,6 +121,7 @@
wineWowPackages.stagingFull wineWowPackages.stagingFull
winetricks winetricks
])
]; ];
home.pointerCursor = { home.pointerCursor = {

5
modules/home/emacs.nix
View file

@ -9,8 +9,9 @@ let
epkgs.geiser-racket epkgs.geiser-racket
epkgs.editorconfig epkgs.editorconfig
epkgs.shfmt epkgs.shfmt
epkgs.nixpkgs-fmt # epkgs.nixpkgs-fmt
epkgs.nixfmt # epkgs.nixfmt
epkgs.apheleia
epkgs.parinfer-rust-mode epkgs.parinfer-rust-mode
epkgs.manualPackages.tree-sitter-langs epkgs.manualPackages.tree-sitter-langs
epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.manualPackages.treesit-grammars.with-all-grammars

4
modules/home/hypridle.nix
View file

@ -5,8 +5,8 @@
package = inputs.hypridle.packages.x86_64-linux.default; package = inputs.hypridle.packages.x86_64-linux.default;
settings = { settings = {
general = { general = {
lock_cmd = "brillo -e -O && pidof hyprlock || hyprlock"; lock_cmd = "/home/emenel/.local/bin/session-lock";
before_sleep_cmd = "brillo -e -O && loginctl lock-session"; before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "/home/emenel/.local/bin/on-unlock"; after_sleep_cmd = "/home/emenel/.local/bin/on-unlock";
ignore_dbus_inhibit = false; ignore_dbus_inhibit = false;
ignore_systemd_inhibit = false; ignore_systemd_inhibit = false;

8
modules/home/niri.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, nix-config, pkgs, ... }:
with pkgs.lib.nix-rice; with pkgs.lib.nix-rice;
let strPalette = palette.toRGBHex pkgs.rice.colorPalette; let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in { in {
@ -11,10 +11,10 @@ in {
prefer-no-csd = true; prefer-no-csd = true;
spawn-at-startup = [ spawn-at-startup = [
{ command = ["maestral_qt"]; }
{ command = ["clipse" "-listen"]; } { command = ["clipse" "-listen"]; }
{ command = ["waybar"]; } { command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" ]; } # { command = ["waybar"]; }
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" "waybar.service" ]; }
]; ];
workspaces = { workspaces = {

38
modules/home/shell-conf.nix
View file

@ -59,8 +59,6 @@
nvd nvd
ripgrep-all ripgrep-all
silver-searcher silver-searcher
maestral
maestral-gui
powertop powertop
age age
kdotool kdotool
@ -68,19 +66,35 @@
caligula caligula
# global node packages yaml-language-server
nodePackages.typescript-language-server typescript-language-server
nodePackages.vscode-langservers-extracted svelte-language-server
nodePackages.prettier bash-language-server
# nodePackages.javascript-typescript-langserver nginx-language-server
nodePackages.stylelint lua-language-server
nodePackages.svelte-language-server lemminx
nodePackages.typescript stylelint-lsp
nodePackages.js-beautify htmx-lsp
autotools-language-server
arduino-language-server
ccls
vscode-langservers-extracted
java-language-server
nix-config.pkgs-stable.javascript-typescript-langserver
haskell-language-server
cmake-language-server
stylelint-lsp
black
jsbeautifier
typescript
prettierd
stylelint
nixd nixd
nixdoc nixdoc
nix-init nix-init
alejandra
git-annex git-annex
bfg-repo-cleaner bfg-repo-cleaner
@ -263,6 +277,8 @@
xdg.configFile."just/justfile".source = ../../homes/emenel/dotfiles/dot_config/just/justfile; xdg.configFile."just/justfile".source = ../../homes/emenel/dotfiles/dot_config/just/justfile;
xdg.configFile."git".source = ../../homes/emenel/dotfiles/dot_config/git; xdg.configFile."git".source = ../../homes/emenel/dotfiles/dot_config/git;
xdg.configFile."rbw".source = ../../homes/emenel/dotfiles/dot_config/rbw; xdg.configFile."rbw".source = ../../homes/emenel/dotfiles/dot_config/rbw;
xdg.configFile."isd_tui/config.yaml".source = ../../homes/emenel/dotfiles/dot_config/isd_tui/config.yaml;
home.file.".config/fish/functions" = { home.file.".config/fish/functions" = {
source = ../../homes/emenel/dotfiles/dot_config/fish/functions; source = ../../homes/emenel/dotfiles/dot_config/fish/functions;
recursive = true; recursive = true;

2
modules/home/waybar.nix
View file

@ -6,7 +6,7 @@ in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar; package = pkgs.waybar;
systemd.enable = false; systemd.enable = true;
style = '' style = ''
* { * {
border: none; border: none;

44
packages/filen-desktop.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, fetchurl
, makeWrapper
, appimageTools
, libappindicator-gtk3
, pkgs
}:
let
pname = "filen-desktop";
version = "latest";
src = pkgs.fetchurl {
url =
"https://cdn.filen.io/@filen/desktop/release/latest/Filen_linux_x86_64.AppImage";
sha256 = "sha256-keaD5PUjkoFrFTCuap4DvmYq5X3Tjnq+njtiLgAZ9W8=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
name = "filendesktop";
# Needed for the tray to function
libPath = lib.makeLibraryPath [ libappindicator-gtk3 ];
in
appimageTools.wrapType2 rec {
inherit pname version src name;
extraInstallCommands = ''
source "${pkgs.makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \
--prefix LD_LIBRARY_PATH : ${libPath}
install -m 444 -D ${appimageContents}/@${name}.desktop $out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=filen-desktop'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "Desktop client for Filen.io";
homepage = "https://filen.io/";
license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" ];
};
}