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

refactoring and minor updates

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-03-22 10:57:26 -04:00
parent 83f072dac2
commit 14ff6a7a25
7 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -70,11 +70,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742609412, "lastModified": 1742634825,
"narHash": "sha256-IxX39CKe2jknL7ipiufh92z0V3WXfdpe+oHIzAqtcTs=", "narHash": "sha256-2WGJ1GpYDb12+7dZYUXTXflGgkIssWLK0kbbQa1Fsps=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "724499d6305658949e21e01f5624ac429d9ab48a", "rev": "31ee8006935d8c3ce678854d8e46d74915a16960",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1742567165, "lastModified": 1742643921,
"narHash": "sha256-yhGDoiF5hOvphi3R0Wm7RVbFQMi2eFlfmOcCRchqmlw=", "narHash": "sha256-tt6FIFIfOHcgKxi6fBD4RxIk3JoYF2WNpVE9jLWT7eI=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "314180820701b755731d7900ff561414a55c17ae", "rev": "ecd613c125c16295b52bb52f3687c5538b7d95ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +777,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742542657, "lastModified": 1742641057,
"narHash": "sha256-lUz/YftLDTZvsgbzC2bppHLbflsS/NuaNZXp3UvvYgw=", "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "fd1f43673cf4d1e84d9da67e294c040934034eda", "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -907,11 +907,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1742376361, "lastModified": 1742631601,
"narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/eddie/configuration.nix
View file

@ -160,7 +160,7 @@
win-virtio win-virtio
win-spice win-spice
xwayland-satellite-unstable xwayland-satellite
]; ];
# Bootloader. # Bootloader.

19
modules/home/niri.nix
View file

@ -108,7 +108,7 @@ in
animations.slowdown = 1.0; animations.slowdown = 1.0;
layout = { layout = {
gaps = 10; gaps = 6;
center-focused-column = "never"; center-focused-column = "never";
always-center-single-column = true; always-center-single-column = true;
@ -149,8 +149,9 @@ in
width = pkgs.rice.border-width + 1; width = pkgs.rice.border-width + 1;
}; };
shadow = { struts = {
enable = true; right = 6;
left = 6;
}; };
}; };
@ -224,6 +225,18 @@ in
]; ];
open-maximized = true; open-maximized = true;
} }
{
matches = [
{ is-floating = true; }
];
shadow = {
enable = true;
softness = 10;
spread = 8;
};
}
]; ];
# switch-events = with config.lib.niri.actions; { # switch-events = with config.lib.niri.actions; {

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

@ -1,4 +1,4 @@
{ nix-config, inputs, pkgs, ... }: { nix-config, lib, inputs, pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -94,7 +94,6 @@
fish = { fish = {
enable = true; enable = true;
shellAliases = { shellAliases = {
"ls" = "eza";
"em" = "emacsclient -n -r"; "em" = "emacsclient -n -r";
"mkdir" = "mkdir -pv"; "mkdir" = "mkdir -pv";
}; };
@ -132,15 +131,17 @@
wezterm = { wezterm = {
enable = true; enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default; package = inputs.wezterm.packages.${pkgs.system}.default;
# extraConfig = lib.readFile ./dotfiles/dot_config/wezterm/wezterm.lua;
}; };
bat = { bat = {
enable = true; enable = true;
}; };
eza = { eza = {
enable = true; enable = true;
git = true;
enableFishIntegration = true; enableFishIntegration = true;
git = true;
icons = "auto";
colors = "auto";
# extraOptions = [ "--header" ];
}; };
fd = { fd = {
enable = true; enable = true;

6
modules/home/shell-conf/fish/functions/git-fake.fish Normal file
View file

@ -0,0 +1,6 @@
#!/usr/bin/env fish
function git-fake --description 'add file to repo without actually adding it (for nix flake needs)'
git add --intent-to-add $argv
git update-index --skip-worktree --assume-unchanged $argv
end

4
modules/home/shell-conf/fish/functions/lla.fish
View file

@ -1,3 +1,3 @@
function lla --wraps='eza -la' --description 'alias lla eza -la' function lla --wraps='ls' --description 'alias lla eza -la'
eza -la $argv ls -la $argv
end end

4
modules/home/shell-conf/fish/functions/ls.fish
View file

@ -1,7 +1,3 @@
function ls --wraps=eza --description 'eza instead of ls' function ls --wraps=eza --description 'eza instead of ls'
if type --quiet eza
eza --git --header --icons $argv eza --git --header --icons $argv
else
command ls --color=auto $argv
end
end end