Compare commits

..

26 Commits

Author SHA1 Message Date
doloro ff1629ad1f fixes and cleaning 2026-05-26 13:48:21 +01:00
doloro b93c1ad6aa meow 2026-05-25 23:34:30 +01:00
doloro a9e3deea08 added: rpi binary cache 2026-05-25 20:59:33 +01:00
doloro e1b14b3e07 find file 2026-05-25 15:18:43 +01:00
doloro 2a8f29f35f meow 2026-05-25 15:17:56 +01:00
doloro b92586122e uid fix 2026-05-25 15:12:20 +01:00
doloro e72f3c8dd9 wrong place 2026-05-25 15:01:42 +01:00
doloro 3b0d0e45e3 added more modules to wsl 2026-05-25 14:58:31 +01:00
doloro ffdf1c7e69 default user 2026-05-25 14:50:52 +01:00
doloro 02c8529c83 wsl errors fixed 2026-05-25 14:44:52 +01:00
doloro d486fa170b wsl changes 2026-05-25 14:34:06 +01:00
doloro 7d3a5ba4fa wsl init 2026-05-22 15:00:59 +01:00
doloro 6c609e2fa6 fix build 2026-05-21 17:51:10 +01:00
doloro 140f47649c commit 2026-05-21 15:55:43 +01:00
doloro 212af403dc replaces rpi flake with a maintained one 2026-05-20 16:01:36 +01:00
doloro 1e8337e380 server: added docker reg 2026-05-20 11:54:03 +01:00
doloro 6b8e08fb7a meow 2026-05-19 21:33:08 +01:00
doloro 1977e912ee fix: hyprland breaking 2026-05-15 13:38:03 +01:00
doloro d53bba8961 qol: omp disabled for now 2026-05-15 13:19:08 +01:00
doloro 93ef68a998 nix flake update 2026-05-15 13:14:21 +01:00
doloro 74cadc4f69 nvim is cool now 2026-05-15 12:55:55 +01:00
doloro 5e83cc9863 changes to nvim, added podman to user 2026-05-15 11:47:23 +01:00
doloro 0545039d39 add: claude code 2026-05-12 14:00:47 +01:00
doloro 15c48c0ed3 nix flake update 2026-05-09 00:59:27 +01:00
doloro 49624c8bd1 commit 2026-05-09 00:30:24 +01:00
doloro 9b9a34f708 kernal pera changes 2026-04-30 11:36:28 +01:00
23 changed files with 1305 additions and 830 deletions
+27 -8
View File
@@ -4,8 +4,7 @@
modules, modules,
inputs, inputs,
... ...
}: }: {
{
den.aspects.doloro-desktop = { den.aspects.doloro-desktop = {
includes = [ includes = [
<den/primary-user> <den/primary-user>
@@ -34,19 +33,28 @@
modules.easyeffects modules.easyeffects
modules.lavd modules.lavd
modules.ai modules.ai
modules.omp
modules.podman
<modules/ai/ollama-cuda> <modules/ai/ollama-cuda>
]; ];
nixos = nixos = {
{ config, pkgs, ... }: config,
{ pkgs,
...
}: {
users.users.doloro = { users.users.doloro = {
shell = pkgs.fish; shell = pkgs.fish;
hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
extraGroups = ["libvirtd"];
}; };
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
}; };
homeManager = homeManager = {
{ home, pkgs, ... }: home,
{ pkgs,
...
}: {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"HDMI-A-1, 1920x1080@60, 0x0, 1" "HDMI-A-1, 1920x1080@60, 0x0, 1"
@@ -73,6 +81,17 @@
deadlock-mod-manager deadlock-mod-manager
gamescope gamescope
android-studio android-studio
blender
];
programs.lutris.enable = true;
nixpkgs.overlays = [
# Skipping tests while upstream sorts it out, revert once
# Hydra consistently builds openldap green.
(final: prev: {
openldap = prev.openldap.overrideAttrs (_: {
doCheck = false;
});
})
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.home-manager.enable = true; programs.home-manager.enable = true;
+10 -8
View File
@@ -6,15 +6,16 @@
__findFile, __findFile,
lib, lib,
... ...
}: }: {
{
den.aspects.desktop = { den.aspects.desktop = {
includes = [ includes = [
modules.nix modules.nix
]; ];
nixos = nixos = {
{ pkgs, config, ... }: pkgs,
{ config,
...
}: {
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.grub.devices = [ boot.loader.grub.devices = [
@@ -45,7 +46,7 @@
enable = true; enable = true;
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = ["nvidia"];
fileSystems."/mnt/2tb" = { fileSystems."/mnt/2tb" = {
device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2"; device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
@@ -62,7 +63,6 @@
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
hardware.nvidia = { hardware.nvidia = {
# Modesetting is required. # Modesetting is required.
modesetting.enable = true; modesetting.enable = true;
@@ -92,7 +92,9 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
boot.binfmt.emulatedSystems = [
"aarch64-linux"
];
}; };
}; };
} }
@@ -21,6 +21,7 @@
modules.stylix modules.stylix
modules.quickshell modules.quickshell
modules.lavd modules.lavd
modules.omp
# modules.podman # modules.podman
# modules.openvivo # modules.openvivo
]; ];
+3 -3
View File
@@ -171,12 +171,12 @@
# "mem_sleep_default=deep" # "mem_sleep_default=deep"
# "i915.fastboot=1" # "i915.fastboot=1"
# "i915.modeset=1" # "i915.modeset=1"
# "ahci.mobile_lpm_policy=1" "ahci.mobile_lpm_policy=1"
# "intel_idle.max_cstate=10" # "intel_idle.max_cstate=10"
"processor.max_cstate=10" "processor.max_cstate=10"
"pci=noaer" "pci=noaer"
# "quiet" "quiet"
# "splash" "splash"
# "idle=halt" # "idle=halt"
]; ];
boot.binfmt.emulatedSystems = [ boot.binfmt.emulatedSystems = [
+34
View File
@@ -0,0 +1,34 @@
{
den,
modules,
__findFile,
...
}: {
den.aspects.doloro-wsl = {
includes = [
<den/primary-user>
den.aspects.doloro-shared
modules.fish
modules.tmux
modules.nix
modules.omp
modules.hyfetch
modules.git
];
nixos = {
config,
pkgs,
...
}: {
users.users.doloro = {
isNormalUser = true;
shell = pkgs.fish;
uid = 1000;
# hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
};
};
homeManager = {...}: {
};
};
}
+22
View File
@@ -0,0 +1,22 @@
{
den,
modules,
...
}: {
flake-file.inputs = {
};
den.aspects.wsl = {
includes = [
modules.wsl
modules.tmux
modules.nix
modules.omp
modules.hyfetch
modules.git
];
nixos = {lib, ...}: {
wsl.enable = true;
wsl.defaultUser = "doloro";
};
};
}
+3 -3
View File
@@ -3,14 +3,14 @@
__findFile, __findFile,
modules, modules,
... ...
}: }: {
{
den.aspects.rpi5 = { den.aspects.rpi5 = {
includes = [ includes = [
<modules/raspberry-pi/5> <modules/raspberry-pi/5>
# <modules/services/traefik> # <modules/services/traefik>
<modules/services/caddy> <modules/services/caddy>
<modules/services/home-assistant> <modules/services/home-assistant>
<modules/services/docker-registry>
<modules/services/ddns> <modules/services/ddns>
]; ];
nixos = { nixos = {
@@ -23,7 +23,7 @@
443 443
8080 8080
]; ];
allowedUDPPortRanges = [ ]; allowedUDPPortRanges = [];
}; };
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
+11 -4
View File
@@ -3,8 +3,7 @@
__findFile, __findFile,
lib, lib,
... ...
}: }: {
{
# Homes # Homes
den.homes.x86_64-linux.doloro-desktop = { den.homes.x86_64-linux.doloro-desktop = {
aspect = "doloro-desktop"; aspect = "doloro-desktop";
@@ -14,6 +13,9 @@
den.homes.aarch64-linux.doloro-laptop = { den.homes.aarch64-linux.doloro-laptop = {
userName = "doloro"; userName = "doloro";
}; };
den.homes.aarch64-linux.doloro-wsl = {
userName = "doloro";
};
# Machines # Machines
den.hosts.x86_64-linux.desktop = { den.hosts.x86_64-linux.desktop = {
users.doloro = { users.doloro = {
@@ -28,13 +30,18 @@
home-manager.enable = true; home-manager.enable = true;
}; };
}; };
den.hosts.aarch64-linux.wsl = {
users.doloro = {
aspect = "doloro-wsl";
home-manager.enable = true;
};
};
den.schema.user.classes = lib.mkDefault [ "homeManager" ]; den.schema.user.classes = lib.mkDefault ["homeManager"];
# Fixes 'The option `flake.homeConfigurations' is defined multiple times while it's expected to be unique.' # Fixes 'The option `flake.homeConfigurations' is defined multiple times while it's expected to be unique.'
flake.options.homeConfigurations = lib.mkOption { flake.options.homeConfigurations = lib.mkOption {
type = lib.types.attrs; type = lib.types.attrs;
description = "Home Manager configurations for users."; description = "Home Manager configurations for users.";
}; };
} }
+4 -1
View File
@@ -13,7 +13,10 @@
homeManager = homeManager =
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.opencode ]; home.packages = [
pkgs.opencode
pkgs.claude-code
];
}; };
}; };
} }
+30
View File
@@ -0,0 +1,30 @@
{
modules,
den,
inputs,
...
}: {
flake-file.inputs = {
omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
};
modules.omp = {
homeManager = {
imports = [inputs.omp-nix.homeManagerModules.omp];
oh-my-pi = {
enable = false;
settings = {
theme = "dark-gruvbox";
symbolPreset = "nerd";
defaultThinkingLevel = "medium";
ask.timeout = 0;
};
skills = {
pdf = "github:anthropics/skills/skills/pdf@b0cbd3df1533b396d281a6886d5132f623393a9c";
frontend-design = "github:anthropics/skills/skills/frontend-design@b0cbd3df1533b396d281a6886d5132f623393a9c";
};
};
};
};
}
+3
View File
@@ -18,6 +18,9 @@
set -g theme_display_user yes set -g theme_display_user yes
set -g fish_color_autosuggestion 6F6578 set -g fish_color_autosuggestion 6F6578
alias nik 'nix' alias nik 'nix'
if not set -q TMUX
set -gx COLORTERM truecolor
end
''; '';
# alias nos 'sudo echo; sudo nixos-rebuild switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json' # alias nos 'sudo echo; sudo nixos-rebuild switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'
# alias hms 'home-manager switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json' # alias hms 'home-manager switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'
+17 -17
View File
@@ -1,14 +1,15 @@
{ modules, ... }: {modules, ...}: {
{
modules.hyprland = { modules.hyprland = {
provides = { provides = {
doloro-settings = { doloro-settings = {
includes = [ includes = [
modules.dunst modules.dunst
]; ];
homeManager = homeManager = {
{ pkgs, home, ... }: pkgs,
{ home,
...
}: {
home.packages = [ home.packages = [
pkgs.hyprcursor pkgs.hyprcursor
pkgs.wlogout pkgs.wlogout
@@ -95,7 +96,7 @@
]; ];
}; };
dwindle = { dwindle = {
pseudotile = true; # pseudotile = true;
preserve_split = true; preserve_split = true;
}; };
# master = { # master = {
@@ -105,10 +106,11 @@
force_default_wallpaper = -1; force_default_wallpaper = -1;
disable_hyprland_logo = false; disable_hyprland_logo = false;
enable_anr_dialog = false; enable_anr_dialog = false;
vfr = true; # vfr = true;
}; };
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
bind = [ bind =
[
( (
let let
config = pkgs.writeTextFile { config = pkgs.writeTextFile {
@@ -129,15 +131,14 @@
script = pkgs.writeShellScript "mreow" '' script = pkgs.writeShellScript "mreow" ''
exec $(tofi-drun -c ${config}) exec $(tofi-drun -c ${config})
''; '';
in in "$mainMod, R, exec, ${script}"
"$mainMod, R, exec, ${script}"
) )
"$mainMod, C, killactive" "$mainMod, C, killactive"
"$mainMod, M, exec, uwsm stop" "$mainMod, M, exec, uwsm stop"
"$mainMod, Q, exec, kitty" "$mainMod, Q, exec, kitty"
"$mainMod, V, togglefloating," "$mainMod, V, togglefloating,"
"$mainMod, P, pseudo, # dwindle" # "$mainMod, P, pseudo, # dwindle"
"$mainMod, J, togglesplit, # dwindle" # "$mainMod, J, togglesplit, # dwindle"
"$mainMod, left, movefocus, l" "$mainMod, left, movefocus, l"
"$mainMod, right, movefocus, r" "$mainMod, right, movefocus, r"
"$mainMod, up, movefocus, u" "$mainMod, up, movefocus, u"
@@ -162,15 +163,14 @@
] ]
++ (builtins.concatLists ( ++ (builtins.concatLists (
builtins.genList ( builtins.genList (
i: i: let
let
ws = i + 1; ws = i + 1;
in in [
[
"$mainMod, ${toString ws}, workspace, ${toString ws}" "$mainMod, ${toString ws}, workspace, ${toString ws}"
"$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}" "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
] ]
) 9 )
9
)); ));
bindm = [ bindm = [
"$mainMod, mouse:272, movewindow" "$mainMod, mouse:272, movewindow"
+4 -5
View File
@@ -1,9 +1,6 @@
{ ... }: {...}: {
{
modules.nix = { modules.nix = {
nixos = nixos = {...}: {
{ ... }:
{
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings = { nix.settings = {
substituters = [ substituters = [
@@ -14,6 +11,7 @@
"https://cache.nixos-cuda.org" "https://cache.nixos-cuda.org"
"https://niri.cachix.org" "https://niri.cachix.org"
"https://attic.xuyh0120.win/lantian" "https://attic.xuyh0120.win/lantian"
"https://nixos-raspberrypi.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
@@ -22,6 +20,7 @@
"cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
"lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
]; ];
experimental-features = [ experimental-features = [
"flakes" "flakes"
+124 -29
View File
@@ -4,8 +4,7 @@
lib, lib,
inputs, inputs,
... ...
}: }: {
{
# Its in its own folder for future modulizaion efforts # Its in its own folder for future modulizaion efforts
flake-file.inputs = { flake-file.inputs = {
nixvim = { nixvim = {
@@ -15,13 +14,20 @@
}; };
modules = { modules = {
nixvim = { nixvim = {
nixos = nixos = {home-manager, ...}: {
{ home-manager, ... }:
{
}; };
homeManager = homeManager = {pkgs, ...}: let
{ pkgs, ... }: tiny-code-action = pkgs.vimUtils.buildVimPlugin {
{ name = "tiny-code-action.nvim";
src = pkgs.fetchFromGitHub {
owner = "rachartier";
repo = "tiny-code-action.nvim";
rev = "main";
hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA";
};
nvimSkipModules = ["tiny-code-action.previewers.snacks"];
};
in {
imports = [ imports = [
inputs.nixvim.homeModules.nixvim inputs.nixvim.homeModules.nixvim
]; ];
@@ -36,13 +42,13 @@
colorschemes.gruvbox-material.enable = true; colorschemes.gruvbox-material.enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
# formatters # formatters
nixfmt alejandra
rustfmt rustfmt
# misc # misc
ripgrep ripgrep
# misc
nixd nixd
tree-sitter tree-sitter
rust-analyzer
]; ];
performance.byteCompileLua = { performance.byteCompileLua = {
enable = true; enable = true;
@@ -56,12 +62,13 @@
lsp-status.enable = true; lsp-status.enable = true;
transparent.enable = true; transparent.enable = true;
which-key.enable = true; which-key.enable = true;
snacks.enable = true;
conform-nvim = { conform-nvim = {
enable = true; enable = true;
settings = { settings = {
formatters_by_ft = { formatters_by_ft = {
nix = [ "nixfmt" ]; nix = ["alejandra"];
rust = [ "rustfmt" ]; rust = ["rustfmt"];
"_" = [ "_" = [
"squeeze_blanks" "squeeze_blanks"
"trim_whitespace" "trim_whitespace"
@@ -99,6 +106,15 @@
}; };
nixd = { nixd = {
enable = true; enable = true;
settings = {
nixd = {
nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }";
options = {
nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options";
home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options";
};
};
};
}; };
astro = { astro = {
enable = true; enable = true;
@@ -126,28 +142,28 @@
enable = true; enable = true;
settings = { settings = {
sections = { sections = {
lualine_a = [ "mode" ]; lualine_a = ["mode"];
lualine_b = [ lualine_b = [
"branch" "branch"
"diff" "diff"
"diagnostics" "diagnostics"
]; ];
lualine_c = [ "filename" ]; lualine_c = ["filename"];
lualine_x = [ lualine_x = [
"encoding" "encoding"
"fileformat" "fileformat"
"filetype" "filetype"
]; ];
lualine_y = [ "lsp_status" ]; lualine_y = ["progress"];
lualine_z = [ "location" ]; lualine_z = ["location"];
}; };
inactive_sections = { inactive_sections = {
lualine_a = [ ]; lualine_a = [];
lualine_b = [ ]; lualine_b = [];
lualine_c = [ "filename" ]; lualine_c = ["filename"];
lualine_x = [ "location" ]; lualine_x = ["location"];
lualine_y = [ ]; lualine_y = [];
lualine_z = [ ]; lualine_z = [];
}; };
}; };
}; };
@@ -171,15 +187,30 @@
}; };
}; };
}; };
trouble.enable = true; lsp-lines.enable = true;
diaglist = {
enable = true;
settings = {
debug = false;
};
};
cmp = { cmp = {
enable = true; enable = true;
autoEnableSources = true; autoEnableSources = true;
settings = { settings = {
sources = [ sources = [
{ name = "nvim_lsp"; } {
{ name = "path"; } name = "nvim_lsp";
{ name = "buffer"; } priority = 100;
}
{
name = "buffer";
priority = 50;
}
{
name = "path";
priority = 40;
}
]; ];
mapping = { mapping = {
"<C-Space>" = "cmp.mapping.complete()"; "<C-Space>" = "cmp.mapping.complete()";
@@ -187,13 +218,24 @@
"<C-e>" = "cmp.mapping.close()"; "<C-e>" = "cmp.mapping.close()";
"<C-f>" = "cmp.mapping.scroll_docs(4)"; "<C-f>" = "cmp.mapping.scroll_docs(4)";
"<CR>" = "cmp.mapping.confirm({ select = true })"; "<CR>" = "cmp.mapping.confirm({ select = true })";
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; "<S-Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})";
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
};
window = {
completion = {
border = "rounded";
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None";
};
documentation = {
border = "rounded";
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu";
};
}; };
}; };
}; };
lspkind.enable = true; lspkind.enable = true;
tiny-inline-diagnostic.enable = true; tiny-inline-diagnostic.enable = true;
# tiny-code-action.enable = true;
# persisted.enable = true; # persisted.enable = true;
auto-session = { auto-session = {
enable = false; enable = false;
@@ -208,6 +250,9 @@
enable = true; enable = true;
grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
bash bash
css
html
javascript
json json
lua lua
make make
@@ -216,6 +261,8 @@
nix nix
regex regex
toml toml
tsx
typescript
vim vim
vimdoc vimdoc
xml xml
@@ -224,6 +271,7 @@
]; ];
settings = { settings = {
highlight.enable = true; highlight.enable = true;
indent.enable = true;
}; };
}; };
}; };
@@ -233,6 +281,9 @@
vimPlugins.melange-nvim vimPlugins.melange-nvim
vimPlugins.telescope-file-browser-nvim vimPlugins.telescope-file-browser-nvim
vimPlugins.lsp-progress-nvim vimPlugins.lsp-progress-nvim
vimPlugins.cmp-cmdline
vimPlugins.cmp-nvim-lsp-signature-help
tiny-code-action
]; ];
opts = { opts = {
number = true; number = true;
@@ -244,6 +295,42 @@
globals = { globals = {
mapleader = " "; mapleader = " ";
}; };
extraConfigLua = ''
local cmp = require('cmp')
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources(
{ { name = 'path' } },
{ { name = 'cmdline' } }
),
window = {
completion = {
border = 'rounded',
},
},
})
cmp.setup.cmdline('/', {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
},
window = {
completion = {
border = 'rounded',
},
},
})
require('tiny-code-action').setup({
backend = 'vim',
picker = 'snacks',
resolve_timeout = 100,
notify = {
enabled = true,
on_empty = true,
},
})
'';
keymaps = [ keymaps = [
{ {
action = "<cmd>Telescope persisted<cr>"; action = "<cmd>Telescope persisted<cr>";
@@ -288,12 +375,20 @@
}; };
} }
{ {
action = "<cmd>Trouble diagnostics toggle<cr>"; action = "<cmd>DiaglistToggle<cr>";
key = "<leader>fd"; key = "<leader>fd";
options = { options = {
silent = true; silent = true;
}; };
} }
{
action = "<cmd>lua require('tiny-code-action').code_action()<cr>";
key = "<leader>ca";
mode = ["n" "x"];
options = {
silent = true;
};
}
]; ];
}; };
}; };
@@ -1 +1 @@
/run/user/1000/quickshell/vfs/6e389f6b800776b0595d9d90e42ebd04/.qmlls.ini /run/user/1000/quickshell/vfs/ca6d8e2cdd46bffdf799708f31d409fa/.qmlls.ini
+42 -17
View File
@@ -4,36 +4,61 @@
modules, modules,
inputs, inputs,
... ...
}: }: {
{
flake-file.inputs = { flake-file.inputs = {
raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
modules.raspberry-pi = { modules.raspberry-pi = {
provides = { provides = {
"5" = { "5" = {
nixos = nixos = {pkgs, ...}: {
{ pkgs, ... }:
let
rpi-pi = inputs.raspberry-pi-nix;
in
{
imports = [ imports = [
rpi-pi.nixosModules.raspberry-pi # inputs.nixos-hardware.nixosModules.raspberry-pi-5
rpi-pi.nixosModules.sd-image inputs.nixos-raspberrypi.lib.inject-overlays-global
inputs.nixos-raspberrypi.nixosModules.trusted-nix-caches
inputs.nixos-raspberrypi.lib.inject-overlays
inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.base
inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.page-size-16k
inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
inputs.nixos-raspberrypi.nixosModules.sd-image
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
libraspberrypi libraspberrypi
]; ];
sdImage.compressImage = false; _module.args = {inherit (inputs) nixos-raspberrypi;};
raspberry-pi-nix.board = "bcm2712"; # Rpi 5 - 64bit
# We need to rebuild kernel for 6.12
# raspberry-pi-nix.kernel-version = "v6_12_17";
raspberry-pi-nix.uboot.enable = false;
hardware.enableRedistributableFirmware = true; sdImage.compressImage = false;
boot.loader.raspberry-pi.bootloader = "kernel";
# boot.initrd.systemd.tpm2.enable = false;
# boot.initrd.allowMissingModules = true;
boot.supportedFilesystems.zfs = false;
# hardware.enableRedistributableFirmware = true;
# fileSystems = {
# "/boot/firmware" = {
# device = "/dev/disk/by-uuid/2175-794E";
# fsType = "vfat";
# options = [
# "noatime"
# "noauto"
# "x-systemd.automount"
# "x-systemd.idle-timeout=1min"
# ];
# };
# "/" = {
# device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
# fsType = "ext4";
# options = ["noatime"];
# };
# };
}; };
}; };
}; };
+49
View File
@@ -0,0 +1,49 @@
{
den,
__findFile,
modules,
...
}: {
# Basic traefik
modules.services.provides.docker-registry = {
nixos = {
config,
pkgs,
...
}: let
registryImg = pkgs.dockerTools.pullImage {
imageName = "registry";
imageDigest = "sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a";
finalImageName = "registry";
finalImageTag = "3";
sha256 = "sha256-rLG0q/MVVz52veqZuZs5W0Qke6FugXkx7fMe3QnE3gU";
arch = "arm64";
};
in {
virtualisation.oci-containers.containers = {
docker-registry = {
image = "registry";
imageFile = registryImg;
volumes = [
"/data/dockerRegistry:/var/lib/registry"
"/run/dbus:/run/dbus:ro"
"/etc/localtime:/etc/localtime:ro"
];
ports = ["0.0.0.0:5000:5000"];
# networks = [ "meow" ];
};
};
networking.firewall = {
allowedTCPPorts = [
5000
];
allowedUDPPortRanges = [];
};
services.caddy = pkgs.lib.mkIf config.services.caddy.enable {
virtualHosts."dockerRegistry.h.doloro.co.uk".extraConfig = ''
reverse_proxy :5000
'';
};
};
};
}
+1 -1
View File
@@ -6,7 +6,7 @@
}: }:
{ {
flake-file.inputs = { flake-file.inputs = {
x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1"; x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
}; };
modules.surface-patches = { modules.surface-patches = {
nixos = nixos =
+9 -7
View File
@@ -1,9 +1,10 @@
{ modules, ... }: {modules, ...}: {
{
modules.tmux = { modules.tmux = {
homeManager = homeManager = {
{ home, pkgs, ... }: home,
{ pkgs,
...
}: {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
@@ -11,10 +12,11 @@
minimal-tmux-status minimal-tmux-status
]; ];
extraConfig = '' extraConfig = ''
set-option -g default-terminal "xterm-256color" set-option -g default-terminal "tmux-256color"
set -a terminal-features "xterm-256color:RGB" set -as terminal-features ",xterm-256color:RGB"
set -g status-bg black set -g status-bg black
set -g status-fg white set -g status-fg white
set -g mouse on
''; '';
}; };
}; };
+1
View File
@@ -7,6 +7,7 @@
users.users.${user.userName} = { users.users.${user.userName} = {
extraGroups = [ extraGroups = [
"wheel" "wheel"
"libvirtd"
"networkmanager" "networkmanager"
]; ];
}; };
+15
View File
@@ -0,0 +1,15 @@
{
modules,
den,
inputs,
...
}: {
flake-file.inputs = {
nixos-wsl.url = "github:nix-community/NixOS-WSL";
};
modules.wsl = {
nixos = {
imports = [inputs.nixos-wsl.nixosModules.default];
};
};
}
Generated
+380 -216
View File
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -30,9 +30,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -42,7 +46,7 @@
url = "github:nix-community/stylix"; url = "github:nix-community/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1"; x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";