From 4e0d0c3abd0b7ce1b6ece3d987c216eb2d371160 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 7 Jul 2023 22:20:39 +0200 Subject: [PATCH] feat(graphical-fullblown,sway): dropbox->maestral, cleanup, add udiskie --- flake.lock | 24 +++++----- flake.nix | 33 ++++++------- nix/devShells.nix | 4 -- .../configuration/graphical-fullblown.nix | 48 +++++++++++++++---- nix/home-manager/profiles/sway-desktop.nix | 1 - 5 files changed, 69 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index ba38cbc..9e2fc58 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1688425221, - "narHash": "sha256-DhZnju72DuX9GhOnCOBIE94aCGKC2BOaF+kGxbnP/K0=", + "lastModified": 1688690832, + "narHash": "sha256-RJIYuOn9FaQWVzj6ytaKsHyur0KsYO9tOgaMz1XHtpQ=", "owner": "ipetkov", "repo": "crane", - "rev": "fc6a236548b31aef0be3b0a0377c4459bb39d923", + "rev": "bfc1c3dca576e2f9e02eb0176e4058305192afe3", "type": "github" }, "original": { @@ -333,13 +333,13 @@ "logseqNightly": { "flake": false, "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "narHash": "sha256-nVE7Ke2sNYK7dOZCkzABm7OFQQ3V1vcj/y5QJteacTI=", "type": "file", - "url": "file:///dev/null" + "url": "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230706.AppImage" }, "original": { "type": "file", - "url": "file:///dev/null" + "url": "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230706.AppImage" } }, "magmawm": { @@ -478,11 +478,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1688566749, - "narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=", + "lastModified": 1688594934, + "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c99004f75fd28cc10b9d2e01f51a412d768269c8", + "rev": "e11142026e2cef35ea52c9205703823df225c947", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1688646970, - "narHash": "sha256-EIcr3n0YKjJdH9F3JFyhlObbSDXQji8nEzNWxYqep1g=", + "lastModified": 1688653033, + "narHash": "sha256-iRtkfin+7PLWd0ce/pQ8bDSo1v6N+nfgjFDFCFEKUCA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "57c2057b4817ecce059fb3cd941ba53ee70c6f5d", + "rev": "bc84572c913933dbb49df2746dc8669f562da454", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 63a16da..2777c01 100644 --- a/flake.nix +++ b/flake.nix @@ -67,8 +67,8 @@ }; logseqNightly = { - url = "file:///dev/null"; - # url = "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230628.AppImage"; + # url = "file:///dev/null"; + url = "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230706.AppImage"; flake = false; }; }; @@ -147,24 +147,25 @@ dcpj4110dwDriver = dcpj4110dw.driver; dcpj4110dwCupswrapper = dcpj4110dw.cupswrapper; - aphorme_launcher = craneLib.buildPackage {src = inputs.aphorme_launcher;}; - yofi = inputs'.yofi.packages.default; - ofi-pass = craneLibOfiPass.buildPackage {src = inputs.ofi-pass;}; + # broken as of 2023-04-27 because it doesn't load without a config + # aphorme_launcher = craneLib.buildPackage {src = inputs.aphorme_launcher;}; + # yofi = inputs'.yofi.packages.default; + # ofi-pass = craneLibOfiPass.buildPackage {src = inputs.ofi-pass;}; inherit (inputs'.colmena.packages) colmena; - jay = pkgs.callPackage (self + /nix/pkgs/jay.nix) { - src = inputs.jay; - rustPlatform = pkgs.makeRustPlatform { - cargo = inputs'.fenix.packages.stable.toolchain; - rustc = inputs'.fenix.packages.stable.toolchain; - }; - }; + # jay = pkgs.callPackage (self + /nix/pkgs/jay.nix) { + # src = inputs.jay; + # rustPlatform = pkgs.makeRustPlatform { + # cargo = inputs'.fenix.packages.stable.toolchain; + # rustc = inputs'.fenix.packages.stable.toolchain; + # }; + # }; - magmawm = pkgs.callPackage (self + /nix/pkgs/magmawm.nix) { - inherit craneLib; - src = inputs.magmawm; - }; + # magmawm = pkgs.callPackage (self + /nix/pkgs/magmawm.nix) { + # inherit craneLib; + # src = inputs.magmawm; + # }; salut = craneLib.buildPackage { src = inputs.salut; diff --git a/nix/devShells.nix b/nix/devShells.nix index 20569a6..d896815 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -33,10 +33,6 @@ pkgs.stdenv.mkDerivation { prs fuzzel wofi - # broken as of 2023-04-27 because it doesn't load without a config - # packages'.aphorme_launcher - packages'.yofi - # packages'.ofi-pass age age-plugin-yubikey ssh-to-age diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 3d10c4d..215c5a7 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -8,7 +8,7 @@ # repoFlakeInputs', ... }: let - pkgsMaster = nodeFlake.inputs.nixpkgs-master.${pkgs.system}; + pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system}; pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; # pkgs2211 = repoFlakeInputs'.nixpkgs-2211.legacyPackages; @@ -235,18 +235,22 @@ in { cdrtools # Document Processing and Management + gnome.nautilus xfce.thunar + pcmanfm # mendeley evince - ((logseq.overrideAttrs (attrs: { - version = "nightly"; - src = repoFlake.inputs.logseqNightly; - })).override (_: { - electron = pkgs.electron_24; - })) + ((pkgsMaster.logseq.overrideAttrs (finalAttrs: previousAttrs: { + version = "nightly"; + src = repoFlake.inputs.logseqNightly; + })) + .override (_: { + electron = pkgs.electron_24; + })) # File Synchronzation - dropbox + maestral + maestral-gui rsync # Filesystem Tools @@ -300,4 +304,32 @@ in { systemd.user.startServices = true; services.syncthing.enable = true; + + services.udiskie = { + enable = true; + automount = true; + notify = true; + }; + + # FIXME: doesn't work as the service can't seem to control its started PID + services.dropbox = { + enable = false; + path = "${config.home.homeDirectory}/Dropbox-Hm"; + }; + + # TODO: uncomment this when it's in stable home-manger + # programs.joshuto = { + # enable = true; + # }; + + # systemd.user.services.maestral = { + # Unit.Description = "Maestral daemon"; + # Install.WantedBy = ["default.target"]; + # Service = { + # ExecStart = "${pkgs.maestral}/bin/maestral start -f"; + # ExecStop = "${pkgs.maestral}/bin/maestral stop"; + # Restart = "on-failure"; + # Nice = 10; + # }; + # }; } diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index 62d3c22..0f2d9d0 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -72,7 +72,6 @@ in { pkgs.iosevka-comfy.comfy-fixed # experimental stuff - packages'.yofi pkgs.fuzzel ];