steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(graphical-fullblown,sway): dropbox->maestral, cleanup, add udiskie

Browse source
This commit is contained in:
steveej 2023-07-07 22:20:39 +02:00
parent fb11753620
commit 4e0d0c3abd
5 changed files with 69 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -50,11 +50,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1688425221, "lastModified": 1688690832,
"narHash": "sha256-DhZnju72DuX9GhOnCOBIE94aCGKC2BOaF+kGxbnP/K0=", "narHash": "sha256-RJIYuOn9FaQWVzj6ytaKsHyur0KsYO9tOgaMz1XHtpQ=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "fc6a236548b31aef0be3b0a0377c4459bb39d923", "rev": "bfc1c3dca576e2f9e02eb0176e4058305192afe3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,13 +333,13 @@
"logseqNightly": { "logseqNightly": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", "narHash": "sha256-nVE7Ke2sNYK7dOZCkzABm7OFQQ3V1vcj/y5QJteacTI=",
"type": "file", "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": { "original": {
"type": "file", "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": { "magmawm": {
@ -478,11 +478,11 @@
}, },
"nixpkgs-2305": { "nixpkgs-2305": {
"locked": { "locked": {
"lastModified": 1688566749, "lastModified": 1688594934,
"narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=", "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c99004f75fd28cc10b9d2e01f51a412d768269c8", "rev": "e11142026e2cef35ea52c9205703823df225c947",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,11 +549,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1688646970, "lastModified": 1688653033,
"narHash": "sha256-EIcr3n0YKjJdH9F3JFyhlObbSDXQji8nEzNWxYqep1g=", "narHash": "sha256-iRtkfin+7PLWd0ce/pQ8bDSo1v6N+nfgjFDFCFEKUCA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "57c2057b4817ecce059fb3cd941ba53ee70c6f5d", "rev": "bc84572c913933dbb49df2746dc8669f562da454",
"type": "github" "type": "github"
}, },
"original": { "original": {

33
flake.nix
View file

@ -67,8 +67,8 @@
}; };
logseqNightly = { logseqNightly = {
url = "file:///dev/null"; # url = "file:///dev/null";
# url = "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230628.AppImage"; url = "https://github.com/logseq/logseq/releases/download/nightly/Logseq-linux-x64-0.9.10-nightly.20230706.AppImage";
flake = false; flake = false;
}; };
}; };
@ -147,24 +147,25 @@
dcpj4110dwDriver = dcpj4110dw.driver; dcpj4110dwDriver = dcpj4110dw.driver;
dcpj4110dwCupswrapper = dcpj4110dw.cupswrapper; dcpj4110dwCupswrapper = dcpj4110dw.cupswrapper;
aphorme_launcher = craneLib.buildPackage {src = inputs.aphorme_launcher;}; # broken as of 2023-04-27 because it doesn't load without a config
yofi = inputs'.yofi.packages.default; # aphorme_launcher = craneLib.buildPackage {src = inputs.aphorme_launcher;};
ofi-pass = craneLibOfiPass.buildPackage {src = inputs.ofi-pass;}; # yofi = inputs'.yofi.packages.default;
# ofi-pass = craneLibOfiPass.buildPackage {src = inputs.ofi-pass;};
inherit (inputs'.colmena.packages) colmena; inherit (inputs'.colmena.packages) colmena;
jay = pkgs.callPackage (self + /nix/pkgs/jay.nix) { # jay = pkgs.callPackage (self + /nix/pkgs/jay.nix) {
src = inputs.jay; # src = inputs.jay;
rustPlatform = pkgs.makeRustPlatform { # rustPlatform = pkgs.makeRustPlatform {
cargo = inputs'.fenix.packages.stable.toolchain; # cargo = inputs'.fenix.packages.stable.toolchain;
rustc = inputs'.fenix.packages.stable.toolchain; # rustc = inputs'.fenix.packages.stable.toolchain;
}; # };
}; # };
magmawm = pkgs.callPackage (self + /nix/pkgs/magmawm.nix) { # magmawm = pkgs.callPackage (self + /nix/pkgs/magmawm.nix) {
inherit craneLib; # inherit craneLib;
src = inputs.magmawm; # src = inputs.magmawm;
}; # };
salut = craneLib.buildPackage { salut = craneLib.buildPackage {
src = inputs.salut; src = inputs.salut;

4
nix/devShells.nix
View file

@ -33,10 +33,6 @@ pkgs.stdenv.mkDerivation {
prs prs
fuzzel fuzzel
wofi 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
age-plugin-yubikey age-plugin-yubikey
ssh-to-age ssh-to-age

40
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -8,7 +8,7 @@
# repoFlakeInputs', # repoFlakeInputs',
... ...
}: let }: 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}; pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system};
# pkgs2211 = repoFlakeInputs'.nixpkgs-2211.legacyPackages; # pkgs2211 = repoFlakeInputs'.nixpkgs-2211.legacyPackages;
@ -235,18 +235,22 @@ in {
cdrtools cdrtools
# Document Processing and Management # Document Processing and Management
gnome.nautilus
xfce.thunar xfce.thunar
pcmanfm
# mendeley # mendeley
evince evince
((logseq.overrideAttrs (attrs: { ((pkgsMaster.logseq.overrideAttrs (finalAttrs: previousAttrs: {
version = "nightly"; version = "nightly";
src = repoFlake.inputs.logseqNightly; src = repoFlake.inputs.logseqNightly;
})).override (_: { }))
.override (_: {
electron = pkgs.electron_24; electron = pkgs.electron_24;
})) }))
# File Synchronzation # File Synchronzation
dropbox maestral
maestral-gui
rsync rsync
# Filesystem Tools # Filesystem Tools
@ -300,4 +304,32 @@ in {
systemd.user.startServices = true; systemd.user.startServices = true;
services.syncthing.enable = 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;
# };
# };
} }

1
nix/home-manager/profiles/sway-desktop.nix
View file

@ -72,7 +72,6 @@ in {
pkgs.iosevka-comfy.comfy-fixed pkgs.iosevka-comfy.comfy-fixed
# experimental stuff # experimental stuff
packages'.yofi
pkgs.fuzzel pkgs.fuzzel
]; ];