Compare commits

...

10 commits

10 changed files with 137 additions and 73 deletions

2
flake.lock generated
View file

@ -883,7 +883,7 @@
"oisd": { "oisd": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-g4tRuibVyOwPMAhJ1RLCBLkuSRo0eWC0HSe227NMd4E=", "narHash": "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s=",
"type": "file", "type": "file",
"url": "https://big.oisd.nl/domainswild" "url": "https://big.oisd.nl/domainswild"
}, },

View file

@ -19,6 +19,7 @@ in
./../../modules/services/mullvad.nix ./../../modules/services/mullvad.nix
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd
./../../modules/home/steam.nix ./../../modules/home/steam.nix
./../../modules/services/ollama.nix
# ./../../modules/services/automount.nix # ./../../modules/services/automount.nix
]; ];
@ -27,6 +28,7 @@ in
systemPackages = with pkgs; [ systemPackages = with pkgs; [
fwupd fwupd
fw-ectool fw-ectool
monero-gui
]; ];
etc.hosts.mode = "0700"; etc.hosts.mode = "0700";
}; };
@ -37,6 +39,7 @@ in
creative.enable = true; creative.enable = true;
amdgpu.enable = true; amdgpu.enable = true;
gui.enable = true; gui.enable = true;
wine.enable = true;
}; };
services = { services = {
@ -57,14 +60,14 @@ in
# networkmanager.ethernet.macAddress = "13:37:6a:8a:ed:a4"; # networkmanager.ethernet.macAddress = "13:37:6a:8a:ed:a4";
}; };
environment.etc."NetworkManager/conf.d/20-ethernet-mac-address.conf".text = '' #environment.etc."NetworkManager/conf.d/20-ethernet-mac-address.conf".text = ''
[connection.20-ethernet-mac-addr] # [connection.20-ethernet-mac-addr]
match-device=type:ethernet # match-device=type:ethernet
ethernet.cloned-mac-address=${mac_ethernet} # ethernet.cloned-mac-address=${mac_ethernet}
[.config] # [.config]
enable=nm-version-min:1.45 # enable=nm-version-min:1.45
''; #'';
powerManagement = { powerManagement = {
enable = true; enable = true;

View file

@ -10,6 +10,7 @@
++ [ (import ./kitty.nix) ] ++ [ (import ./kitty.nix) ]
++ [ (import ./kanshi.nix) ] ++ [ (import ./kanshi.nix) ]
++ [ (import ./foot.nix) ] ++ [ (import ./foot.nix) ]
++ [ (import ./nextcloud.nix) ]
++ [ (import ./nvim.nix) ] ++ [ (import ./nvim.nix) ]
++ [ (import ./zathura.nix) ] ++ [ (import ./zathura.nix) ]
++ [ (import ./packages.nix) ] ++ [ (import ./packages.nix) ]

View file

@ -37,6 +37,7 @@
"foot --server &" "foot --server &"
"hyprfloat &" "hyprfloat &"
"gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &" "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &"
"nwg-dock-hyprland &"
]; ];
input = { input = {
@ -58,7 +59,6 @@
border_size = 2; border_size = 2;
"col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg"; "col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg";
"col.inactive_border" = "0x00000000"; "col.inactive_border" = "0x00000000";
no_border_on_floating = false;
}; };
group = { group = {
"col.border_active" = "rgb(ffffff) rgb(ffffff) 45deg"; "col.border_active" = "rgb(ffffff) rgb(ffffff) 45deg";
@ -103,22 +103,20 @@
decoration = { decoration = {
rounding = 0; rounding = 0;
# active_opacity = 0.90; active_opacity = 1.00;
# inactive_opacity = 0.90; inactive_opacity = 0.75;
# fullscreen_opacity = 1.0; # fullscreen_opacity = 1.0;
blur = { blur = {
enabled = false; enabled = true;
size = 1; size = 7;
passes = 1; passes = 3;
# size = 4; noise = 0.08;
# passes = 2;
brightness = 1; brightness = 1;
contrast = 1.400; contrast = 1.5;
ignore_opacity = true; ignore_opacity = true;
noise = 0;
new_optimizations = true; new_optimizations = true;
xray = true; xray = false;
}; };
# drop_shadow = true; # drop_shadow = true;
@ -160,6 +158,9 @@
gesture = [ gesture = [
"3, horizontal, workspace" "3, horizontal, workspace"
"4, up, dispatcher, playerctl -p mpd play-pause"
"4, left, dispatcher, playerctl -p mpd next"
"4, right, dispatcher, playerctl -p mpd previous"
# "4, horizontal, move" # "4, horizontal, move"
]; ];
@ -287,58 +288,61 @@
]; ];
# windowrule # windowrule
windowrule = [ # windowrule = [
"float,title:^(float_kitty)$" # "float,title:^(float_kitty)$"
"center,title:^(float_kitty)$" # "center,title:^(float_kitty)$"
"size 950 600,title:^(float_kitty)$" # "size 950 600,title:^(float_kitty)$"
"float,title:^(float_foot)$" # "float,title:^(float_foot)$"
"center,title:^(float_foot)$" # "center,title:^(float_foot)$"
"size 950 600,title:^(float_foot)$" # "size 950 600,title:^(float_foot)$"
"float,title:^(Volume Control)$" # "float,title:^(Volume Control)$"
"float,title:^(Librewolf Sharing Indicator)$" # "float,title:^(Librewolf — Sharing Indicator)$"
"float,title:^(Export Image as PNG)$" # "float,title:^(Export Image as PNG)$"
"move 0 0,title:^(Librewolf Sharing Indicator)$" # "move 0 0,title:^(Librewolf — Sharing Indicator)$"
"size 700 450,title:^(Volume Control)$" # "size 700 450,title:^(Volume Control)$"
"move 40 55%,title:^(Volume Control)$" # "move 40 55%,title:^(Volume Control)$"
"bordersize 0, floating:0, onworkspace:w[tv1]" # "bordersize 0, floating:0, onworkspace:w[tv1]"
"rounding 0, floating:0, onworkspace:w[tv1]" # "rounding 0, floating:0, onworkspace:w[tv1]"
"bordersize 0, floating:0, onworkspace:f[1]" # "bordersize 0, floating:0, onworkspace:f[1]"
"rounding 0, floating:0, onworkspace:f[1]" # "rounding 0, floating:0, onworkspace:f[1]"
]; # ];
# windowrulev2 ## windowrulev2
windowrulev2 = [ windowrule = [
"noanim, class:^(bemenu)$" # "opacity 0.5 0.5, match:class nwg-dock-hyprland"
"float, title:^(Picture-in-Picture)$" "no_blur on, match:class ungoogled-chromium"
"opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$" "no_blur on, match:class librewolf"
"pin, title:^(Picture-in-Picture)$" # "noanim, class:^(bemenu)$"
"opacity 1.0 override 1.0 override, title:^(.*imv.*)$" # "float, title:^(Picture-in-Picture)$"
"opacity 1.0 override 1.0 override, title:^(.*mpv.*)$" # "opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$"
"idleinhibit focus, class:^(mpv)$" # "pin, title:^(Picture-in-Picture)$"
"idleinhibit fullscreen, class:^(librewolf)$" # "opacity 1.0 override 1.0 override, title:^(.*imv.*)$"
"float,class:^(pavucontrol-qt)$" # "opacity 1.0 override 1.0 override, title:^(.*mpv.*)$"
"fullscreen,class:Nsxiv" # "idleinhibit focus, class:^(mpv)$"
"fullscreen,title:^(*nsxiv*)$" # "idleinhibit fullscreen, class:^(librewolf)$"
"fullscreen,title:^(nsxiv)$" # "float,class:^(pavucontrol-qt)$"
"fullscreen,class:swiv" # "fullscreen,class:Nsxiv"
"fullscreen,title:^(*swiv*)$" # "fullscreen,title:^(*nsxiv*)$"
"fullscreen,title:^(swiv)$" # "fullscreen,title:^(nsxiv)$"
"float,class:^(pavucontrol)$" # "fullscreen,class:swiv"
"float,class:^(SoundWireServer)$" # "fullscreen,title:^(*swiv*)$"
"float,class:^(.sameboy-wrapped)$" # "fullscreen,title:^(swiv)$"
"float,class:^(file_progress)$" # "float,class:^(pavucontrol)$"
"float,class:^(confirm)$" # "float,class:^(SoundWireServer)$"
"float,class:^(dialog)$" # "float,class:^(.sameboy-wrapped)$"
"float,class:^(download)$" # "float,class:^(file_progress)$"
"float,class:^(notification)$" # "float,class:^(confirm)$"
"float,class:^(error)$" # "float,class:^(dialog)$"
"float,class:^(confirmreset)$" # "float,class:^(download)$"
"float,title:^(Open File)$" # "float,class:^(notification)$"
"float,title:^(branchdialog)$" # "float,class:^(error)$"
"float,title:^(Confirm to replace files)$" # "float,class:^(confirmreset)$"
"float,title:^(File Operation Progress)$" # "float,title:^(Open File)$"
"float,title:^(float_foot)$" # "float,title:^(branchdialog)$"
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" # "float,title:^(Confirm to replace files)$"
# "float,title:^(File Operation Progress)$"
# "float,title:^(float_foot)$"
# "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
]; ];
}; };

View file

@ -10,6 +10,7 @@
glib glib
wayland wayland
direnv direnv
nwg-dock-hyprland
]; ];
# systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

View file

@ -66,6 +66,22 @@
]; ];
}; };
home = { home = {
outputs = [
{
criteria = "eDP-1";
position = "152,1440";
}
{
criteria = "LG Electronics LG ULTRAGEAR+ 507NTRLM0646";
scale = 1.0;
status = "enable";
position = "0,0";
# adaptiveSync = true;
mode = "2560x1440@144Hz";
}
];
};
home-alt = {
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";

View file

@ -0,0 +1,40 @@
{
pkgs,
config,
username,
...
}:
let
nexturl = "cloud.liv.town";
in
{
home.packages = with pkgs; [
nextcloud-client
];
systemd.user = {
services.nextcloud-autosync = {
Unit = {
Description = "Auto sync Nextcloud";
After = "network-online.target";
};
Service = {
Type = "simple";
ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /music /home/${username}/cloud/music https://${nexturl}";
TimeoutStopSec = "180";
KillMode = "process";
KillSignal = "SIGINT";
};
Install.WantedBy = [ "multi-user.target" ];
};
timers.nextcloud-autosync = {
Unit.Description = "Automatic sync files with Nextcloud when booted up after 5 minutes then rerun every 60 minutes";
Timer.OnBootSec = "5min";
Timer.OnUnitActiveSec = "30min";
Install.WantedBy = [
"multi-user.target"
"timers.target"
];
};
startServices = true;
};
}

View file

@ -37,7 +37,6 @@
foot foot
termpdfpy termpdfpy
vimv vimv
iamb
pass pass
lm_sensors lm_sensors
neofetch neofetch

View file

@ -25,7 +25,7 @@ in
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
minisign_key = "sha256-g4tRuibVyOwPMAhJ1RLCBLkuSRo0eWC0HSe227NMd4E="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md minisign_key = "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
cache_file = "/var/lib/dnscrypt/public-resolvers.md"; cache_file = "/var/lib/dnscrypt/public-resolvers.md";
}; };

View file

@ -5,5 +5,5 @@
# loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"]; # loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"];
acceleration = "rocm"; # nope, 5700XT is too old for this acceleration = "rocm"; # nope, 5700XT is too old for this
}; };
services.open-webui.enable = true; services.open-webui.enable = false;
} }