diff --git a/flake.lock b/flake.lock index 64720f6..748711f 100644 --- a/flake.lock +++ b/flake.lock @@ -48,9 +48,7 @@ "crowdsec": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1741195753, @@ -312,6 +310,42 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fourmolu-nix": { "locked": { "lastModified": 1707266073, @@ -567,11 +601,33 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "remarks", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1741917036, @@ -647,6 +703,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1743678050, + "narHash": "sha256-6vNmeSeVUpJy0zVFQf8JusuydhEnoA2mPDcXKEMpOtY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a33460deb8d793f7d724eff42223bb32c4edc8b2", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1739866667, "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", @@ -662,7 +733,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741862977, "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", @@ -678,39 +749,71 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1734424634, "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1730157240, + "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1739863612, "narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=", @@ -729,7 +832,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2" }, "locked": { @@ -754,7 +857,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -796,6 +899,28 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_8", + "systems": "systems_7", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1735132927, + "narHash": "sha256-bTmhcWv+sByoVUDZv91TWkw1752ME+pG2n3rNpf8Tds=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "06eb56b63de2f49ae62352b5927b9285591f982a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -819,6 +944,26 @@ "type": "github" } }, + "remarks": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_7", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1743691069, + "narHash": "sha256-a72tzj3oI+rzZfJdan4L9SesIL/5XQV23tS1K9XCKg4=", + "owner": "Scrybbling-together", + "repo": "remarks", + "rev": "2a5838a6ab87a8e8513a24361fa3b8ab371472e7", + "type": "github" + }, + "original": { + "owner": "Scrybbling-together", + "repo": "remarks", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -827,9 +972,10 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "remarks": "remarks", "xmonad-config": "xmonad-config" } }, @@ -893,6 +1039,50 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -936,6 +1126,28 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "remarks", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xmonad-config": { "inputs": { "flake-parts": "flake-parts_4", @@ -943,7 +1155,7 @@ "git-hooks": "git-hooks_2", "haskell-flake": "haskell-flake", "nixos-unified": "nixos-unified", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1742568738, diff --git a/flake.nix b/flake.nix index fab416d..a4ca567 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ # Add any other flake you might need. nix-minecraft.url = "github:Infinidoge/nix-minecraft"; + remarks.url = "github:Scrybbling-together/remarks"; }; outputs = { diff --git a/home-manager/sajenim/features/university/default.nix b/home-manager/sajenim/features/university/default.nix index f233c91..50be5b7 100644 --- a/home-manager/sajenim/features/university/default.nix +++ b/home-manager/sajenim/features/university/default.nix @@ -1,21 +1,18 @@ {pkgs, ...}: { - home.packages = with pkgs; - [ - logisim # required for outdated projects - libreoffice - obsidian - x2goclient - zathura - zoom-us - ] - ++ (with unstable.pkgs; [ - # Allows access to the ReMarkable Cloud API - rmapi - # Design and simulate digital logic circuits - logisim-evolution - ]); + imports = [ + ./remarkable.nix + ]; - # Use our yubikey to login to university servers + home.packages = with pkgs; [ + logisim # required for outdated projects + libreoffice + obsidian + x2goclient + zathura + zoom-us + ]; + + # Enable the use of the yubikey for ssh authentication programs.ssh = { matchBlocks = { "turing" = { diff --git a/home-manager/sajenim/features/university/remarkable.nix b/home-manager/sajenim/features/university/remarkable.nix new file mode 100644 index 0000000..ac72c24 --- /dev/null +++ b/home-manager/sajenim/features/university/remarkable.nix @@ -0,0 +1,13 @@ +{ + pkgs, + inputs, + ... +}: { + # This module is for the ReMarkable tablet, which is a Linux-based e-reader + home.packages = [ + # Allows access to the ReMarkable Cloud API + pkgs.unstable.rmapi + # Converts ReMarkable files to PDF + inputs.remarks.packages.${pkgs.system}.default + ]; +}