From d016fabf0b3fbdc65d42e3489df84fdd598eb831 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 10 Jul 2024 13:03:19 -0500 Subject: [PATCH] some updates --- .config/ags/config.js | 5 +- flake.lock | 134 ++++++++++++++------------------------ home/modules/hyprland.nix | 2 +- 3 files changed, 54 insertions(+), 87 deletions(-) diff --git a/.config/ags/config.js b/.config/ags/config.js index 38294cb..ba06b1c 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -8,6 +8,7 @@ import { NotificationPopups } from "./notifications.js" import { BatteryPopup } from "./battery.js" const laptop = Utils.exec(`hostname`) === "syl"; +// const display = Gdk.Display.get_default(); console.log(laptop ? "Running on syl" : "Running on kaladin"); function map_workspaces(id) { @@ -176,9 +177,9 @@ function Bar(monitor = 0) { App.config({ style: css, windows: [ - Bar(laptop ? 0 : 1), // can be instantiated for each monitor + Bar(laptop ? 0 : 2), // can be instantiated for each monitor NotificationPopups(), - BatteryPopup() + (laptop ? BatteryPopup() : null) ], }) diff --git a/flake.lock b/flake.lock index 209d294..1480e8a 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713171039, - "narHash": "sha256-9QrWi1VqMafXPAWw126uWRn56MtwzokNxDevSTjeQ/U=", + "lastModified": 1720631485, + "narHash": "sha256-l/xKm4WtVw8zbVHTqeedFjNk52O943XxzVEGS+1Libs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "612646835968f663fd0e8f1a21ef52b5d0b88c57", + "rev": "9cb438ce0f2ac37fe8a9935a250e9b85581cd69d", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713106678, - "narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=", + "lastModified": 1720177068, + "narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "owner": "elkowar", "repo": "eww", - "rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a", + "rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "type": "github" }, "original": { @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1699821751, - "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", + "lastModified": 1719830626, + "narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", + "rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", "type": "github" }, "original": { @@ -378,24 +378,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -436,11 +418,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1720470846, + "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "type": "github" }, "original": { @@ -478,11 +460,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713109956, - "narHash": "sha256-JMJBqWnuM3JWkoYnou/OW46FSt9UX/LpXARJTYAG6jA=", + "lastModified": 1719416660, + "narHash": "sha256-TTj6dGMOqZqjbzAo1wWvtpcV1RpwKPTR2ItLGE7kuo4=", "owner": "chriscochrun", "repo": "lumina", - "rev": "a00f1b081a3907c664074f4164bde9c604c48c92", + "rev": "49893808658126078b117b36b21f10565de63934", "type": "gitlab" }, "original": { @@ -517,11 +499,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1712227415, - "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=", + "lastModified": 1720159196, + "narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace", + "rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", "type": "github" }, "original": { @@ -533,11 +515,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1720515935, + "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "type": "github" }, "original": { @@ -576,27 +558,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -608,11 +590,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712026416, - "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", + "lastModified": 1720027103, + "narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080a4a27f206d07724b88da096e27ef63401a504", + "rev": "61684d356e41c97f80087e89659283d00fe032ab", "type": "github" }, "original": { @@ -640,11 +622,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -656,11 +638,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -696,11 +678,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719406150, - "narHash": "sha256-ArpjlpHqNBCFtJVVAhPobDpSq0rawUZAplOHwf/u2K4=", + "lastModified": 1720526170, + "narHash": "sha256-i+42syggxAdDLo9MCs+Cx3BSil8RTW3VGfLkR5gbD8E=", "ref": "refs/heads/master", - "rev": "92c9e21873be1c9107f906f826d4774a8a950d79", - "revCount": 2024, + "rev": "54551b117435a006acddefbf3850b02d6ee84ffa", + "revCount": 2040, "type": "git", "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" }, @@ -735,11 +717,11 @@ ] }, "locked": { - "lastModified": 1708395022, - "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=", + "lastModified": 1708999822, + "narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b", + "rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", "type": "github" }, "original": { @@ -775,17 +757,16 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713150335, - "narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", + "lastModified": 1720577957, + "narHash": "sha256-RZuzLdB/8FaXaSzEoWLg3au/mtbuH7MGn2LmXUKT62g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", + "rev": "a434177dfcc53bf8f1f348a3c39bfb336d760286", "type": "github" }, "original": { @@ -833,11 +814,11 @@ ] }, "locked": { - "lastModified": 1719152448, - "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", + "lastModified": 1719525570, + "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "owner": "danth", "repo": "stylix", - "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", + "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "type": "github" }, "original": { @@ -921,21 +902,6 @@ "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/home/modules/hyprland.nix b/home/modules/hyprland.nix index 64d2815..fd0a92d 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -97,7 +97,7 @@ in ]; workspace = [ "1,name:code,monitor:eDP-1,1,default:true,persistent:true" - "2,name:browse,monitor:HDMI-A-1,default:true,persistent:true" + "2,name:browse,monitor:DP-1,default:true,persistent:true" "9,name:monitor,monitor:DP-2,gapsout:0,rounding:false,default:true,persistent:true" "1,monitor:DP-1,1,default:true,persistent:true" "special,monitor:DP-1,1,default:true"