diff --git a/flake.lock b/flake.lock index 2eb1308..eb28eff 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,46 @@ { "nodes": { + "alejandra": { + "inputs": { + "fenix": "fenix", + "flakeCompat": "flakeCompat", + "nixpkgs": [ + "persway", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658427149, + "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "repo": "alejandra", + "type": "github" + } + }, + "all-cabal-json": { + "flake": false, + "locked": { + "lastModified": 1665552503, + "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", + "owner": "nix-community", + "repo": "all-cabal-json", + "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "hackage", + "repo": "all-cabal-json", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -54,6 +95,140 @@ "type": "github" } }, + "crane_3": { + "flake": false, + "locked": { + "lastModified": 1670900067, + "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "persway", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677856503, + "narHash": "sha256-TW8my47VpavO/PXA5hIumUcX80cj0AufojjUTdUonLw=", + "owner": "numtide", + "repo": "devshell", + "rev": "643d1857fea4e71e7f251cb574f59b1d63778085", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "flake": false, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "alejandra": "alejandra", + "all-cabal-json": "all-cabal-json", + "crane": "crane_3", + "devshell": "devshell_2", + "flake-parts": "flake-parts", + "flake-utils-pre-commit": "flake-utils-pre-commit", + "ghc-utils": "ghc-utils", + "gomod2nix": "gomod2nix", + "mach-nix": "mach-nix", + "nix-pypi-fetcher": "nix-pypi-fetcher", + "nixpkgs": [ + "persway", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "pre-commit-hooks": "pre-commit-hooks_2", + "pruned-racket-catalog": "pruned-racket-catalog" + }, + "locked": { + "lastModified": 1677289985, + "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "persway", + "dream2nix", + "alejandra", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1657607339, + "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "persway", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1678256692, + "narHash": "sha256-c7yiGJjDGmnBl1urFTTeTTrBeOIHpRiF4gIxTLiD21Y=", + "owner": "nix-community", + "repo": "fenix", + "rev": "6f8e764f0f9af84e98c53b8dc2feffb7f7d6d103", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -118,6 +293,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "persway", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -136,6 +333,21 @@ "type": "github" } }, + "flake-utils-pre-commit": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "inputs": { "systems": "systems_2" @@ -191,15 +403,12 @@ } }, "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -208,6 +417,38 @@ "type": "github" } }, + "flakeCompat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "ghc-utils": { + "flake": false, + "locked": { + "lastModified": 1662774800, + "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", + "ref": "refs/heads/master", + "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", + "revCount": 1072, + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -230,6 +471,22 @@ "type": "github" } }, + "gomod2nix": { + "flake": false, + "locked": { + "lastModified": 1627572165, + "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane", @@ -277,8 +534,12 @@ "inputs": { "crane": "crane_2", "naersk": "naersk", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_3" + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1692214333, @@ -310,6 +571,21 @@ "type": "github" } }, + "mach-nix": { + "flake": false, + "locked": { + "lastModified": 1634711045, + "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", + "owner": "DavHau", + "repo": "mach-nix", + "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", + "type": "github" + }, + "original": { + "id": "mach-nix", + "type": "indirect" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs" @@ -348,10 +624,26 @@ "type": "github" } }, + "nix-pypi-fetcher": { + "flake": false, + "locked": { + "lastModified": 1669065297, + "narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=", + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "rev": "a9885ac6a091576b5195d547ac743d45a2a615ac", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "type": "github" + } + }, "nix-rice": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "kitty-themes-src": "kitty-themes-src", "nixpkgs-lib": "nixpkgs-lib", "pre-commit-hooks": "pre-commit-hooks" @@ -447,22 +739,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1690789960, - "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fb942492b7accdee4e6d17f5447091c65897dde4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -478,7 +754,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1692174805, "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", @@ -509,6 +785,49 @@ "type": "github" } }, + "persway": { + "inputs": { + "devshell": "devshell", + "dream2nix": "dream2nix", + "fenix": "fenix_2", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688297250, + "narHash": "sha256-+gnAY9xBvs+1h6G3dzcImztsQpQs9zcXTBZCs6vdkG0=", + "owner": "johnae", + "repo": "persway", + "rev": "24e02124c4f0b7be933e768a11a14e510a389bf5", + "type": "github" + }, + "original": { + "owner": "johnae", + "repo": "persway", + "type": "github" + } + }, + "poetry2nix": { + "flake": false, + "locked": { + "lastModified": 1666918719, + "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "289efb187123656a116b915206e66852f038720e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "1.36.0", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -517,7 +836,7 @@ "flake-utils" ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -534,6 +853,50 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-utils": [ + "persway", + "dream2nix", + "flake-utils-pre-commit" + ], + "nixpkgs": [ + "persway", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646153636, + "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pruned-racket-catalog": { + "flake": false, + "locked": { + "lastModified": 1672537287, + "narHash": "sha256-SuOvXVcLfakw18oJB/PuRMyvGyGG1+CQD3R+TGHIv44=", + "owner": "nix-community", + "repo": "pruned-racket-catalog", + "rev": "c8b89557fb53b36efa2ee48a769c7364df0f6262", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "catalog", + "repo": "pruned-racket-catalog", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -543,10 +906,45 @@ "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nix-std": "nix-std", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", - "rust-overlay": "rust-overlay_4" + "persway": "persway", + "rust-overlay": "rust-overlay_3" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1657557289, + "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1678199120, + "narHash": "sha256-G8z2A1NvywTOATMTvx+FPxMf4PC91p0Z7fONx5PYW+4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "ecc32c2f8517576b26060915bcb0cdb00cafd060", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" } }, "rust-overlay": { @@ -602,28 +1000,6 @@ } }, "rust-overlay_3": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690683485, - "narHash": "sha256-Sp/QpbMg86v12xhCsa6q0yTH8LYaJIcxzbf9LO1zFzM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "05d480a7aef1aae1bfb67a39134dcf48c5322528", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { "inputs": { "flake-utils": [ "flake-utils" @@ -705,21 +1081,6 @@ "repo": "default", "type": "github" } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5c88540..ca17245 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,22 @@ nix-std.url = "github:chessai/nix-std"; - ironbar.url = "github:JakeStanger/ironbar"; + ironbar = { + url = "github:JakeStanger/ironbar"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; + }; + + persway = { + url = "github:johnae/persway"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; + + # anyrun = { + # url = "github:Kirottu/anyrun"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -44,6 +59,7 @@ home-manager, nur, ironbar, + persway, helix, nix-index-database, nix-rice, diff --git a/home/home.nix b/home/home.nix index a745f13..66591c9 100644 --- a/home/home.nix +++ b/home/home.nix @@ -14,6 +14,7 @@ in { imports = [ inputs.ironbar.homeManagerModules.default + # inputs.anyrun.homeManagerModules.default # ./programs/eww/default.nix ]; @@ -65,6 +66,8 @@ in { # libsForQt5.qtstyleplugin-kvantum gtk-engine-murrine + + persway ] ++ pkgs.rice.fonts.pkgs ++ pkgs.rice.icons.pkgs; @@ -144,13 +147,6 @@ in { wayland.windowManager.sway = { enable = true; package = pkgs.sway; - # package = pkgs.swayfx; - extraConfig = with pkgs.rice; '' - default_orientation vertical - ''; - # swayfx - # corner_radius ${builtins.toString borders.rounding} - # default_dim_inactive 0.15 config = with pkgs.rice; { bars = []; # reintroduces flicker @@ -178,12 +174,6 @@ in { hideEdgeBorders = "smart"; titlebar = false; commands = [ - { - command = "split toggle"; - criteria = { - app_id = ".*"; - }; - } { command = "move scratchpad"; criteria = { @@ -208,6 +198,7 @@ in { {command = "swayosd --max-volume 100";} {command = "keepassxc";} {command = "swaync";} + {command = "persway daemon -d spiral";} ]; terminal = "kitty"; modifier = "Mod4"; @@ -401,6 +392,17 @@ in { (builtins.readFile dots/wlogout/style.css)); }; + # programs.anyrun = { + # enable = true; + # config = { + # plugins = with inputs.anyrun.packages.${pkgs.system}; [ applications dictionary rink symbols stdin shell ]; + # y = { fraction = 0.35; }; + # width = { absolute = 400; }; + # height = { absolute = 600; }; + # showResultsImmediately = true; + # }; + # }; + programs.fuzzel = with pkgs.rice; { enable = true; settings = { diff --git a/system/configuration.nix b/system/configuration.nix index 62b4d35..ecaeb8e 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -19,6 +19,7 @@ inputs.nix-rice.overlays.default outputs.overlays.rice inputs.helix.overlays.default + inputs.persway.overlays.default # inputs.eww.overlays.default ]; config = { @@ -32,6 +33,12 @@ settings = { trusted-users = [ "bolt" ]; experimental-features = "nix-command flakes"; + substitute = true; + substituters = [ "https://anyrun.cachix.org" "https://jakestanger.cachix.org" ]; + trusted-public-keys = [ + "jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + ]; }; };