diff --git a/flake.lock b/flake.lock index 2633ff2..34d141f 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1670682948, - "narHash": "sha256-yFg8U4D+qD9UQXhpAXrl9Ksj16zrCLOgahMtT9QS2Y8=", + "lastModified": 1669146650, + "narHash": "sha256-9FCZt15lrL/aeDaUBFh+U2A4PlTj0jUKbjUbGIFUBik=", "owner": "arkenfox", "repo": "user.js", - "rev": "7135907b2fe13fa55eb8ebf162603037f83e353c", + "rev": "6789dc7fefac5594d958a065463b4dc9d265c089", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1672110422, - "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=", + "lastModified": 1669439968, + "narHash": "sha256-VlQsxaHruFN29FOvRHUYecySRU9UzFqqpshfgoGxKes=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "06d88ea2a783a7c563ce57e62d794313ae1e4855", + "rev": "838bd1e55d9168d2df9dc0331565f884c3be3250", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1671476278, - "narHash": "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=", + "lastModified": 1669300261, + "narHash": "sha256-ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=", "owner": "wfxr", "repo": "forgit", - "rev": "ffda73bac3a435a9bbc6f29f2fd98517fbe5d9db", + "rev": "98321ef05a10fe1b536ae88e283339e769866e24", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671966569, - "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", + "lastModified": 1669328018, + "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", + "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", "type": "github" }, "original": { @@ -232,17 +232,15 @@ }, "hyprland": { "inputs": { - "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs", - "wlroots": "wlroots", - "xdph": "xdph" + "wlroots": "wlroots" }, "locked": { - "lastModified": 1672057622, - "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=", + "lastModified": 1669420836, + "narHash": "sha256-5d6hfIs3Rxs2au79yI6JED0/nkqot8NLBgrrZLX+yVk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "545e63d1dd14c76e9faad7839ad255dc9ead4cd8", + "rev": "f45ec2497735851cd3d361278abaa7e58ec08b2a", "type": "github" }, "original": { @@ -251,63 +249,13 @@ "type": "github" } }, - "hyprland-protocols": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprpaper": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1671404096, - "narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=", - "owner": "hyprwm", - "repo": "hyprpaper", - "rev": "60013ee65566ec7601c367829da2560d7b8638fa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpaper", - "type": "github" - } - }, "master": { "locked": { - "lastModified": 1672128529, - "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=", + "lastModified": 1669458704, + "narHash": "sha256-wpaBMBfjSDCnw4F7A1xBdqy2nW7dvjk3coISy+tTmX4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9", + "rev": "3200a569242cdc75c191fc28b6adefe60315e921", "type": "github" }, "original": { @@ -318,11 +266,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { @@ -334,11 +282,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1671271954, - "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "lastModified": 1668984258, + "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", "type": "github" }, "original": { @@ -350,27 +298,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1658826464, - "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1672057183, - "narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=", + "lastModified": 1669387357, + "narHash": "sha256-z1azVj/5Em5kGhh9OgBOsjTEgMab7hXL/aRilH9tzyI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b139e44d78c36c69bcbb825b20dbfa51e7738347", + "rev": "55b3f68bda6d4f4dc6092eed0508063f154fa4fd", "type": "github" }, "original": { @@ -380,13 +312,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1671271357, - "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", + "lastModified": 1668994630, + "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd", + "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", "type": "github" }, "original": { @@ -426,15 +358,15 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1672050129, - "narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=", + "lastModified": 1669152228, + "narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c", + "rev": "078b0dee35e2da01334af682ec347463b70a9986", "type": "github" }, "original": { @@ -453,9 +385,8 @@ "home-manager": "home-manager", "howdy": "howdy", "hyprland": "hyprland", - "hyprpaper": "hyprpaper", "master": "master", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", "utils": "utils_2" @@ -463,11 +394,11 @@ }, "stable": { "locked": { - "lastModified": 1671883564, - "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", + "lastModified": 1669379897, + "narHash": "sha256-XM3xBfQD5tOtV4KAhQHyh53cJdqkLwotZa5JJIUjbQc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682", + "rev": "8690906c4d80db5d85f52313a8487bf2e7b8d4c5", "type": "github" }, "original": { @@ -514,11 +445,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1671723353, - "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=", + "lastModified": 1668785720, + "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", "owner": "wlroots", "repo": "wlroots", - "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6", + "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", "type": "gitlab" }, "original": { @@ -527,28 +458,6 @@ "repo": "wlroots", "type": "gitlab" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671837878, - "narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e47f4cec698080768821b271510985ab94a37e91", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1c93a22..5aff38d 100644 --- a/flake.nix +++ b/flake.nix @@ -52,8 +52,6 @@ }; hyprland.url = "github:hyprwm/Hyprland"; - - hyprpaper.url = "github:hyprwm/hyprpaper"; }; outputs = @@ -61,32 +59,20 @@ utils.lib.mkFlake { inherit self inputs; - supportedSystems = [ "x86_64-linux" ]; - channelsConfig.allowUnfree = true; ################ ### Overlays ### ################ - overlay = import ./overlays { inherit inputs; }; - + overlays.default = import ./overlays { inherit inputs; }; channels.nixpkgs.overlaysBuilder = channels: [ - self.overlay - inputs.agenix.overlay + self.overlays.default + inputs.utils.overlay inputs.emacs-overlay.overlay inputs.howdy.overlays.default - inputs.hyprland.overlays.default - inputs.hyprpaper.overlays.default - inputs.utils.overlay ]; - # overlays = utils.lib.exportOverlays { - # inherit (self) pkgs inputs; - # }; - - overlays.default = self.overlay; - ############### ### Modules ### ############### @@ -119,7 +105,6 @@ self.nixosModules.gaming ]; - hosts.nixos-desktop.modules = [ ./hosts/nixos-desktop self.nixosModules.desktop @@ -151,8 +136,6 @@ shellcheck.enable = true; }; }; - - packages = utils.lib.exportPackages self.overlays channels; }; }; } diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 08e96e6..6bccdc3 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -93,7 +93,6 @@ with lib; hut lazygit neofetch - ripgrep tmux ttyper up @@ -103,7 +102,7 @@ with lib; fonts.fonts = with pkgs; [ (nerdfonts.override { - fonts = [ "FiraCode" ]; + fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; }) ]; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index cc97e51..eaec2b7 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -95,6 +95,7 @@ with lib; { mullvad.enable = true; openconnect.enable = true; openvpn.enable = true; + picom.enable = true; printing.enable = true; redshift.enable = true; }; @@ -121,15 +122,10 @@ with lib; { vlc thunderbird plantuml - - jetbrains.pycharm-professional - - synology-drive-client ]; - programs.chromium.enable = true; - home-manager.users.moritz = { + services.unclutter.enable = true; services.nextcloud-client = { enable = true; startInBackground = true; diff --git a/modules/profiles/gaming.nix b/modules/profiles/gaming.nix index f6d6ac2..e5b542d 100644 --- a/modules/profiles/gaming.nix +++ b/modules/profiles/gaming.nix @@ -8,6 +8,5 @@ lutris legendary-gl heroic - mangohud ]; } diff --git a/modules/programs/bspwm/default.nix b/modules/programs/bspwm/default.nix index 78c64a6..4ecf68c 100644 --- a/modules/programs/bspwm/default.nix +++ b/modules/programs/bspwm/default.nix @@ -51,7 +51,6 @@ in extraConfig = builtins.readFile ./bspwmrc; }; services = { - unclutter.enable = true; sxhkd = { enable = true; extraConfig = builtins.readFile ./sxhkdrc; diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index c754558..0059324 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -8,7 +8,7 @@ with lib; let cfg = config.my.programs.emacs; - myEmacs = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages + myEmacs = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (epkgs: [ epkgs.vterm ])); in { @@ -16,25 +16,72 @@ in config = mkIf cfg.enable { my.shell.aliases = { - emacs = "emacsclient -nw -a 'emacs -nw'"; + emacs = "emacsclient -t -a 'emacs -t'"; }; - fonts.fonts = with pkgs; [ - emacs-all-the-icons-fonts - (iosevka-bin.override { variant = "aile"; }) - ]; - users.users.moritz.packages = with pkgs; [ + fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; + environment.systemPackages = with pkgs; [ + ### Emacs itself + binutils # native-comp needs 'as', provided by this myEmacs + ### Doom dependencies + git (ripgrep.override { withPCRE2 = true; }) - # flyspell + gnutls # for TLS connectivity + + ### Optional dependencies + fd # faster projectile indexing + imagemagick # for image-dired + zstd # for undo-fu-session/undo-tree compression + + ### Module dependencies + ## :checkers + # spell (hunspellWithDicts [ hunspellDicts.en_GB-ize hunspellDicts.en_US hunspellDicts.de_DE ]) - # language servers - nil + # grammar + languagetool + + ## : tools + # lookup & org +roam + sqlite + gcc # HACK to get emacsqlite binary + wordnet + graphviz + + ## :lang + # latex & org (latex previews) + texlive.combined.scheme-full + texlab + + # nix + nixfmt # for formating nix + rnix-lsp + + # markdown & org +pandoc + pandoc + + # python + nodePackages.pyright + + # sh + nodePackages.bash-language-server + + ## :email + # mu4e + mu + isync + + ## :app + # everywhere + xdotool + xorg.xwininfo + xclip + xorg.xprop ]; home-manager.users.moritz = { home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 0fcaa86..51562a3 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -3,12 +3,6 @@ , pkgs , ... }: - -with lib; -let - mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}"; - mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules); -in '' # # Please note not all available settings / options are set here. @@ -32,7 +26,7 @@ in kb_layout = de,us kb_variant = kb_model = - kb_options = grp:win_space_toggle,caps:escape + kb_options = grp:alt_shift_toggle kb_rules = follow_mouse = 1 @@ -53,31 +47,29 @@ in col.active_border = rgba(1affffee) col.inactive_border = rgba(595959aa) - cursor_inactive_timeout = 1 - layout = dwindle } decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 3 + rounding = 5 + inactive_opacity = 0.98 blur = yes - blur_size = 3 - blur_passes = 3 + blur_size = 8 + blur_passes = 1 blur_new_optimizations = on drop_shadow = yes - shadow_range = 10 - shadow_render_power = 2 - - # col.shadow = rgba(1a1a1aee) + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) } animations { enabled = yes - # Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more bezier = myBezier, 0.45, 0, 0.55, 1 @@ -98,7 +90,6 @@ in master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more no_gaps_when_only = true - new_is_master = false } gestures { @@ -112,21 +103,13 @@ in sensitivity = -0.5 } + # Example windowrule v1 + # windowrule = float, ^(kitty)$ # Example windowrule v2 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ + windowrulev2 = float,class:^([rR]ofi)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - # Firefox Sharing Indicator - ${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator)$"]} - - # Rofi - ${mkRules ["float" "opacity 0.95 0.95"] ["class:^([rR]ofi)$"]} - - windowrulev2 = opacity 0.95 0.95,floating:1 - - # Games - # ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]} - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -136,11 +119,10 @@ in bind = $mainMod, D, exec, hyprctl keyword general:layout dwindle bind = $mainMod, E, exec, emacsclient -c -a emacs bind = $mainMod, F, togglefloating, - bind = $mainMod SHIFT, F, fullscreen, bind = $mainMod, M, exec, hyprctl keyword general:layout master bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, Q, killactive, - bind = $mainMod, R, exec, rofi -show combi -normal-window + bind = $mainMod, R, exec, rofi -show combi bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard bind = $mainMod, B, exec, rofi-bluetooth bind = $mainMod, RETURN, exec, kitty diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index b46c677..42dec13 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -9,7 +9,9 @@ with lib; let cfg = config.my.programs.hyprland; - hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; }; + hyprland-default = inputs.hyprland.packages.${pkgs.system}.default; + hyprland-nvidia = hyprland-default.override { nvidiaPatches = true; }; + hyprland = if cfg.nvidiaSupport then hyprland-nvidia else hyprland-default; in { options.my.programs.hyprland = { @@ -24,10 +26,7 @@ in programs.waybar = { enable = true; package = pkgs.waybar-hyprland; - systemd = { - enable = true; - target = "hyprland-session.target"; - }; + systemd.enable = true; settings = { mainBar = { layer = "top"; @@ -80,27 +79,9 @@ in } ]; }; + # start swayidle as part of hyprland, not sway systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; - - xdg.configFile."hypr/hyprpaper.conf" = { - text = - let - setWallpaper = wallpaper: '' - preload = ${wallpaper} - wallpaper = ,${wallpaper} - ''; - in - setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png"; - onChange = "${pkgs.systemd}/bin/systemctl restart --user hyprpaper.service"; - }; - }; - systemd.user.services.hyprpaper = { - enable = true; - path = [ pkgs.hyprpaper ]; - wantedBy = [ "hyprland-session.target" ]; - after = [ "display-manager.service" ]; - script = "hyprpaper"; }; users.users.moritz.packages = with pkgs; [ @@ -109,8 +90,6 @@ in pamixer playerctl brightnessctl - slurp - grim ]; security.pam.services.swaylock = { }; @@ -141,33 +120,22 @@ in __GL_VRR_ALLOWED = "0"; } else { }); - services = { - dbus.enable = true; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - xserver = { - enable = true; - displayManager = { - gdm.enable = true; - autoLogin = { - enable = true; - user = "moritz"; - }; - defaultSession = "hyprland"; - sessionPackages = [ hyprland ]; + services.xserver = { + enable = true; + displayManager = { + gdm.enable = true; + autoLogin = { + enable = true; + user = "moritz"; }; + defaultSession = "hyprland"; + sessionPackages = [ hyprland ]; }; }; - security.rtkit.enable = true; xdg.portal = { enable = true; wlr.enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; }; } diff --git a/modules/programs/logseq.nix b/modules/programs/logseq.nix index 35349b3..948e39c 100644 --- a/modules/programs/logseq.nix +++ b/modules/programs/logseq.nix @@ -13,7 +13,7 @@ in config = mkIf cfg.enable { users.users.moritz.packages = with pkgs; [ - logseq-wayland + logseq ]; xdg.mime.defaultApplications."x-scheme-handler/logseq" = "logseq.desktop"; }; diff --git a/overlays/default.nix b/overlays/default.nix index 071a899..300887c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,22 +1,12 @@ { inputs }: final: prev: { - logseq-wayland = prev.symlinkJoin { - name = "logseq-wayland"; - paths = [ prev.logseq ]; - nativeBuildInputs = [ prev.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/logseq \ - --add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland" - ''; - }; - + nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; + agenix = inputs.agenix.defaultPackage."${prev.system}"; waybar-hyprland = prev.waybar.overrideAttrs (old: { - pname = "${old.pname}-hyprland"; postPatch = old.postPatch or "" + '' sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp ''; mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; }); - master = import inputs.master { inherit (prev) system; config.allowUnfree = true; diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age index 70909cf..29c1542 100644 Binary files a/secrets/ssh-home.age and b/secrets/ssh-home.age differ