From c5c0a98c5ad48bc5749ec44b1a50a3f67b148e56 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 6 Sep 2024 10:01:48 -0500 Subject: [PATCH] fixing upgrades and updates --- flake.lock | 154 ++++++++++++++++++++++---------------- flake.nix | 2 +- home/modules/hyprland.nix | 4 + scripts/update-nix | 3 +- scripts/upgrade-nix | 7 +- 5 files changed, 102 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 1cff98e..026db9a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1714183630, - "narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=", + "lastModified": 1722017365, + "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=", "owner": "rustsec", "repo": "advisory-db", - "rev": "35e7459a331d3e0c585e56dabd03006b9b354088", + "rev": "9d024c07ee8c18609b43436bc865abf46636e250", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", + "lastModified": 1722907532, + "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=", "owner": "ipetkov", "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1724119075, - "narHash": "sha256-rZe4WgHhLqhu4NjGVYyIQ36ieHZgSkfnNMdLzKaqFQk=", + "lastModified": 1725614258, + "narHash": "sha256-QhrhRVdcpCxz22rGXjjvuKij3PjMFN/DMlSIKZk9eaM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e197771f35c8c330324256c5f306614f273ffd9d", + "rev": "5d87c6391f09134b214a85eb3b28ecbebbad7269", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1720177068, - "narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", + "lastModified": 1725366879, + "narHash": "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=", "owner": "elkowar", "repo": "eww", - "rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", + "rev": "8661abf2bf07f5a809fc995233d93810cc1ac871", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -377,7 +377,10 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": [ + "stylix", + "systems" + ] }, "locked": { "lastModified": 1710146030, @@ -433,11 +436,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1725628988, + "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", "type": "github" }, "original": { @@ -455,11 +458,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -470,7 +473,7 @@ }, "libre-presenter": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "naersk": "naersk", "nixpkgs": "nixpkgs_2" }, @@ -509,16 +512,16 @@ "nix-bitcoin": { "inputs": { "extra-container": "extra-container", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1723533469, - "narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=", + "lastModified": 1724684170, + "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7", + "rev": "31b79391cf96b64c3982038c8284e04345429dbd", "type": "github" }, "original": { @@ -530,11 +533,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -573,11 +576,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { @@ -605,11 +608,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723221148, - "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", "type": "github" }, "original": { @@ -637,11 +640,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -653,11 +656,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -696,6 +699,29 @@ "type": "indirect" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725575977, + "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "plasma-manager", + "type": "github" + } + }, "quickemu": { "inputs": { "flake-schemas": "flake-schemas", @@ -718,18 +744,18 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1724168344, - "narHash": "sha256-JqBcwOOeiXFtVGKFrutTVALleh/3wbzgIZzSh3k67bk=", + "lastModified": 1725360130, + "narHash": "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=", "ref": "refs/heads/master", - "rev": "8922388caa8ad879bdc2b82267bb5122afb77a1e", - "revCount": 2083, + "rev": "d39ba83cfc7c7685548d18652fef039e25b19276", + "revCount": 2100, "type": "git", "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" }, @@ -749,6 +775,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", + "plasma-manager": "plasma-manager", "quickemu": "quickemu", "radicle": "radicle", "rust-overlay": "rust-overlay_3", @@ -758,18 +785,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ "eww", "nixpkgs" ] }, "locked": { - "lastModified": 1708999822, - "narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", + "lastModified": 1723688259, + "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", + "rev": "6e75319846684326d900daff1e2e11338cc80d2b", "type": "github" }, "original": { @@ -780,21 +806,17 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "radicle", - "flake-utils" - ], "nixpkgs": [ "radicle", "nixpkgs" ] }, "locked": { - "lastModified": 1715307487, - "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=", + "lastModified": 1722910815, + "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f", + "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733", "type": "github" }, "original": { @@ -810,11 +832,11 @@ ] }, "locked": { - "lastModified": 1724120436, - "narHash": "sha256-/MvfxTjco5UDBF6SEvwyeXrXwZG7nz7/mDVreQNKsWg=", + "lastModified": 1725589472, + "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "48e61fe824f5823e4f3f15dd9a75c19c63649269", + "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "type": "github" }, "original": { @@ -855,18 +877,20 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_5", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_6" }, "locked": { - "lastModified": 1724091143, - "narHash": "sha256-55CrA0BNqmnS4qB812D7JY9hNBB0r36sJlErepkfeTo=", + "lastModified": 1725290973, + "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", "owner": "danth", "repo": "stylix", - "rev": "94d70292d0c687ebacb65d00bd516cbefa18d3ca", + "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5e964d8..7409f57 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; plasma-manager = { - url = "githube:nix-community/plasma-manager"; + url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 750c2d9..6d5c9fa 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -207,8 +207,12 @@ in "float,nm-tray" "size 60% 60%,dolphin" "float,mpv" + "float,title:Picture-in-Picture" + "center,title:Picture-in-Picture" "size ${if laptop then "90% 76%" else "85% 85%"},mpv" "${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,mpv"}" + "${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,title:Picture-In-Picture"}" + "${if laptop then "workspace 1,idk #dummy rule" else "fullscreen,title:Picture-In-Picture"}" "center,mpv" "opaque,mpv" "float,pulsemixer" diff --git a/scripts/update-nix b/scripts/update-nix index 0018c0c..0937d2b 100755 --- a/scripts/update-nix +++ b/scripts/update-nix @@ -1,6 +1,7 @@ #!/bin/sh currentdir=$(pwd) -if [[hostname == "kaladin"]]; then +hostname=$(hostname) +if [[ $hostname == kaladin ]]; then cd ~/.config/dotfiles else cd ~/.dotfiles diff --git a/scripts/upgrade-nix b/scripts/upgrade-nix index e3837cf..3312438 100755 --- a/scripts/upgrade-nix +++ b/scripts/upgrade-nix @@ -1,5 +1,10 @@ #!/bin/sh currentdir=$(pwd) -cd ~/.config/dotfiles/ +hostname=$(hostname) +if [[ $hostname == kaladin ]]; then + cd ~/.config/dotfiles +else + cd ~/.dotfiles +fi nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .# cd $currentdir