From 774cf0d99173a9697f031c9bb7dec456c405147f Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 3 Apr 2024 05:03:16 -0500 Subject: [PATCH] building nix --- .config/tridactyl/tridactylrc | 2 +- flake.lock | 255 ++++++++++++++++++++++------------ home/home.nix | 14 +- modules/desktop.nix | 6 +- 4 files changed, 175 insertions(+), 102 deletions(-) diff --git a/.config/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc index f828195..cc6b610 100644 --- a/.config/tridactyl/tridactylrc +++ b/.config/tridactyl/tridactylrc @@ -66,7 +66,7 @@ command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_ command torrent js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('transadd ' + url)) " YTDL -command ytdl js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('dlvideo ' + url)) +command ytdl js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('alacritty -e dlvid.lisp ' + url)) command aud js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('dlaudio ' + url)) diff --git a/flake.lock b/flake.lock index d3ba700..2795593 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1701453400, - "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=", + "lastModified": 1712136515, + "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", "owner": "Kirottu", "repo": "anyrun", - "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5", + "rev": "be6728884d543665e7bd137bbef62dc1d04a210b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708679224, - "narHash": "sha256-V66NAQSTakocPST2GYv4SKK+ALBg3sgCNq0jIOpNkpc=", + "lastModified": 1712108714, + "narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "841abef01afbd293aa80130bcbd811e4102d5770", + "rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708465329, - "narHash": "sha256-A+fZjpKZe81F7PdpTxMPSLpHfqnlN3jbVZ7P5xwwZ1k=", + "lastModified": 1711884036, + "narHash": "sha256-DkJBMFUG8GLCoZ5yEXRDb4iWQjH+V6hrB4QQuRrn2F8=", "owner": "elkowar", "repo": "eww", - "rev": "d96586c209cad2c1098a4caa42133329bef852e8", + "rev": "149727ce1f7dd4f461ab1d61d560546f3d1f32a1", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -147,6 +147,24 @@ "inputs": { "systems": "systems" }, + "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_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -161,24 +179,9 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -196,14 +199,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_6" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -219,11 +222,11 @@ ] }, "locked": { - "lastModified": 1708591310, - "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", + "lastModified": 1712093955, + "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", + "rev": "80546b220e95a575c66c213af1b09fe255299438", "type": "github" }, "original": { @@ -233,21 +236,48 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711466786, + "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs", - "systems": "systems_2", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1708650152, - "narHash": "sha256-OZUS5FED7KKAPpNaJYQr4BPGXQzGrDFgkKVg9U2aZh8=", + "lastModified": 1712135388, + "narHash": "sha256-IpJNUCvVFBKdEKsFL8GKBq0VUVSwn/kLrgXA+VW5hoA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8c3613632a6ccebf9fb797ec756ecfce99514eec", + "rev": "347b83903474ab9e95fa9d4ba123f6f78ab38d40", "type": "github" }, "original": { @@ -260,14 +290,19 @@ "inputs": { "hyprland": [ "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1708270226, - "narHash": "sha256-PCsEiFKBDZ1VKw8rlo8D/J+22gic7ls5zDWcU3AAxGQ=", + "lastModified": 1712058759, + "narHash": "sha256-NRf7UmiOzz/FWmfNrzX30bIQ8vebyQLRgAjTxZa/FTs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "f99822818ec8276cfd6ec99ab60c4708c9884e3d", + "rev": "00519a43c11f3343a63a6fc15deb7f7bc5624324", "type": "github" }, "original": { @@ -305,15 +340,17 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprcursor", "nixpkgs" - ] + ], + "systems": "systems_3" }, "locked": { - "lastModified": 1708005943, - "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -326,16 +363,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -351,11 +391,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1708572487, - "narHash": "sha256-oEKYnpEcIjN7JtGhxKP6wijCJh/7RChnvsIHEIMJ6H4=", + "lastModified": 1711913683, + "narHash": "sha256-G/FLkRDQUMki7QLXdegMYoJMgFa5bP0dmBv3LBxmCAc=", "owner": "chriscochrun", "repo": "lumina", - "rev": "5e36156d4f9eb33a75da46e9b6636d6044df9237", + "rev": "1117d6eea2ebb50ac7b27c90e05d8078ab8db847", "type": "gitlab" }, "original": { @@ -390,11 +430,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1707766590, - "narHash": "sha256-5PagOo7cUs2EAPTs94UoSGl44X8xchtUKsB+4flmZGs=", + "lastModified": 1709627108, + "narHash": "sha256-SlNuXat2lUO1O8HqDgpweTceSo4dZK8vhEhf8CWtgj8=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dea9c6364dad1c000cc1f389b6dccde8c1a9c8a4", + "rev": "502c73d5146623b8cb431563a7c15629a310d9b1", "type": "github" }, "original": { @@ -406,11 +446,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -422,11 +462,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -453,11 +493,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1708566995, - "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cb4ae6689d2aa3f363516234572613b31212b78", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -469,11 +509,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1708566995, - "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3cb4ae6689d2aa3f363516234572613b31212b78", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -485,11 +525,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707451808, - "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { @@ -531,11 +571,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { @@ -547,11 +587,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -601,11 +641,11 @@ ] }, "locked": { - "lastModified": 1661655464, - "narHash": "sha256-by9Hb0mNVdiCR7TBvUHIgDb0QIv3znp8VMGh7Bl35VQ=", + "lastModified": 1708395022, + "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0c4c1432353e12b325d1472bea99e364871d2cb3", + "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b", "type": "github" }, "original": { @@ -652,6 +692,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -666,7 +721,22 @@ "type": "github" } }, - "systems_3": { + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -681,7 +751,7 @@ "type": "github" } }, - "systems_4": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -715,18 +785,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -736,7 +806,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang_2", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -747,11 +820,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 70a1889..6812fcb 100644 --- a/home/home.nix +++ b/home/home.nix @@ -49,12 +49,12 @@ in extraPortals = [ pkgs.xdg-desktop-portal-kde ]; }; - home.file.".config/xdg-desktop-portal/portals.conf" = { - text = '' - [preferred] - org.freedesktop.impl.portal.FileChooser=kde - ''; - }; + # home.file.".config/xdg-desktop-portal/portals.conf" = { + # text = '' + # [preferred] + # org.freedesktop.impl.portal.FileChooser=kde + # ''; + # }; programs.gpg = { enable = true; @@ -62,7 +62,7 @@ in services.gpg-agent = { enable = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; # extraConfig = '' # pinentry-program ${pkgs.pinentry.qt}/bin/pinentry # ''; diff --git a/modules/desktop.nix b/modules/desktop.nix index aed3e86..45329d5 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -89,12 +89,12 @@ with lib; enable = true; settings = rec { initial_session = { - command = "hyprland"; + command = "dbus-run-session Hyprland"; # command = "dbus-run-session startplasma-wayland"; user = "chris"; }; default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'hyprland' -s /etc/greetd/environments"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; user = "greeter"; }; plasma_session = { @@ -102,7 +102,7 @@ with lib; user = "chris"; }; hyprland_session = { - command = "/home/chris/bin/hyprland"; + command = "Hyprland"; user = "chris"; }; };