diff --git a/flake.lock b/flake.lock index 021c604..a2cc745 100755 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1695074256, - "narHash": "sha256-aqaq+mp0YdLzhyHlgI3GNno7XwK5P82uLCFTCIgYjMc=", + "lastModified": 1701433070, + "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", "owner": "nix-community", "repo": "home-manager", - "rev": "feb70061596134d403e14cc5ef7b01ab114d1dbd", + "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695033975, - "narHash": "sha256-GIUxbgLBhVyaKRxQw/NWYFLx7/jbKW3+U0HoSsMLPAs=", + "lastModified": 1701250978, + "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "161b027169b19d3a0ad6bd0a8948edf0c0fb0f64", + "rev": "8772491ed75f150f02552c60694e1beff9f46013", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1691333179, - "narHash": "sha256-qMXasesSAK35QkdlOJlYKsAGI6AlA5ev3uW9WQD+cCk=", + "lastModified": 1695262048, + "narHash": "sha256-gLJnpuxRhZjvAkHTPMHXi927lHcDrT8/Lx5xx7lhGt4=", "owner": "iofq", "repo": "nvim.nix", - "rev": "8b0a7ef1a65131703930c87d27c700f95f13997f", + "rev": "dc80e6953dbad5ad78be591eb7536b1eeb404d79", "type": "github" }, "original": { @@ -96,7 +96,8 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nvim": "nvim" + "nvim": "nvim", + "tfa": "tfa" } }, "systems": { @@ -113,6 +114,26 @@ "repo": "default", "type": "github" } + }, + "tfa": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695265797, + "narHash": "sha256-YfClmeTQRYKncjPxhB3jDGldwY6FXSH6lldMZ+dhpnY=", + "owner": "iofq", + "repo": "2fa", + "rev": "a74a30f6af8de68269742212415617dd8ec66f97", + "type": "github" + }, + "original": { + "owner": "iofq", + "repo": "2fa", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b559d55..e1499d4 100755 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ url = "github:iofq/nvim.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + tfa = { + url = "github:iofq/2fa"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, home-manager, nixos-hardware, nvim, ... } @inputs: let diff --git a/home/common.nix b/home/common.nix index ba2d109..f89f41e 100755 --- a/home/common.nix +++ b/home/common.nix @@ -21,6 +21,7 @@ appimage-run wireguard-tools spleen + mpv ]; }; imports = ( import ../modules/programs ); diff --git a/home/default.nix b/home/default.nix index a5569a8..22b3d12 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,6 +7,7 @@ overlays = [ (final: prev: { inherit (inputs.nvim.packages.${final.system}) full; + inherit (inputs.tfa.packages.${final.system}) twofa; }) ]; }; diff --git a/home/t14/home.nix b/home/t14/home.nix index e6bddd2..bed61cf 100755 --- a/home/t14/home.nix +++ b/home/t14/home.nix @@ -15,6 +15,7 @@ ledger-live-desktop prismlauncher chromium + jdk17 ]; }; } diff --git a/modules/programs/2fa/default.nix b/modules/programs/2fa/default.nix index 950d6e8..9f27ecf 100755 --- a/modules/programs/2fa/default.nix +++ b/modules/programs/2fa/default.nix @@ -1,5 +1,8 @@ { pkgs, ... }: { + home.packages = with pkgs; [ + twofa + ]; programs.gpg = { enable = true; settings = { diff --git a/modules/programs/default.nix b/modules/programs/default.nix index f7767d9..54f31ec 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -7,4 +7,5 @@ ./2fa ./direnv ./xdg + ./warrior ] diff --git a/modules/programs/dev.nix b/modules/programs/dev.nix index 346c8bc..81e5272 100644 --- a/modules/programs/dev.nix +++ b/modules/programs/dev.nix @@ -2,13 +2,10 @@ { home.packages = with pkgs; [ ripgrep - fluxcd k9s kubectl python3 p7zip - nodejs - nodePackages.pnpm gnumake gcc go diff --git a/modules/programs/shell/default.nix b/modules/programs/shell/default.nix index 2467a2d..7d47d96 100755 --- a/modules/programs/shell/default.nix +++ b/modules/programs/shell/default.nix @@ -35,7 +35,7 @@ bashrcExtra = '' export PROMPT_COMMAND="prompt_command;history -a" export PATH="/usr/local/go/bin:~/go/bin:~/.bin:~/.local/bin:$PATH" - export GPG_2FA="cjriddz@protonmail.com" + export GPG_2FA="mail@10110110.xyz" export MANPAGER="nvim +Man!" export EDITOR="nvim" export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/modules/programs/warrior/default.nix b/modules/programs/warrior/default.nix new file mode 100755 index 0000000..a85deb3 --- /dev/null +++ b/modules/programs/warrior/default.nix @@ -0,0 +1,15 @@ +{ pkgs, config, ... }: +{ + programs.taskwarrior = { + enable = true; + colorTheme = "solarized-dark-256"; + }; + + home.packages = with pkgs; [ + timewarrior + ]; + home.file."${config.xdg.dataHome}/task/hooks/on-modify.timewarrior" = { + source = "${pkgs.timewarrior}/share/doc/timew/ext/on-modify.timewarrior"; + executable = true; + }; +} diff --git a/nixos/t14/configuration.nix b/nixos/t14/configuration.nix index 72ea369..2148d55 100755 --- a/nixos/t14/configuration.nix +++ b/nixos/t14/configuration.nix @@ -7,8 +7,8 @@ ]; environment.systemPackages = with pkgs; [ cryptsetup + nfs-utils ]; - virtualisation.podman = { enable = true; dockerCompat = true; @@ -23,7 +23,16 @@ programs.ssh = { startAgent = true; }; - + services.flatpak.enable = true; + xdg = { + portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + }; + }; hardware.opengl.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest;