Compare commits

...
10 Commits
13 changed files with 125 additions and 75 deletions
Generated
+15 -15
View File
@@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1778716662,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771471179, "lastModified": 1779213149,
"narHash": "sha256-XuP8HPzvt4+m9aKVeL9GdGNlTeyeDn3zEeUuorvrw88=", "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2dedeb55b2c140d9a123ae931588e8903fe202ef", "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1778869304,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,11 +66,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1771135771, "lastModified": 1779296766,
"narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", "narHash": "sha256-kbgeL14JdJL2prN7khpZtYT88ibaSUNDSUJkaHlz4xQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", "rev": "c7e82d37c2ed3cbddf54e36b8a13b3518ff1dc2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -94,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771166946, "lastModified": 1777944972,
"narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
"type": "github" "type": "github"
}, },
"original": { "original": {
+7
View File
@@ -20,6 +20,13 @@ in
kekleo = lib.mkIf (osConfig != null) (mkDefaultSharedAttrs config.kekleo (osConfig.kekleo or { })); kekleo = lib.mkIf (osConfig != null) (mkDefaultSharedAttrs config.kekleo (osConfig.kekleo or { }));
home.sessionVariables = {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
};
programs.home-manager.enable = true; programs.home-manager.enable = true;
# Nicely reload system units when changing configs # Nicely reload system units when changing configs
+6 -1
View File
@@ -22,6 +22,11 @@
}; };
home.activation.configure-tide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.configure-tide = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
${pkgs.fish}/bin/fish -c "tide configure --auto --style=Lean --prompt_colors='16 colors' --show_time=No --lean_prompt_height='Two lines' --prompt_connection=Disconnected --prompt_spacing=Compact --icons='Few icons' --transient=Yes" if [ ! -e "$HOME/.config/fish/tide_configured" ]; then
echo "Configuring Tide..."
$DRY_RUN_CMD ${pkgs.fish}/bin/fish -c "tide configure --auto --style=Lean --prompt_colors='16 colors' --show_time=No --lean_prompt_height='Two lines' --prompt_connection=Disconnected --prompt_spacing=Compact --icons='Few icons' --transient=Yes"
$DRY_RUN_CMD touch "$HOME/.config/fish/tide_configured"
echo "Finish Configuring Tide..."
fi
''; '';
} }
+3 -1
View File
@@ -46,6 +46,9 @@
]; ];
"$mod" = "SUPER"; "$mod" = "SUPER";
"$launcher" = "rofi -show drun"; "$launcher" = "rofi -show drun";
bindr = [
"$mod,Super_L,exec,pkill rofi || $launcher"
];
bind = [ bind = [
"ALTSHIFT,Q,killactive," "ALTSHIFT,Q,killactive,"
"ALT,V,togglefloating," "ALT,V,togglefloating,"
@@ -53,7 +56,6 @@
"ALTSHIFT,F,fullscreen,0" "ALTSHIFT,F,fullscreen,0"
"$mod,Return,exec,kitty" "$mod,Return,exec,kitty"
"$mod,F,exec,firefox" "$mod,F,exec,firefox"
"$mod,R,exec,$launcher"
"ALT,H,movefocus,l" "ALT,H,movefocus,l"
"ALT,L,movefocus,r" "ALT,L,movefocus,r"
+53
View File
@@ -0,0 +1,53 @@
{
programs.nixvim = {
plugins.dap = {
enable = true;
luaConfig.content = ''
local dap = require 'dap'
local dapui = require 'dapui'
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
'';
};
plugins.dap-ui.enable = true;
plugins.dap-python.enable = true;
keymaps = [
{
mode = "n";
key = "<F5>";
action = "<cmd>DapContinue<CR>";
options.desc = "Debug: Start/Continue";
options.silent = true;
}
{
mode = "n";
key = "<F1>";
action = "<cmd>DapStepInto<CR>";
options.desc = "Debug: Step Into";
options.silent = true;
}
{
mode = "n";
key = "<F2>";
action = "<cmd>DapStepOver<CR>";
options.desc = "Debug: Step Over";
options.silent = true;
}
{
mode = "n";
key = "<F3>";
action = "<cmd>DapStepOut<CR>";
options.desc = "Debug: Step Out";
options.silent = true;
}
{
mode = "n";
key = "<leader>b";
action = "<cmd>DapToggleBreakpoint<CR>";
options.desc = "Debug: Toggle Breakpoint";
options.silent = true;
}
];
};
}
@@ -2,6 +2,7 @@
{ {
imports = [ imports = [
./cmp.nix ./cmp.nix
./dap.nix
./lsp.nix ./lsp.nix
./fmt.nix ./fmt.nix
./treesitter.nix ./treesitter.nix
+3 -1
View File
@@ -40,13 +40,15 @@
formatters_by_ft = { formatters_by_ft = {
lua = [ "stylua" ]; lua = [ "stylua" ];
nix = [ "nixfmt" ]; nix = [ "nixfmt" ];
python = [ "black" ];
}; };
}; };
}; };
extraPackages = with pkgs; [ extraPackages = with pkgs; [
stylua stylua
nixfmt-rfc-style nixfmt
black
]; ];
}; };
} }
@@ -3,12 +3,9 @@
programs.nixvim = { programs.nixvim = {
plugins.treesitter = { plugins.treesitter = {
enable = true; enable = true;
settings = {
auto_install = true;
highlight.enable = true; highlight.enable = true;
indent.enable = true; indent.enable = true;
}; };
};
extraPackages = with pkgs; [ extraPackages = with pkgs; [
gcc gcc
-7
View File
@@ -30,13 +30,6 @@
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
}; };
environment.sessionVariables = {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
wget wget
-3
View File
@@ -1,7 +1,6 @@
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./exegol.nix
]; ];
# Enable CUPS to print documents. # Enable CUPS to print documents.
@@ -22,8 +21,6 @@
# pulse.enable = true; # pulse.enable = true;
# }; # };
kekleo.exegol = true;
users.users = { users.users = {
leonhard = { leonhard = {
initialPassword = "leonhard"; initialPassword = "leonhard";
-19
View File
@@ -1,19 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
options.kekleo.exegol = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to enable exegol.";
};
config = lib.mkIf config.kekleo.exegol {
virtualisation.docker.enable = true;
users.extraGroups.docker.members = [ "leonhard" ];
environment.systemPackages = with pkgs; [ exegol4 ];
};
}
+5 -3
View File
@@ -15,12 +15,12 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/0eb29109-abd1-49af-859a-1c5009e2482f"; device = "/dev/disk/by-label/nixos";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/EE00-3849"; device = "/dev/disk/by-label/boot";
fsType = "vfat"; fsType = "vfat";
options = [ options = [
"fmask=0077" "fmask=0077"
@@ -28,7 +28,9 @@
]; ];
}; };
swapDevices = [ ]; swapDevices = [
{ device = "/dev/disk/by-label/swap"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
+24 -14
View File
@@ -1,31 +1,41 @@
# Do not modify this file! It was generated by nixos-generate-config {
# and may be overwritten by future invocations. Please make changes config,
# to /etc/nixos/configuration.nix instead. lib,
{ config, lib, pkgs, modulesPath, ... }: modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/e9aebe22-0d9f-460f-a576-f1c44f6050b0"; device = "/dev/disk/by-label/nixos";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/4705-B811"; device = "/dev/disk/by-label/boot";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/a81582c7-be0f-4070-b3e8-64e24b8483d2"; } { device = "/dev/disk/by-label/swap"; }
]; ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";