From 4c25000f234f53e8c75464b58702701f4d88a3e3 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 10 Jul 2024 09:14:53 -0500 Subject: [PATCH] adding some things --- .config/ags/config.js | 2 +- .gitignore | 1 + flake.lock | 124 +++++++++++++++++++++++++++++++++++++- flake.nix | 6 ++ modules/desktop.nix | 5 ++ pkgs/desktop-packages.nix | 2 +- scripts/dlvid.lisp | 27 +++++---- 7 files changed, 150 insertions(+), 17 deletions(-) create mode 100644 .gitignore diff --git a/.config/ags/config.js b/.config/ags/config.js index 9c339be..38294cb 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -176,7 +176,7 @@ function Bar(monitor = 0) { App.config({ style: css, windows: [ - Bar(laptop ? 0 : 2), // can be instantiated for each monitor + Bar(laptop ? 0 : 1), // can be instantiated for each monitor NotificationPopups(), BatteryPopup() ], diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..824fe39 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.gitsigners diff --git a/flake.lock b/flake.lock index c592e5d..209d294 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1714183630, + "narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "35e7459a331d3e0c585e56dabd03006b9b354088", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "ags": { "inputs": { "nixpkgs": [ @@ -150,6 +166,27 @@ "type": "gitlab" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "radicle", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", + "owner": "ipetkov", + "repo": "crane", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "emacs": { "inputs": { "flake-utils": "flake-utils", @@ -327,6 +364,24 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -630,6 +685,30 @@ "type": "indirect" } }, + "radicle": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1719406150, + "narHash": "sha256-ArpjlpHqNBCFtJVVAhPobDpSq0rawUZAplOHwf/u2K4=", + "ref": "refs/heads/master", + "rev": "92c9e21873be1c9107f906f826d4774a8a950d79", + "revCount": 2024, + "type": "git", + "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" + }, + "original": { + "type": "git", + "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" + } + }, "root": { "inputs": { "ags": "ags", @@ -641,7 +720,8 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_2", + "radicle": "radicle", + "rust-overlay": "rust-overlay_3", "simple-nixos-mailserver": "simple-nixos-mailserver", "stylix": "stylix" } @@ -670,7 +750,32 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": [ + "radicle", + "flake-utils" + ], + "nixpkgs": [ + "radicle", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715307487, + "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -816,6 +921,21 @@ "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" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 0208be0..a434ecf 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,11 @@ # url = "github:hyprwm/hyprland-plugins"; # inputs.hyprland.follows = "hyprland"; # }; + radicle = { + type = "git"; + url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; eww = { url = "github:elkowar/eww"; inputs.nixpkgs.follows = "nixpkgs"; @@ -69,6 +74,7 @@ eww, ags, stylix, + radicle, rust-overlay, ... }: let system = "x86_64-linux"; diff --git a/modules/desktop.nix b/modules/desktop.nix index e08b967..bbf02e0 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -42,11 +42,16 @@ with lib; # desktopManager.gnome.enable = true; }; + programs.ssh.startAgent = true; security.pam.services.kwallet = { name = "kwallet"; enableKwallet = true; }; + systemd.extraConfig = '' + DefaultTimeoutStopSec=10s + ''; + # stylix = { # enable = true; # polarity = "dark"; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 8f16681..7245966 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -153,7 +153,7 @@ with lib; # pfetch macchina gimp - # krita + krita powertop element-desktop-wayland scrcpy diff --git a/scripts/dlvid.lisp b/scripts/dlvid.lisp index 096837d..2aa1fd4 100755 --- a/scripts/dlvid.lisp +++ b/scripts/dlvid.lisp @@ -5,20 +5,21 @@ (defvar *url* (car (uiop:command-line-arguments))) +(defun dlvid (url) + (run-program "yt-dlp" + `("-o" + "~/vids/%(title)s.%(ext)s" + ,url + "--embed-thumbnail" + "--sponsorblock-remove=sponsor,intro,outro") + :search "/run/current-system/sw/bin/" + :output t)) + (defun main () (if (serapeum:string-contains-p "inv.cochrun.xyz" *url*) - (run-program "yt-dlp" - `("-o" - "~/vids/%(title)s.%(ext)s" - ,(serapeum:string-replace-all - "inv.cochrun.xyz" *url* "youtube.com")) - :search "/run/current-system/sw/bin/" - :output t) - (run-program "yt-dlp" - `("-o" - "~/vids/%(title)s.%(ext)s" - ,(string *url*)) - :search "/run/current-system/sw/bin/" - :output t))) + (let ((url (serapeum:string-replace-all + "inv.cochrun.xyz" *url* "youtube.com"))) + (dlvid (string url))) + (dlvid (string url)))) (main)