diff --git a/Makefile b/Makefile index 0da77130..7a81a9e7 100644 --- a/Makefile +++ b/Makefile @@ -14,4 +14,4 @@ test: nixos-rebuild --flake ".#${HOST}" dry-activate .PHONY: update - nix flake update + nix flake update --commit-lock-file --commit-lockfile-summary "flake.lock: update inputs" diff --git a/flake.nix b/flake.nix index 6e352e1a..6338c5ab 100644 --- a/flake.nix +++ b/flake.nix @@ -134,6 +134,14 @@ ]; }; + # Set several paths for the traditional channels. + nix.nixPath = [ + "nixpkgs=${nixpkgs}" + "home-manager=${inputs.home-manager}" + "nur=${inputs.nur}" + "config=${self}" + ]; + # Stallman-senpai will be disappointed. nixpkgs.config.allowUnfree = true; diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix index 021bd90d..6490c1c6 100644 --- a/hosts/ni/default.nix +++ b/hosts/ni/default.nix @@ -36,9 +36,11 @@ home = "/home/foo-dogsquared"; }; }; - hardware-setup.backup-archive.enable = true; + tasks = { + backup-archive.enable = true; + multimedia-archive.enable = true; + }; themes = { - disableLimit = true; themes.a-happy-gnome.enable = true; }; diff --git a/modules/home-manager/profiles/dev.nix b/modules/home-manager/profiles/dev.nix index 4a30804b..c37870c0 100644 --- a/modules/home-manager/profiles/dev.nix +++ b/modules/home-manager/profiles/dev.nix @@ -16,7 +16,6 @@ in { ({ home.packages = with pkgs; [ lazygit # Git interface for the lazy. - github-cli # So you don't have to use much of GitHub on the site, I guess. fzf # A fuzzy finder that enables fuzzy finding not furry finding, a common misconception. gopass # An improved version of the password manager for hipsters. perl534Packages.vidir # Bulk rename for your organizing needs. @@ -50,6 +49,11 @@ in { home.packages = with pkgs; [ tree-sitter # The modern way of text highlighting. hyperfine # Command-line profiling. + github-cli # So you don't have to use much of GitHub on the site, I guess. + hut # Easier interfacing with Sourcehut. + act # Test your CI without embarrassing yourself pushing into upstream. + irssi # Communicate in the terminal like a normal person. + hexchat # Communicate on the desktop like an insane person. ]; }) ]); diff --git a/modules/nixos/profiles/dev.nix b/modules/nixos/profiles/dev.nix index c01e1433..39a3089f 100644 --- a/modules/nixos/profiles/dev.nix +++ b/modules/nixos/profiles/dev.nix @@ -51,6 +51,10 @@ in { # I SAID ALL OF THE GIT EXTENSIONS! git-crypt + + github-cli # Client for GitHub. + hut # And one for Sourcehut. + act # Finally, a local environment for testing GitHub workflows. ]; }) @@ -98,7 +102,10 @@ in { package = pkgs.neovim-nightly; }; - environment.systemPackages = with pkgs; [ editorconfig-core-c ]; + environment.systemPackages = with pkgs; [ + editorconfig-core-c + tree-sitter + ]; }) ]); } diff --git a/modules/nixos/tasks/multimedia-archive.nix b/modules/nixos/tasks/multimedia-archive.nix index ab413904..3e439377 100644 --- a/modules/nixos/tasks/multimedia-archive.nix +++ b/modules/nixos/tasks/multimedia-archive.nix @@ -66,7 +66,7 @@ in { "https://www.youtube.com/channel/UCcBnT6LsxANZjUWqpjR8Jpw" # Marcello Barenghi "https://www.youtube.com/c/ronillust" # ronillust ]; - startAt = "weekly"; + startAt = "Friday"; extraArgs = [ "--playlist-end 20" # Only check the first N videos. ]; @@ -80,7 +80,7 @@ in { "https://www.youtube.com/c/K%C3%A1rolyZsolnai" # Two Minute Papers "https://www.youtube.com/c/TheCodingTrain" # TheCodingTrain ]; - startAt = "weekly"; + startAt = "Thursday"; extraArgs = [ "--playlist-end 20" # Only check the first N videos. ]; @@ -97,7 +97,7 @@ in { "https://www.youtube.com/channel/UCekQr9znsk2vWxBo3YiLq2w" # You Suck at Cooking "https://www.youtube.com/channel/UCUAKaXyq2hVBCph1LOUtuqg" # 집밥요리 Home Cooking ]; - startAt = "weekly"; + startAt = "Sunday"; extraArgs = [ "--playlist-end 15" # Check the first N videos. ]; diff --git a/templates/basic-devshell/flake.nix b/templates/basic-devshell/flake.nix index 23f86b65..e272e599 100644 --- a/templates/basic-devshell/flake.nix +++ b/templates/basic-devshell/flake.nix @@ -9,7 +9,7 @@ outputs = inputs@{ self, nixpkgs, ... }: let systems = inputs.flake-utils.lib.defaultSystems; in inputs.flake-utils.lib.eachSystem systems (system: { - devShell = + devShells.default = import ./shell.nix { pkgs = import nixpkgs { inherit system; }; }; }); } diff --git a/users/home-manager/foo-dogsquared/default.nix b/users/home-manager/foo-dogsquared/default.nix index 70576cc7..5103339b 100644 --- a/users/home-manager/foo-dogsquared/default.nix +++ b/users/home-manager/foo-dogsquared/default.nix @@ -24,12 +24,8 @@ in { programs.home-manager.enable = true; home.packages = with pkgs; [ - neovim - borgmatic - borgbackup ncmpcpp vscodium-fhs - tree-sitter yt-dlp-for-audio ]; @@ -108,6 +104,7 @@ in { dev = { enable = true; shell.enable = true; + extras.enable = true; }; editors.emacs.enable = true; desktop = { @@ -123,24 +120,30 @@ in { enable = true; archivePath = "%h/library/archives"; withDependencies = true; + webserver.enable = true; jobs = { arts = { links = [ "https://www.davidrevoy.com/feed/rss" - "https://www.youtube.com/c/ronillust" + "https://librearts.org/index.xml" ]; startAt = "weekly"; }; computer = { links = [ + "https://blog.mozilla.org/en/feed/" "https://distill.pub/rss.xml" + "https://drewdevault.com/blog/index.xml" "https://fasterthanli.me/index.xml" - "https://arxiv.org/rss/cs" - "https://awesomekling.github.io/feed.xml" + "https://jvns.ca/atom.xml" + "https://www.bytelab.codes/rss/" + "https://www.collabora.com/feed" + "https://www.jntrnr.com/atom.xml" + "https://yosoygames.com.ar/wp/?feed=rss" + "https://simblob.blogspot.com/feeds/posts/default" ]; - extraOptions = [ "--depth 1" ]; startAt = "daily"; }; @@ -148,6 +151,8 @@ in { links = [ "https://veloren.net/rss.xml" "https://guix.gnu.org/feeds/blog.atom" + "https://fedoramagazine.org/feed/" + "https://nixos.org/blog/announcements-rss.xml" ]; startAt = "*-*-1/2"; };