diff --git a/flake.lock b/flake.lock index d309bd2..886e6f0 100644 --- a/flake.lock +++ b/flake.lock @@ -883,7 +883,7 @@ "oisd": { "flake": false, "locked": { - "narHash": "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s=", + "narHash": "sha256-g4tRuibVyOwPMAhJ1RLCBLkuSRo0eWC0HSe227NMd4E=", "type": "file", "url": "https://big.oisd.nl/domainswild" }, diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 0832657..d374749 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -19,7 +19,6 @@ in ./../../modules/services/mullvad.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd ./../../modules/home/steam.nix - ./../../modules/services/ollama.nix # ./../../modules/services/automount.nix ]; @@ -28,7 +27,6 @@ in systemPackages = with pkgs; [ fwupd fw-ectool - monero-gui ]; etc.hosts.mode = "0700"; }; @@ -39,7 +37,6 @@ in creative.enable = true; amdgpu.enable = true; gui.enable = true; - wine.enable = true; }; services = { @@ -60,14 +57,14 @@ in # networkmanager.ethernet.macAddress = "13:37:6a:8a:ed:a4"; }; - #environment.etc."NetworkManager/conf.d/20-ethernet-mac-address.conf".text = '' - # [connection.20-ethernet-mac-addr] - # match-device=type:ethernet - # ethernet.cloned-mac-address=${mac_ethernet} + environment.etc."NetworkManager/conf.d/20-ethernet-mac-address.conf".text = '' + [connection.20-ethernet-mac-addr] + match-device=type:ethernet + ethernet.cloned-mac-address=${mac_ethernet} - # [.config] - # enable=nm-version-min:1.45 - #''; + [.config] + enable=nm-version-min:1.45 + ''; powerManagement = { enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index aaec9da..8abd449 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -10,7 +10,6 @@ ++ [ (import ./kitty.nix) ] ++ [ (import ./kanshi.nix) ] ++ [ (import ./foot.nix) ] - ++ [ (import ./nextcloud.nix) ] ++ [ (import ./nvim.nix) ] ++ [ (import ./zathura.nix) ] ++ [ (import ./packages.nix) ] diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 500712a..11607e7 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -37,7 +37,6 @@ "foot --server &" "hyprfloat &" "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &" - "nwg-dock-hyprland &" ]; input = { @@ -59,6 +58,7 @@ border_size = 2; "col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg"; "col.inactive_border" = "0x00000000"; + no_border_on_floating = false; }; group = { "col.border_active" = "rgb(ffffff) rgb(ffffff) 45deg"; @@ -103,20 +103,22 @@ decoration = { rounding = 0; - active_opacity = 1.00; - inactive_opacity = 0.75; + # active_opacity = 0.90; + # inactive_opacity = 0.90; # fullscreen_opacity = 1.0; blur = { - enabled = true; - size = 7; - passes = 3; - noise = 0.08; + enabled = false; + size = 1; + passes = 1; + # size = 4; + # passes = 2; brightness = 1; - contrast = 1.5; + contrast = 1.400; ignore_opacity = true; + noise = 0; new_optimizations = true; - xray = false; + xray = true; }; # drop_shadow = true; @@ -158,9 +160,6 @@ gesture = [ "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" ]; @@ -288,61 +287,58 @@ ]; # windowrule - # windowrule = [ - # "float,title:^(float_kitty)$" - # "center,title:^(float_kitty)$" - # "size 950 600,title:^(float_kitty)$" - # "float,title:^(float_foot)$" - # "center,title:^(float_foot)$" - # "size 950 600,title:^(float_foot)$" - # "float,title:^(Volume Control)$" - # "float,title:^(Librewolf — Sharing Indicator)$" - # "float,title:^(Export Image as PNG)$" - # "move 0 0,title:^(Librewolf — Sharing Indicator)$" - # "size 700 450,title:^(Volume Control)$" - # "move 40 55%,title:^(Volume Control)$" - # "bordersize 0, floating:0, onworkspace:w[tv1]" - # "rounding 0, floating:0, onworkspace:w[tv1]" - # "bordersize 0, floating:0, onworkspace:f[1]" - # "rounding 0, floating:0, onworkspace:f[1]" - # ]; - - ## windowrulev2 windowrule = [ - # "opacity 0.5 0.5, match:class nwg-dock-hyprland" - "no_blur on, match:class ungoogled-chromium" - "no_blur on, match:class librewolf" - # "noanim, class:^(bemenu)$" - # "float, title:^(Picture-in-Picture)$" - # "opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$" - # "pin, title:^(Picture-in-Picture)$" - # "opacity 1.0 override 1.0 override, title:^(.*imv.*)$" - # "opacity 1.0 override 1.0 override, title:^(.*mpv.*)$" - # "idleinhibit focus, class:^(mpv)$" - # "idleinhibit fullscreen, class:^(librewolf)$" - # "float,class:^(pavucontrol-qt)$" - # "fullscreen,class:Nsxiv" - # "fullscreen,title:^(*nsxiv*)$" - # "fullscreen,title:^(nsxiv)$" - # "fullscreen,class:swiv" - # "fullscreen,title:^(*swiv*)$" - # "fullscreen,title:^(swiv)$" - # "float,class:^(pavucontrol)$" - # "float,class:^(SoundWireServer)$" - # "float,class:^(.sameboy-wrapped)$" - # "float,class:^(file_progress)$" - # "float,class:^(confirm)$" - # "float,class:^(dialog)$" - # "float,class:^(download)$" - # "float,class:^(notification)$" - # "float,class:^(error)$" - # "float,class:^(confirmreset)$" - # "float,title:^(Open File)$" - # "float,title:^(branchdialog)$" - # "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" + "float,title:^(float_kitty)$" + "center,title:^(float_kitty)$" + "size 950 600,title:^(float_kitty)$" + "float,title:^(float_foot)$" + "center,title:^(float_foot)$" + "size 950 600,title:^(float_foot)$" + "float,title:^(Volume Control)$" + "float,title:^(Librewolf — Sharing Indicator)$" + "float,title:^(Export Image as PNG)$" + "move 0 0,title:^(Librewolf — Sharing Indicator)$" + "size 700 450,title:^(Volume Control)$" + "move 40 55%,title:^(Volume Control)$" + "bordersize 0, floating:0, onworkspace:w[tv1]" + "rounding 0, floating:0, onworkspace:w[tv1]" + "bordersize 0, floating:0, onworkspace:f[1]" + "rounding 0, floating:0, onworkspace:f[1]" + ]; + + # windowrulev2 + windowrulev2 = [ + "noanim, class:^(bemenu)$" + "float, title:^(Picture-in-Picture)$" + "opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$" + "pin, title:^(Picture-in-Picture)$" + "opacity 1.0 override 1.0 override, title:^(.*imv.*)$" + "opacity 1.0 override 1.0 override, title:^(.*mpv.*)$" + "idleinhibit focus, class:^(mpv)$" + "idleinhibit fullscreen, class:^(librewolf)$" + "float,class:^(pavucontrol-qt)$" + "fullscreen,class:Nsxiv" + "fullscreen,title:^(*nsxiv*)$" + "fullscreen,title:^(nsxiv)$" + "fullscreen,class:swiv" + "fullscreen,title:^(*swiv*)$" + "fullscreen,title:^(swiv)$" + "float,class:^(pavucontrol)$" + "float,class:^(SoundWireServer)$" + "float,class:^(.sameboy-wrapped)$" + "float,class:^(file_progress)$" + "float,class:^(confirm)$" + "float,class:^(dialog)$" + "float,class:^(download)$" + "float,class:^(notification)$" + "float,class:^(error)$" + "float,class:^(confirmreset)$" + "float,title:^(Open File)$" + "float,title:^(branchdialog)$" + "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" ]; }; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 57ea3cb..3903d04 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -10,7 +10,6 @@ glib wayland direnv - nwg-dock-hyprland ]; # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; wayland.windowManager.hyprland = { diff --git a/modules/home/kanshi.nix b/modules/home/kanshi.nix index 1d96caf..267c7b9 100644 --- a/modules/home/kanshi.nix +++ b/modules/home/kanshi.nix @@ -66,22 +66,6 @@ ]; }; 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 = [ { criteria = "eDP-1"; diff --git a/modules/home/nextcloud.nix b/modules/home/nextcloud.nix deleted file mode 100644 index 7e4d10f..0000000 --- a/modules/home/nextcloud.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - 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; - }; -} diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 7fe86cd..be26407 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -37,6 +37,7 @@ foot termpdfpy vimv + iamb pass lm_sensors neofetch diff --git a/modules/security/dnscrypt.nix b/modules/security/dnscrypt.nix index 3541520..5484f5a 100644 --- a/modules/security/dnscrypt.nix +++ b/modules/security/dnscrypt.nix @@ -25,7 +25,7 @@ in "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" ]; - minisign_key = "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md + minisign_key = "sha256-g4tRuibVyOwPMAhJ1RLCBLkuSRo0eWC0HSe227NMd4E="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md cache_file = "/var/lib/dnscrypt/public-resolvers.md"; }; diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 928725f..03dd175 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -5,5 +5,5 @@ # loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"]; acceleration = "rocm"; # nope, 5700XT is too old for this }; - services.open-webui.enable = false; + services.open-webui.enable = true; }