Compare commits
No commits in common. "9ec11a8a249b8eb66297e5f1a0ba786e11f62011" and "1d7f67471edaca9f92c02cfb6263a3913a827bfe" have entirely different histories.
9ec11a8a24
...
1d7f67471e
5 changed files with 109 additions and 94 deletions
79
flake.lock
79
flake.lock
|
|
@ -291,24 +291,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_5": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726153070,
|
||||
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
|
|
@ -779,18 +761,6 @@
|
|||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_3": {
|
||||
"locked": {
|
||||
"lastModified": 1725233747,
|
||||
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1710695816,
|
||||
|
|
@ -1028,8 +998,8 @@
|
|||
"retiolum": "retiolum",
|
||||
"srvos": "srvos",
|
||||
"stylix": "stylix",
|
||||
"taskwarrior": "taskwarrior",
|
||||
"treefmt-nix": "treefmt-nix_5"
|
||||
"taskshell": "taskshell",
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
}
|
||||
},
|
||||
"sops-nix": {
|
||||
|
|
@ -1187,7 +1157,6 @@
|
|||
"inputs": {
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": [
|
||||
"taskwarrior",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -1205,29 +1174,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"taskwarrior": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_5",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"taskshell": "taskshell",
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727415270,
|
||||
"narHash": "sha256-VrzBytDYF6rextg0qjxtnGEyw88fa1LrWuXfG4k6zE0=",
|
||||
"owner": "mrvandalo",
|
||||
"repo": "taskwarrior-flake",
|
||||
"rev": "6d95efd92e3ae93e4e395f115116e2435fe79e80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mrvandalo",
|
||||
"repo": "taskwarrior-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1340,27 +1286,6 @@
|
|||
}
|
||||
},
|
||||
"treefmt-nix_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"taskwarrior",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727252110,
|
||||
"narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_5": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
|
|||
22
flake.nix
22
flake.nix
|
|
@ -17,9 +17,9 @@
|
|||
kmonad.inputs.nixpkgs.follows = "nixpkgs"; # fixme: kmonad crashes every now and than and the keyboard is not usable anymore.
|
||||
kmonad.url = "github:kmonad/kmonad?dir=nix"; # todo: mabye use https://github.com/jtroo/kanata instead
|
||||
landingpage.url = "github:mrVanDalo/landingpage";
|
||||
nixos-anywhere.url = "github:nix-community/nixos-anywhere";
|
||||
nix-topology.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-topology.url = "github:oddlama/nix-topology";
|
||||
nixos-anywhere.url = "github:nix-community/nixos-anywhere";
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||
nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
|
|
@ -37,9 +37,8 @@
|
|||
stylix.inputs.home-manager.follows = "home-manager";
|
||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
stylix.url = "github:danth/stylix";
|
||||
taskwarrior.inputs.nixpkgs.follows = "nixpkgs";
|
||||
taskwarrior.url = "github:mrvandalo/taskwarrior-flake";
|
||||
#taskwarrior.url = "git+file:///home/palo/dev/nixos/taskwarrior-flake";
|
||||
taskshell.inputs.nixpkgs.follows = "nixpkgs";
|
||||
taskshell.url = "github:mrvandalo/taskshell";
|
||||
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
|
||||
|
|
@ -53,6 +52,7 @@
|
|||
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
clan-core,
|
||||
clan-fact-generators,
|
||||
flake-parts,
|
||||
|
|
@ -60,7 +60,6 @@
|
|||
home-manager-utils,
|
||||
kmonad,
|
||||
landingpage,
|
||||
nix-topology,
|
||||
nixos-anywhere,
|
||||
nixos-hardware,
|
||||
nixpkgs,
|
||||
|
|
@ -72,11 +71,11 @@
|
|||
polygon-art,
|
||||
private-parts,
|
||||
retiolum,
|
||||
self,
|
||||
srvos,
|
||||
stylix,
|
||||
taskwarrior,
|
||||
taskshell,
|
||||
treefmt-nix,
|
||||
nix-topology,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -130,14 +129,12 @@
|
|||
polygon-art = polygon-art.packages.${system};
|
||||
landingpage = landingpage.packages.${system}.plain;
|
||||
kmonad = kmonad.packages.${system}.kmonad;
|
||||
inherit (taskwarrior.packages.${system})
|
||||
bugwarrior
|
||||
tasksh
|
||||
taskwarrior-hooks
|
||||
;
|
||||
tasksh = taskshell.packages.${system}.tasksh;
|
||||
inherit (self.packages.${system})
|
||||
otpmenu
|
||||
taskwarrior-hooks
|
||||
nsxiv
|
||||
bugwarrior
|
||||
;
|
||||
})
|
||||
];
|
||||
|
|
@ -362,7 +359,6 @@
|
|||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.sharedModules = [
|
||||
home-manager-utils.hmModule
|
||||
taskwarrior.hmModules.bugwarrior
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ with lib;
|
|||
|
||||
zed-editor
|
||||
|
||||
minicom # for flipper zero
|
||||
|
||||
#jetbrains.mps
|
||||
#jetbrains.datagrip
|
||||
|
||||
|
|
|
|||
|
|
@ -7,18 +7,96 @@
|
|||
with lib;
|
||||
with types;
|
||||
let
|
||||
mkMagicMergeOption =
|
||||
{
|
||||
description ? "",
|
||||
example ? { },
|
||||
default ? { },
|
||||
apply ? id,
|
||||
...
|
||||
}:
|
||||
mkOption {
|
||||
inherit
|
||||
example
|
||||
description
|
||||
default
|
||||
apply
|
||||
;
|
||||
type =
|
||||
with lib.types;
|
||||
let
|
||||
valueType =
|
||||
nullOr (oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
(attrsOf valueType)
|
||||
(listOf valueType)
|
||||
])
|
||||
// {
|
||||
description = "bool, int, float or str";
|
||||
emptyValue.value = { };
|
||||
};
|
||||
in
|
||||
valueType;
|
||||
};
|
||||
|
||||
#taskwarrior-tui = pkgs.legacy_2311.taskwarrior-tui;
|
||||
taskwarrior-tui = pkgs.taskwarrior-tui;
|
||||
|
||||
taskwarrior = pkgs.taskwarrior3;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
config = mkIf config.gui.enable {
|
||||
# bugwarrior (a bit fiddly)
|
||||
imports = [
|
||||
{
|
||||
|
||||
bugwarrior.enable = true;
|
||||
options.bugwarrior.config = mkMagicMergeOption {
|
||||
type = attrs;
|
||||
default = { };
|
||||
};
|
||||
|
||||
config = mkIf config.gui.enable {
|
||||
home.file.".config/bugwarrior/bugwarrior.toml".source =
|
||||
(pkgs.formats.toml { }).generate "bugwarriorrc.toml"
|
||||
(
|
||||
{
|
||||
general.taskrc = pkgs.writeText "taskrc" "data.location=$HOME/.bugwarrior";
|
||||
}
|
||||
// config.bugwarrior.config
|
||||
);
|
||||
home.packages = [
|
||||
pkgs.bugwarrior
|
||||
#export TASKRC=$HOME/.bugwarrior/${pkgs.writeText "bugwarrior.taskrc" "data.location=$HOME/.bugwarrior"}
|
||||
(pkgs.writers.writeBashBin "bugwarrior-sync" ''
|
||||
set -eo pipefail
|
||||
|
||||
mkdir -p $HOME/.bugwarrior
|
||||
touch $HOME/.bugwarrior/taskrc
|
||||
|
||||
export TASKRC=$HOME/.bugwarrior/taskrc
|
||||
export TASKDATA=$HOME/.bugwarrior
|
||||
echo "bugwarrior pull" | ${pkgs.boxes}/bin/boxes -d ansi
|
||||
${pkgs.bugwarrior}/bin/bugwarrior pull "$@"
|
||||
echo "task export" | ${pkgs.boxes}/bin/boxes -d ansi
|
||||
${pkgs.taskwarrior}/bin/task export > $HOME/.bugwarrior/bugwarrior.json
|
||||
|
||||
unset TASKRC
|
||||
unset TASKDATA
|
||||
echo "task import" | ${pkgs.boxes}/bin/boxes -d ansi
|
||||
${taskwarrior}/bin/task import rc.hooks=0 $HOME/.bugwarrior/bugwarrior.json
|
||||
'')
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
];
|
||||
|
||||
config = mkIf config.gui.enable {
|
||||
|
||||
home.packages = [
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,28 @@
|
|||
packages.otpmenu = callPackage ./otpmenu { };
|
||||
#packages.sononym = callPackage ./sononym { };
|
||||
#packages.sononym-crawler = callPackage ./sononym-crawler { };
|
||||
packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
|
||||
|
||||
# overrides
|
||||
# ---------
|
||||
packages.nsxiv = (pkgs.nsxiv.override { conf = builtins.readFile ./nsxiv/config.def.h; });
|
||||
|
||||
packages.bugwarrior = python311Packages.bugwarrior.overrideAttrs (old: {
|
||||
version = "2024-08-27-r1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ralphbean";
|
||||
repo = "bugwarrior";
|
||||
rev = "25e99834ef79e0a8c7141943810e0aa5152d6710";
|
||||
sha256 = "sha256-JPmFP6i/7Ji5LyrKT9WCngWqMyrM00rEXV8QVLwxx1A=";
|
||||
};
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ [
|
||||
python311Packages.pydantic_1
|
||||
python311Packages.tomli
|
||||
python311Packages.email-validator
|
||||
python311Packages.packaging
|
||||
python311Packages.pbr
|
||||
];
|
||||
});
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue