Compare commits

...

5 commits

5 changed files with 48 additions and 51 deletions

36
flake.lock generated
View file

@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755810213, "lastModified": 1758810399,
"narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,10 +64,10 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1755761639, "lastModified": 1758616692,
"narHash": "sha256-rEvyLY/3u1RfxsySyqScM3peGUVNJNmGApHVyIY7Cx0=", "narHash": "sha256-Q/7qOK6Vgjc6pBPCmnbIq2JF4XFlLYTvekS4v2OypAE=",
"ref": "main", "ref": "main",
"rev": "d73f46baaff8c9fff2a7b11c97413ea3fb171584", "rev": "d59b492f9bfdb522280f1344ae25c821ba7b11b4",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@git.epha.se:24422/ephase/nix-private.git" "url": "ssh://git@git.epha.se:24422/ephase/nix-private.git"
@ -116,11 +116,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1758690382,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1758690382,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,11 +151,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1755877557, "lastModified": 1758828503,
"narHash": "sha256-AjUqNCIgjQKfhvH+HUXZQLlSDiRTFQPSPN8Ws/O7mVQ=", "narHash": "sha256-IgOibVOqWSZqWsHKK6TuALfuItRymW2YpsdZBjU2yrk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "332abf45be8133422a97e134b35782400ffc65bd", "rev": "544f12f6987ceb94fe2052696da65623c238da4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1758425756,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,10 +1,10 @@
{ pkgs, ... }: { { pkgs, inputs, ... }: {
config.modules = { config.modules = {
application = { application = {
gnupg.enable = false; gnupg.enable = true;
zathura.enable = true; zathura.enable = true;
foot.enable = false; foot.enable = true;
imv.enable = false; imv.enable = true;
}; };
audio = { audio = {
cmus.enable = true; cmus.enable = true;
@ -12,7 +12,11 @@
cli = { cli = {
direnv.enable = true; direnv.enable = true;
ghq.enable = true; ghq.enable = true;
git.enable = true; git = {
enable = true;
userEmail = inputs.nix-private.git.personal.userEmail;
signingKey = inputs.nix-private.git.personal.signingKey;
};
neovim.enable = true; neovim.enable = true;
starship.enable = true; starship.enable = true;
tmux.enable = true; tmux.enable = true;
@ -29,8 +33,9 @@
web.webcord.enable = false; web.webcord.enable = false;
gaming.lutris.enable = false; gaming.lutris.enable = false;
desktop.sway = { desktop.sway = {
enable = false; enable = true;
kanshi = false; kanshi = false;
swaylock.useNullPackage = true;
wallpapers.lockscreen = "${./files/lockscreen.png}"; wallpapers.lockscreen = "${./files/lockscreen.png}";
wallpapers.desktop = "${./files/background.png} fill #000000"; wallpapers.desktop = "${./files/background.png} fill #000000";
waybar = { waybar = {
@ -39,7 +44,7 @@
enable = false; enable = false;
}; };
cpuThermal = { cpuThermal = {
thermalZone = "2"; thermalZone = 2;
# hwmonPathAbs = ""; # hwmonPathAbs = "";
# inputFilename = ""; # inputFilename = "";
}; };

View file

@ -1,21 +1,24 @@
_: _:
{ {
wayland.windowManager.sway.config.output = {
"eDP-1" = {
scale = "1.4";
};
"HDMI-A-1" = {
disable = "";
};
};
wayland.windowManager.sway.config.input = {
"4617:27904:MNT_Research_MNT_Reform_Keyboard_2.0_US/LT" = {
xkb_layout = "us";
xkb_variant = "altgr-intl";
};
};
programs.zsh.loginExtra = '' programs.zsh.loginExtra = ''
#notmutch #notmutch
export NOTMUCH_CONFIG="$HOME/.config/notmuch/config" export NOTMUCH_CONFIG="$HOME/.config/notmuch/config"
export PATH=~/.local/bin:$PATH # export PATH=~/.local/bin:$PATH
# export XDG_DATA_HOME=$HOME/.local/share # export XDG_DATA_HOME=$HOME/.local/share
unset DEBUGINFOD_URLS unset DEBUGINFOD_URLS
if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then '';
export QT_QPA_PLATFORM="wayland-egl" }
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export MOZ_ENABLE_WAYLAND=1
export QT_QPA_PLATFORMTHEME=qt5ct
export NO_AT_BRIDGE=1
export XDG_SESSION_TYPE=wayland
export XDG_CURRENT_DESKTOP=sway
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
exec ~/.local/bin/sway.sh
fi
'';
}

View file

@ -162,7 +162,7 @@ tmux_vsplit() {
tmux_hsplit() { tmux_hsplit() {
local size="${1:-20}" local size="${1:-20}"
debug "execute hsplit with size '${size}'" debug "execute hsplit with size '${size}'"
tmux split-window "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size" tmux split-window -t "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size"
} }
tmux_neww() { tmux_neww() {

View file

@ -4,17 +4,6 @@
(final: prev: { (final: prev: {
qutebrowser = prev.qutebrowser.override { qutebrowser = prev.qutebrowser.override {
enableWideVine = if pkgs.system == "x86_64-linux" then true else false; enableWideVine = if pkgs.system == "x86_64-linux" then true else false;
# Get Widevine friom slackware as google CDN seems to not working anymore
# TODO: Remove this when resolved upstream
# https://github.com/NixOS/nixpkgs/issues/435671
widevine-cdm = pkgs.widevine-cdm.overrideAttrs (oldAttrs: {
src = pkgs.fetchzip {
url = "https://alien.slackbook.org/slackbuilds/chromium-widevine-plugin/build/4.10.2891.0-linux-x64.zip" ;
hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI";
stripRoot = false;
};
});
}; };
}) })
inputs.nur.overlays.default inputs.nur.overlays.default