diff --git a/flake.lock b/flake.lock index bc58349..bba6845 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728530651, - "narHash": "sha256-b3icYsSiWvjeunpgoRmvmCxh1ak+oXpWEqHuzNgC7wM=", + "lastModified": 1728591802, + "narHash": "sha256-/HefSuC9DgRAVfiZ64+E32L5WHu9mpqrcnnZA9em2iY=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "9bdf58ccc52095d846186cb3549122205b36991a", + "rev": "7a40bf82de534822d22503e195f2b71715277ad6", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "joe_nixpkgs": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728001490, - "narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=", + "lastModified": 1728603284, + "narHash": "sha256-ecnalVee5X0m3pyQyaz6IH/EnveQERA8RSPlAyS54+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52cfd83eee767c5d02089efe79c4811ffc52a046", + "rev": "d3429a135af936205b7af11a70780cb03260586c", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1728328465, - "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -1146,11 +1146,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1728010640, - "narHash": "sha256-XHCxilOezO/dM90v7kBx3Va7sc248A2H6vmSOO7caIE=", + "lastModified": 1728606809, + "narHash": "sha256-96/S+ggGJWTyMn+tPktqNL55vPeKbn4SF7zq6kNsOuQ=", "ref": "refs/heads/master", - "rev": "4032e16f3b9fc2ceeccb72807ee2b8b47839a475", - "revCount": 206, + "rev": "82f657a8bd8eac4b94a3254cab5c15499031c65e", + "revCount": 207, "type": "git", "url": "https://git.joshuabell.xyz/nvim" }, diff --git a/modules/de/cosmic/cosmic.nix b/modules/de/cosmic/cosmic.nix index 640c1f0..e10810a 100644 --- a/modules/de/cosmic/cosmic.nix +++ b/modules/de/cosmic/cosmic.nix @@ -43,6 +43,10 @@ in trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; }; + environment.systemPackages = with pkgs; [ + wl-clipboard + ]; + # Enable cosmic services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; diff --git a/modules/shell/common.sh b/modules/shell/common.sh index 3a7277e..c9f252a 100644 --- a/modules/shell/common.sh +++ b/modules/shell/common.sh @@ -7,26 +7,26 @@ htop_pid () { htop -p $(ps -ef | awk -v proc=$1 '$3 == proc { cnt++;if (cnt == 1) { printf "%s",$2 } else { printf ",%s",$2 } }') } -kill_psg() { +psg_kill() { PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - echo Killing ${PIDS} for pid in ${PIDS}; do + echo "killing ${pid}" kill -9 ${pid} &> /dev/null done } -term_psg() { +psg_terminate() { PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - echo Terminating ${PIDS} for pid in ${PIDS}; do + echo " ${pid}" kill -15 ${pid} &> /dev/null done } -skill_psg() { +psg_skill() { PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - echo Quitting ${PIDS} for pid in ${PIDS}; do + echo "killing ${pid}" sudo kill -9 ${pid} &> /dev/null done; } diff --git a/users/josh/home_manager/vivaldi.nix b/users/josh/home_manager/vivaldi.nix deleted file mode 100644 index 347b1f5..0000000 --- a/users/josh/home_manager/vivaldi.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.vivaldi ]; -} -