diff options
| -rw-r--r-- | machines/vm-aarch64.nix | 1 | ||||
| -rw-r--r-- | overlays/suckless.nix | 3 | ||||
| -rw-r--r-- | profiles/core/home.nix | 37 | ||||
| -rw-r--r-- | profiles/graphical/suckless.nix | 184 |
4 files changed, 119 insertions, 106 deletions
diff --git a/machines/vm-aarch64.nix b/machines/vm-aarch64.nix index 67af835..42c9d07 100644 --- a/machines/vm-aarch64.nix +++ b/machines/vm-aarch64.nix @@ -53,7 +53,6 @@ with lib; { (ffmpeg.override { withXcb = true; }) - surf mpv ]; diff --git a/overlays/suckless.nix b/overlays/suckless.nix index 9bed46b..8fd5529 100644 --- a/overlays/suckless.nix +++ b/overlays/suckless.nix @@ -21,4 +21,7 @@ src = home + "/mut/surf"; version = "2.1-ivi-vink.1"; })); + tabbed = prev.tabbed.overrideAttrs (oldAttrs: { + src = home + "/mut/tabbed"; + }); }) diff --git a/profiles/core/home.nix b/profiles/core/home.nix index 01ce9ec..b80749e 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -1,4 +1,5 @@ { + inputs, machine, lib, config, @@ -20,25 +21,25 @@ with lib; { mimeApps = optionalAttrs (!machine.isDarwin) { enable = true; defaultApplications = { - "text/x-shellscript" = ["text.desktop"]; + "text/x-shellscript" = ["text.desktop"]; "application/x-bittorrent" = ["torrent.desktop"]; - "text/plain" = ["text.desktop"]; - "application/postscript" = ["pdf.desktop"]; - "application/pdf" = ["pdf.desktop"]; - "image/png" = ["img.desktop"]; - "image/jpeg" = ["img.desktop"]; - "image/gif" = ["img.desktop"]; - "application/rss+xml" = ["rss.desktop"]; - "video/x-matroska" = ["video.desktop"]; - "video/mp4" = ["video.desktop"]; - "x-scheme-handler/lbry" = ["lbry.desktop"]; - "inode/directory" = ["file.desktop"]; - "application/x-ica" = ["wfica.desktop"]; - "x-scheme-handler/magnet" = ["torrent.desktop"]; - "x-scheme-handler/mailto" = ["mail.desktop"]; + "text/plain" = ["text.desktop"]; + "application/postscript" = ["pdf.desktop"]; + "application/pdf" = ["pdf.desktop"]; + "image/png" = ["img.desktop"]; + "image/jpeg" = ["img.desktop"]; + "image/gif" = ["img.desktop"]; + "application/rss+xml" = ["rss.desktop"]; + "video/x-matroska" = ["video.desktop"]; + "video/mp4" = ["video.desktop"]; + "x-scheme-handler/lbry" = ["lbry.desktop"]; + "inode/directory" = ["file.desktop"]; + "application/x-ica" = ["wfica.desktop"]; + "x-scheme-handler/magnet" = ["torrent.desktop"]; + "x-scheme-handler/mailto" = ["mail.desktop"]; "x-scheme-handler/msteams" = ["teams.desktop"]; - "x-scheme-handler/http" = ["surf.desktop"]; - "x-scheme-handler/https" = ["surf.desktop"]; + "x-scheme-handler/http" = ["surf.desktop"]; + "x-scheme-handler/https" = ["surf.desktop"]; }; }; desktopEntries = with pkgs; @@ -46,7 +47,7 @@ with lib; { surf = { type = "Application"; name = "Browser"; - exec = "${surf}/bin/surf %u"; + exec = "${inputs.self}/mut/surf/surf-open.sh %u"; }; text = { type = "Application"; diff --git a/profiles/graphical/suckless.nix b/profiles/graphical/suckless.nix index 9d9617f..4cf4c3a 100644 --- a/profiles/graphical/suckless.nix +++ b/profiles/graphical/suckless.nix @@ -4,96 +4,106 @@ lib, machine, ... -}: with lib; mkIf (!machine.isDarwin) { - nixpkgs.overlays = [(import (self + "/overlays/suckless.nix") {inherit pkgs; home = self;})]; - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; - services.libinput.enable = true; - hm = { - xsession = { - enable = true; - }; - services.picom = { - enable = true; - activeOpacity = 1; - inactiveOpacity = 0.7; - opacityRules = [ - "100:class_g = 'Wfica'" - "100:class_g = 'dwm'" - "100:class_g = 'Zathura'" - "100:name *= 'Firefox'" - "100:name *= 'mpv'" - "100:name *= 'LibreWolf'" - "100:name *= 'Steam'" - "100:name *= 'Risk of Rain'" - "100:name *= 'KVM'" - ]; - settings = { - inactive-opacity-override = false; - frame-opacity = 1; +}: +with lib; + mkIf (!machine.isDarwin) { + nixpkgs.overlays = [ + (import (self + "/overlays/suckless.nix") { + inherit pkgs; + home = self; + }) + ]; + services.xserver.enable = true; + services.xserver.displayManager.startx.enable = true; + services.libinput.enable = true; + hm = { + xsession = { + enable = true; }; - }; - services.dunst = { - enable = true; - settings = { - global = { - monitor = 0; - follow = "keyboard"; - width = 370; - height = 350; - offset = "0x19"; - padding = 2; - horizontal_padding = 2; - transparency = 0; - font = "Monospace 12"; - format = "<b>%s</b>\\n%b"; + services.picom = { + enable = true; + activeOpacity = 1; + inactiveOpacity = 0.7; + opacityRules = [ + "100:class_g = 'Wfica'" + "100:class_g = 'dwm'" + "100:class_g = 'Zathura'" + "100:name *= 'Firefox'" + "100:name *= 'mpv'" + "100:name *= 'LibreWolf'" + "100:name *= 'Steam'" + "100:name *= 'Risk of Rain'" + "100:name *= 'KVM'" + ]; + settings = { + inactive-opacity-override = false; + frame-opacity = 1; }; - urgency_low = { - background = "#1d2021"; - foreground = "#928374"; - timeout = 3; - }; - urgency_normal = { - foreground = "#ebdbb2"; - background = "#458588"; - timeout = 5; - }; - urgency_critical = { - background = "#1cc24d"; - foreground = "#ebdbb2"; - frame_color = "#fabd2f"; - timeout = 10; + }; + services.dunst = { + enable = true; + settings = { + global = { + monitor = 0; + follow = "keyboard"; + width = 370; + height = 350; + offset = "0x19"; + padding = 2; + horizontal_padding = 2; + transparency = 0; + font = "Monospace 12"; + format = "<b>%s</b>\\n%b"; + }; + urgency_low = { + background = "#1d2021"; + foreground = "#928374"; + timeout = 3; + }; + urgency_normal = { + foreground = "#ebdbb2"; + background = "#458588"; + timeout = 5; + }; + urgency_critical = { + background = "#1cc24d"; + foreground = "#ebdbb2"; + frame_color = "#fabd2f"; + timeout = 10; + }; }; }; - }; - home.packages = with pkgs; [ - libnotify - sxiv - st - dwm - dwmblocks - pywal - inotify-tools + home.packages = with pkgs; [ + libnotify + pywal + inotify-tools - dmenu - # librewolf - ungoogled-chromium - xclip - xdotool - maim - asciinema - asciinema-agg - fontconfig - surfraw - ]; - }; - fonts = { - fontconfig = { - enable = true; + dwm + dwmblocks + sxiv + st + dmenu + tabbed + surfraw + surf + + # librewolf + ungoogled-chromium + xclip + xdotool + maim + asciinema + asciinema-agg + fontconfig + ]; }; - packages = with pkgs; [ - nerd-fonts.fira-code - nerd-fonts.jetbrains-mono - ]; - }; -} + fonts = { + fontconfig = { + enable = true; + }; + packages = with pkgs; [ + nerd-fonts.fira-code + nerd-fonts.jetbrains-mono + ]; + }; + } |
