From 6b925636cc22e33114f063aca07d9441a74318ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 Dec 2022 12:37:57 +0100 Subject: [PATCH 1/9] add logseq wrapped for wayland --- modules/programs/logseq.nix | 2 +- overlays/default.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/programs/logseq.nix b/modules/programs/logseq.nix index 948e39c..35349b3 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 + logseq-wayland ]; xdg.mime.defaultApplications."x-scheme-handler/logseq" = "logseq.desktop"; }; diff --git a/overlays/default.nix b/overlays/default.nix index 300887c..f9685ad 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,17 @@ { inputs }: final: prev: { nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; agenix = inputs.agenix.defaultPackage."${prev.system}"; + + logseq-wayland = prev.symlinkJoin { + name = "logseq"; + paths = [ prev.logseq ]; + nativeBuildInputs = [ prev.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/logseq \ + --add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland" + ''; + }; + waybar-hyprland = prev.waybar.overrideAttrs (old: { 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 From 8470cbe18243d8bdd0a27b9705b0785458bd60b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 Dec 2022 12:39:07 +0100 Subject: [PATCH 2/9] update emacs for custom emacs init --- modules/programs/emacs.nix | 67 ++++++-------------------------------- 1 file changed, 10 insertions(+), 57 deletions(-) diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 0059324..c754558 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 emacs).emacsWithPackages + myEmacs = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.vterm ])); in { @@ -16,72 +16,25 @@ in config = mkIf cfg.enable { my.shell.aliases = { - emacs = "emacsclient -t -a 'emacs -t'"; + emacs = "emacsclient -nw -a 'emacs -nw'"; }; - fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; - environment.systemPackages = with pkgs; [ - ### Emacs itself - binutils # native-comp needs 'as', provided by this + fonts.fonts = with pkgs; [ + emacs-all-the-icons-fonts + (iosevka-bin.override { variant = "aile"; }) + ]; + users.users.moritz.packages = with pkgs; [ myEmacs - ### Doom dependencies - git (ripgrep.override { withPCRE2 = true; }) - 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 + # flyspell (hunspellWithDicts [ hunspellDicts.en_GB-ize hunspellDicts.en_US hunspellDicts.de_DE ]) - # 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 + # language servers + nil ]; home-manager.users.moritz = { home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; From a856565ac98611607cda3e5b4d04d85ccf6fe9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 Dec 2022 12:39:24 +0100 Subject: [PATCH 3/9] update hyprland conf --- flake.nix | 3 ++ modules/programs/hyprland/config.nix | 44 ++++++++++++++++------- modules/programs/hyprland/default.nix | 51 +++++++++++++++++++++------ 3 files changed, 75 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index 5aff38d..8710075 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,8 @@ }; hyprland.url = "github:hyprwm/Hyprland"; + + hyprpaper.url = "github:hyprwm/hyprpaper"; }; outputs = @@ -105,6 +107,7 @@ self.nixosModules.gaming ]; + hosts.nixos-desktop.modules = [ ./hosts/nixos-desktop self.nixosModules.desktop diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 51562a3..0fcaa86 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -3,6 +3,12 @@ , 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. @@ -26,7 +32,7 @@ kb_layout = de,us kb_variant = kb_model = - kb_options = grp:alt_shift_toggle + kb_options = grp:win_space_toggle,caps:escape kb_rules = follow_mouse = 1 @@ -47,29 +53,31 @@ 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 = 5 - inactive_opacity = 0.98 + rounding = 3 blur = yes - blur_size = 8 - blur_passes = 1 + blur_size = 3 + blur_passes = 3 blur_new_optimizations = on drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + shadow_range = 10 + shadow_render_power = 2 + + # col.shadow = rgba(1a1a1aee) } animations { enabled = yes - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + # Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more bezier = myBezier, 0.45, 0, 0.55, 1 @@ -90,6 +98,7 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more no_gaps_when_only = true + new_is_master = false } gestures { @@ -103,13 +112,21 @@ 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 @@ -119,10 +136,11 @@ 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 + bind = $mainMod, R, exec, rofi -show combi -normal-window 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 42dec13..064c538 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -79,9 +79,28 @@ 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"; + setWallpaper "/home/moritz/.config/wallpapers/mario.gif"; + onChange = "${pkgs.systemd}/bin/systemctl restart --user hyprpaper.service"; + }; + }; + systemd.user.services.hyprpaper = { + enable = true; + path = [ pkgs.hyprpaper ]; + wantedBy = [ "display-manager.service" ]; + after = [ "display-manager.service" ]; + script = "hyprpaper"; }; users.users.moritz.packages = with pkgs; [ @@ -90,6 +109,8 @@ in pamixer playerctl brightnessctl + slurp + grim ]; security.pam.services.swaylock = { }; @@ -120,18 +141,28 @@ in __GL_VRR_ALLOWED = "0"; } else { }); - services.xserver = { - enable = true; - displayManager = { - gdm.enable = true; - autoLogin = { - enable = true; - user = "moritz"; + 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 ]; }; - defaultSession = "hyprland"; - sessionPackages = [ hyprland ]; }; }; + security.rtkit.enable = true; xdg.portal = { enable = true; From 050d6d90c1ec9a31d4f8d73d6d4c1f81036f0676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 Dec 2022 12:40:37 +0100 Subject: [PATCH 4/9] minor changes --- modules/profiles/base.nix | 3 ++- modules/profiles/desktop.nix | 7 ++++++- modules/profiles/gaming.nix | 1 + modules/programs/bspwm/default.nix | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 6bccdc3..08e96e6 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -93,6 +93,7 @@ with lib; hut lazygit neofetch + ripgrep tmux ttyper up @@ -102,7 +103,7 @@ with lib; fonts.fonts = with pkgs; [ (nerdfonts.override { - fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; + fonts = [ "FiraCode" ]; }) ]; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index eaec2b7..835e14b 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -122,10 +122,15 @@ 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 e5b542d..f6d6ac2 100644 --- a/modules/profiles/gaming.nix +++ b/modules/profiles/gaming.nix @@ -8,5 +8,6 @@ lutris legendary-gl heroic + mangohud ]; } diff --git a/modules/programs/bspwm/default.nix b/modules/programs/bspwm/default.nix index 4ecf68c..78c64a6 100644 --- a/modules/programs/bspwm/default.nix +++ b/modules/programs/bspwm/default.nix @@ -51,6 +51,7 @@ in extraConfig = builtins.readFile ./bspwmrc; }; services = { + unclutter.enable = true; sxhkd = { enable = true; extraConfig = builtins.readFile ./sxhkdrc; From 8e70a05d6d227f10991d906334d2b0e3a40baa04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 23 Dec 2022 12:40:47 +0100 Subject: [PATCH 5/9] update inputs --- flake.lock | 182 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 145 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 34d141f..1820dfc 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1669146650, - "narHash": "sha256-9FCZt15lrL/aeDaUBFh+U2A4PlTj0jUKbjUbGIFUBik=", + "lastModified": 1670266131, + "narHash": "sha256-hf+fLTT67YWJPTkKgLxyP6KRAhiCaxuGY7GLltTyZvc=", "owner": "arkenfox", "repo": "user.js", - "rev": "6789dc7fefac5594d958a065463b4dc9d265c089", + "rev": "e4a85c30c129cf664cc8a39705bb070fce828d33", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1669439968, - "narHash": "sha256-VlQsxaHruFN29FOvRHUYecySRU9UzFqqpshfgoGxKes=", + "lastModified": 1670580643, + "narHash": "sha256-1D1mObqPnPJUxDZP2pOEvlYpEHq2oT2wqwwe46Jh24c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "838bd1e55d9168d2df9dc0331565f884c3be3250", + "rev": "ff0c1ead7f28972ba4b63ffc9353a132b163386a", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1669300261, - "narHash": "sha256-ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=", + "lastModified": 1670576098, + "narHash": "sha256-IUM4SbJTzL5pG2gCTkGUPbz+ujv/ENC/Gt0bpJjvUNE=", "owner": "wfxr", "repo": "forgit", - "rev": "98321ef05a10fe1b536ae88e283339e769866e24", + "rev": "bfea8cf48523b3d6fa72d131e81769b68f43e3a7", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669328018, - "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", + "lastModified": 1670513770, + "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", "owner": "nix-community", "repo": "home-manager", - "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", + "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", "type": "github" }, "original": { @@ -232,15 +232,17 @@ }, "hyprland": { "inputs": { + "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs", - "wlroots": "wlroots" + "wlroots": "wlroots", + "xdph": "xdph" }, "locked": { - "lastModified": 1669420836, - "narHash": "sha256-5d6hfIs3Rxs2au79yI6JED0/nkqot8NLBgrrZLX+yVk=", + "lastModified": 1670534695, + "narHash": "sha256-YNPiXsaZSQvetwsnrHuRxQnm8t9p5y9Nd3lRW6bPVxM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f45ec2497735851cd3d361278abaa7e58ec08b2a", + "rev": "726732244a5d51a0da54219174c13f4428017b79", "type": "github" }, "original": { @@ -249,13 +251,79 @@ "type": "github" } }, + "hyprland-protocols": { + "flake": false, + "locked": { + "lastModified": 1670258048, + "narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "flake": false, + "locked": { + "lastModified": 1670185345, + "narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4623a404c091e64743ba310199bb380ec52f1936", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprpaper": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1669635788, + "narHash": "sha256-xlJ4hbUm3KULq4daqopi+eAv1u57uLlTare04HL3X/c=", + "owner": "hyprwm", + "repo": "hyprpaper", + "rev": "ab85578dce442b80aa3378fe0304e6cb6f16f593", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpaper", + "type": "github" + } + }, + "jetbrains-plugins": { + "locked": { + "lastModified": 1670234247, + "narHash": "sha256-CepwZGno3XkePl3wBbFUcwsf+grnXTbKIujaCVaEnG0=", + "owner": "MoritzBoehme", + "repo": "nixpkgs", + "rev": "96386b1df1ad0099de5f74dea941d0191fbd3800", + "type": "github" + }, + "original": { + "owner": "MoritzBoehme", + "ref": "jetbrains-plugins", + "repo": "nixpkgs", + "type": "github" + } + }, "master": { "locked": { - "lastModified": 1669458704, - "narHash": "sha256-wpaBMBfjSDCnw4F7A1xBdqy2nW7dvjk3coISy+tTmX4=", + "lastModified": 1670583233, + "narHash": "sha256-sa0XbJmnJEmQp/Uvjh8lprAazR0UdCoVv8n6EeeG1aQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3200a569242cdc75c191fc28b6adefe60315e921", + "rev": "539954efab2b023064efd3edeb7912b71193acfd", "type": "github" }, "original": { @@ -266,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668765800, - "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", + "lastModified": 1670064435, + "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", + "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "type": "github" }, "original": { @@ -298,11 +366,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669387357, - "narHash": "sha256-z1azVj/5Em5kGhh9OgBOsjTEgMab7hXL/aRilH9tzyI=", + "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": 1670525689, + "narHash": "sha256-YIjGzxrRQa5LYO0zlnH/ardcwXsRgsnHe3TkGkvCxbc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55b3f68bda6d4f4dc6092eed0508063f154fa4fd", + "rev": "f21f11aa2a02cb78651c6d57546c7d7541f9240c", "type": "github" }, "original": { @@ -312,7 +396,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1668994630, "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", @@ -358,15 +442,15 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669152228, - "narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", + "lastModified": 1670413394, + "narHash": "sha256-M7sWqrKtOqUv9euX1t3HCxis8cPy9MNiZxQmUf0KF1o=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "078b0dee35e2da01334af682ec347463b70a9986", + "rev": "1303a1a76e9eb074075bfe566518c413f6fc104e", "type": "github" }, "original": { @@ -385,8 +469,10 @@ "home-manager": "home-manager", "howdy": "howdy", "hyprland": "hyprland", + "hyprpaper": "hyprpaper", + "jetbrains-plugins": "jetbrains-plugins", "master": "master", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", "utils": "utils_2" @@ -394,11 +480,11 @@ }, "stable": { "locked": { - "lastModified": 1669379897, - "narHash": "sha256-XM3xBfQD5tOtV4KAhQHyh53cJdqkLwotZa5JJIUjbQc=", + "lastModified": 1670543317, + "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8690906c4d80db5d85f52313a8487bf2e7b8d4c5", + "rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19", "type": "github" }, "original": { @@ -445,11 +531,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1668785720, - "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", + "lastModified": 1669925104, + "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", "owner": "wlroots", "repo": "wlroots", - "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", + "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", "type": "gitlab" }, "original": { @@ -458,6 +544,28 @@ "repo": "wlroots", "type": "gitlab" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670202338, + "narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "af840a9e0947a79a37a95a9f62062653721e43fa", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", From fc1084b0caab6f4cca9ac3cce6f48e7dcd633280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 30 Dec 2022 18:58:13 +0100 Subject: [PATCH 6/9] improve code quality --- flake.nix | 20 +++++++++++++++++--- modules/profiles/desktop.nix | 1 - overlays/default.nix | 7 +++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 8710075..1c93a22 100644 --- a/flake.nix +++ b/flake.nix @@ -61,20 +61,32 @@ utils.lib.mkFlake { inherit self inputs; + supportedSystems = [ "x86_64-linux" ]; + channelsConfig.allowUnfree = true; ################ ### Overlays ### ################ - overlays.default = import ./overlays { inherit inputs; }; + overlay = import ./overlays { inherit inputs; }; + channels.nixpkgs.overlaysBuilder = channels: [ - self.overlays.default - inputs.utils.overlay + self.overlay + inputs.agenix.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 ### ############### @@ -139,6 +151,8 @@ shellcheck.enable = true; }; }; + + packages = utils.lib.exportPackages self.overlays channels; }; }; } diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 835e14b..cc97e51 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -95,7 +95,6 @@ with lib; { mullvad.enable = true; openconnect.enable = true; openvpn.enable = true; - picom.enable = true; printing.enable = true; redshift.enable = true; }; diff --git a/overlays/default.nix b/overlays/default.nix index f9685ad..071a899 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,9 +1,6 @@ { inputs }: final: prev: { - nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; - agenix = inputs.agenix.defaultPackage."${prev.system}"; - logseq-wayland = prev.symlinkJoin { - name = "logseq"; + name = "logseq-wayland"; paths = [ prev.logseq ]; nativeBuildInputs = [ prev.makeWrapper ]; postBuild = '' @@ -13,11 +10,13 @@ }; 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; From 7c90839817b54bb95221b3897c47e20db4b05e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 30 Dec 2022 19:01:31 +0100 Subject: [PATCH 7/9] improve hyprland module --- modules/programs/hyprland/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 064c538..b46c677 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -9,9 +9,7 @@ with lib; let cfg = config.my.programs.hyprland; - 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; + hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; }; in { options.my.programs.hyprland = { @@ -26,7 +24,10 @@ in programs.waybar = { enable = true; package = pkgs.waybar-hyprland; - systemd.enable = true; + systemd = { + enable = true; + target = "hyprland-session.target"; + }; settings = { mainBar = { layer = "top"; @@ -90,15 +91,14 @@ in wallpaper = ,${wallpaper} ''; in - # setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png"; - setWallpaper "/home/moritz/.config/wallpapers/mario.gif"; + 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 = [ "display-manager.service" ]; + wantedBy = [ "hyprland-session.target" ]; after = [ "display-manager.service" ]; script = "hyprpaper"; }; @@ -167,6 +167,7 @@ in xdg.portal = { enable = true; wlr.enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; }; } From 5ffc37cb3fadca366b3646eafc52d9e6f7f5ec63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 30 Dec 2022 19:01:50 +0100 Subject: [PATCH 8/9] expand private ssh conf --- secrets/ssh-home.age | Bin 888 -> 1005 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age index 29c15428e52821ca8c4ad65dafe181e97349c788..70909cfddeab92c1fee3d025be14ed22d82331be 100644 GIT binary patch delta 918 zcmWmB>uVbY003~iNhhf~n3ImWYN$e~F(#MC-KAn(FPG$+dnI>C?onDv?k<=2<(kXo zfi4|_12?v66D zHi1%pPXzNx;Vh*lfMhbA1n`J5VzCcdE0v60kzHOd;Il><0WGRlJY1@}lN_WHI7Kva zFdx)YiXW;J<1x5M1BqBub{a)a%$D<-CGFMac(#O7AmzkWs;Y}lg2EF_Rz@6TA`z5; zVN-&V{s=<8_(wMvEj3)QP#1in5-DJX0-_)p2InGJ9jW@#aFyY6zJws4!GLOkJUX9G zF}Rq}B|xA}&QAm!20>C_kWu~eL_&mJEaC)gN__h1j&80lyWIvzqZw4TWkNMlE~083 zMn^!9bcYmCvqggSCKQeoVz8ymnF!%kqktkIbuFL@q^d@INXG%6K)>xN2kN$~6H2n8SO{Mx&XQn8WE6lF zS<;blr&_#>@p>>uNg+ro$A@v#70-<13odt-)+8P!#TqA5qz340v}BPyA;Hau*zkY8 z-EJ)_Uc*^ZK|K;+=%yi=XdHEz0fTAgf(0Rk1sb$N8i73dK-{wW1GY9p?_Js0CiM-x zJor`V%bpJ8HKz5>k-1;brx$O%HBTZm2%ZKmVytLT!eD0O8eQRS&Lo@S}H$Rw7> literal 888 zcmZY4%gfsY008iVmk|XI;&)Ps%7;Sjn)Yj69wyB@&7;kud9h2Hq-ol(Ns}~>hADi9 zIS+!5Ph{d_cu+(TnX>U61{(~g!Up2So3MjB3g-Fcc>7JI6 zKG(vWD432=fk`N29wMWaQ#15RT zwdPbtlK*#ebKI~Mkn2To?VG|3M>dVW(nk(7<{U37oKWL5TbJu;=_z~ThROj^t$5Lz zLwutTGix~O)h>>%Fpn@0p(q#B*z^NgR~^}}{=2cyYaR6IXP#|`S>WaY2yH>E`(kdt zL;x8wQImC&B-nz6XX#7}7X)W!6=g^+#8=Dxd1PAoRBFP8n7bZEX;j2Y^vtS-0Yfnc z!0L>qLb;O+fOfkLDq?D-Oq32|-s`#&Q%)c@3hDx1A#{({CdkrQM@6TkU>?9f-MR7T zYvtP~PaM8{A$!X64wX=7B z|MLD1fA#O(`1Tb5+qt}RbM?gT(LZn9{p7;>x%d3&gM&->FX*Yyv#SS3_3iVgKYLfW zekE{g>Lc_ka`QdApWmT>E&qJ;n|JtgPk!e;eCA{FTy+t-#qOSe@WSqP=jg;8{kMB( Oe|qTl7niR6jQtDqh&*%v From 0e1f606a919c6301471e034e9b7a320b9eb6651f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 30 Dec 2022 19:02:02 +0100 Subject: [PATCH 9/9] update inputs --- flake.lock | 119 +++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 1820dfc..2633ff2 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1670266131, - "narHash": "sha256-hf+fLTT67YWJPTkKgLxyP6KRAhiCaxuGY7GLltTyZvc=", + "lastModified": 1670682948, + "narHash": "sha256-yFg8U4D+qD9UQXhpAXrl9Ksj16zrCLOgahMtT9QS2Y8=", "owner": "arkenfox", "repo": "user.js", - "rev": "e4a85c30c129cf664cc8a39705bb070fce828d33", + "rev": "7135907b2fe13fa55eb8ebf162603037f83e353c", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1670580643, - "narHash": "sha256-1D1mObqPnPJUxDZP2pOEvlYpEHq2oT2wqwwe46Jh24c=", + "lastModified": 1672110422, + "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff0c1ead7f28972ba4b63ffc9353a132b163386a", + "rev": "06d88ea2a783a7c563ce57e62d794313ae1e4855", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1670576098, - "narHash": "sha256-IUM4SbJTzL5pG2gCTkGUPbz+ujv/ENC/Gt0bpJjvUNE=", + "lastModified": 1671476278, + "narHash": "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=", "owner": "wfxr", "repo": "forgit", - "rev": "bfea8cf48523b3d6fa72d131e81769b68f43e3a7", + "rev": "ffda73bac3a435a9bbc6f29f2fd98517fbe5d9db", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670513770, - "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", + "lastModified": 1671966569, + "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", "owner": "nix-community", "repo": "home-manager", - "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", + "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1670534695, - "narHash": "sha256-YNPiXsaZSQvetwsnrHuRxQnm8t9p5y9Nd3lRW6bPVxM=", + "lastModified": 1672057622, + "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "726732244a5d51a0da54219174c13f4428017b79", + "rev": "545e63d1dd14c76e9faad7839ad255dc9ead4cd8", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "hyprland-protocols": { "flake": false, "locked": { - "lastModified": 1670258048, - "narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=", + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "hyprland-protocols_2": { "flake": false, "locked": { - "lastModified": 1670185345, - "narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=", + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4623a404c091e64743ba310199bb380ec52f1936", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669635788, - "narHash": "sha256-xlJ4hbUm3KULq4daqopi+eAv1u57uLlTare04HL3X/c=", + "lastModified": 1671404096, + "narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "ab85578dce442b80aa3378fe0304e6cb6f16f593", + "rev": "60013ee65566ec7601c367829da2560d7b8638fa", "type": "github" }, "original": { @@ -301,29 +301,13 @@ "type": "github" } }, - "jetbrains-plugins": { - "locked": { - "lastModified": 1670234247, - "narHash": "sha256-CepwZGno3XkePl3wBbFUcwsf+grnXTbKIujaCVaEnG0=", - "owner": "MoritzBoehme", - "repo": "nixpkgs", - "rev": "96386b1df1ad0099de5f74dea941d0191fbd3800", - "type": "github" - }, - "original": { - "owner": "MoritzBoehme", - "ref": "jetbrains-plugins", - "repo": "nixpkgs", - "type": "github" - } - }, "master": { "locked": { - "lastModified": 1670583233, - "narHash": "sha256-sa0XbJmnJEmQp/Uvjh8lprAazR0UdCoVv8n6EeeG1aQ=", + "lastModified": 1672128529, + "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "539954efab2b023064efd3edeb7912b71193acfd", + "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9", "type": "github" }, "original": { @@ -334,11 +318,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670064435, - "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "lastModified": 1671722432, + "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", + "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", "type": "github" }, "original": { @@ -350,11 +334,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1668984258, - "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", + "lastModified": 1671271954, + "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", "type": "github" }, "original": { @@ -382,11 +366,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1670525689, - "narHash": "sha256-YIjGzxrRQa5LYO0zlnH/ardcwXsRgsnHe3TkGkvCxbc=", + "lastModified": 1672057183, + "narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f21f11aa2a02cb78651c6d57546c7d7541f9240c", + "rev": "b139e44d78c36c69bcbb825b20dbfa51e7738347", "type": "github" }, "original": { @@ -398,11 +382,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1668994630, - "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", + "lastModified": 1671271357, + "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", + "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd", "type": "github" }, "original": { @@ -446,11 +430,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1670413394, - "narHash": "sha256-M7sWqrKtOqUv9euX1t3HCxis8cPy9MNiZxQmUf0KF1o=", + "lastModified": 1672050129, + "narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1303a1a76e9eb074075bfe566518c413f6fc104e", + "rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c", "type": "github" }, "original": { @@ -470,7 +454,6 @@ "howdy": "howdy", "hyprland": "hyprland", "hyprpaper": "hyprpaper", - "jetbrains-plugins": "jetbrains-plugins", "master": "master", "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks_2", @@ -480,11 +463,11 @@ }, "stable": { "locked": { - "lastModified": 1670543317, - "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", + "lastModified": 1671883564, + "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19", + "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682", "type": "github" }, "original": { @@ -531,11 +514,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1669925104, - "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", + "lastModified": 1671723353, + "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=", "owner": "wlroots", "repo": "wlroots", - "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", + "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6", "type": "gitlab" }, "original": { @@ -554,11 +537,11 @@ ] }, "locked": { - "lastModified": 1670202338, - "narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=", + "lastModified": 1671837878, + "narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af840a9e0947a79a37a95a9f62062653721e43fa", + "rev": "e47f4cec698080768821b271510985ab94a37e91", "type": "github" }, "original": {