Compare commits

...

2 Commits

Author SHA1 Message Date
a8616a0a93
use nil instead of rnix-lsp 2022-08-14 04:09:46 +03:00
086f1a3489
woo yea 2022-08-14 01:27:38 +03:00
6 changed files with 389 additions and 103 deletions

View File

@ -1,5 +1,30 @@
{
"nodes": {
"alejandra": {
"inputs": {
"fenix": "fenix_2",
"flakeCompat": "flakeCompat",
"nixpkgs": [
"fufexan",
"webcord",
"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"
}
},
"base16-schemes": {
"flake": false,
"locked": {
@ -107,6 +132,22 @@
"type": "github"
}
},
"crane_4": {
"flake": false,
"locked": {
"lastModified": 1654444508,
"narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
"owner": "ipetkov",
"repo": "crane",
"rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
@ -185,6 +226,22 @@
}
},
"devshell_4": {
"flake": false,
"locked": {
"lastModified": 1653917170,
"narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
"owner": "numtide",
"repo": "devshell",
"rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"devshell_5": {
"flake": false,
"locked": {
"lastModified": 1655976588,
@ -384,13 +441,43 @@
}
},
"dream2nix_3": {
"inputs": {
"alejandra": "alejandra",
"crane": "crane_3",
"devshell": "devshell_4",
"flake-utils-pre-commit": "flake-utils-pre-commit",
"gomod2nix": "gomod2nix",
"mach-nix": "mach-nix",
"nixpkgs": [
"fufexan",
"webcord",
"nixpkgs"
],
"poetry2nix": "poetry2nix",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1660051305,
"narHash": "sha256-74Io9RB1VEZyVqSnNfG0VfxxdOyiY/CkSDE1nY4gBRc=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "2fe7790152d4b18fc60a8194459959fc7e4a2e60",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dream2nix",
"type": "github"
}
},
"dream2nix_4": {
"inputs": {
"alejandra": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"crane": "crane_3",
"crane": "crane_4",
"devshell": [
"helix",
"nixCargoIntegration",
@ -446,30 +533,11 @@
"type": "github"
}
},
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1659983351,
"narHash": "sha256-FsTn0f0t2B7AKAtCDOYd34ztKa+XOUtzRa4FtO8HgDw=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "a3770a9a619f508a0828df30cb10858663d4538b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"eww": {
"inputs": {
"fenix": "fenix",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"naersk": [
"fufexan",
"naersk"
@ -516,6 +584,31 @@
"type": "github"
}
},
"fenix_2": {
"inputs": {
"nixpkgs": [
"fufexan",
"webcord",
"dream2nix",
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2"
},
"locked": {
"lastModified": 1657607339,
"narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=",
"owner": "nix-community",
"repo": "fenix",
"rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -563,6 +656,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": {
"locked": {
"lastModified": 1642700792,
@ -580,11 +688,11 @@
},
"flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"lastModified": 1634851050,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
"type": "github"
},
"original": {
@ -595,11 +703,11 @@
},
"flake-utils_4": {
"locked": {
"lastModified": 1634851050,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
@ -625,11 +733,11 @@
},
"flake-utils_6": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@ -638,6 +746,22 @@
"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"
}
},
"flakeUtils": {
"locked": {
"lastModified": 1648297722,
@ -673,28 +797,30 @@
"deploy-rs": "deploy-rs",
"devshell": "devshell_2",
"discocss": "discocss_2",
"emacs-overlay": "emacs-overlay",
"eww": "eww",
"fu": "fu",
"helix": "helix",
"hm": "hm",
"hyprland": "hyprland",
"hyprland": [
"hyprland"
],
"hyprland-contrib": "hyprland-contrib",
"kmonad": "kmonad",
"naersk": "naersk",
"nil": "nil",
"nix-colors": "nix-colors",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"rnix-lsp": "rnix-lsp",
"spicetify-nix": "spicetify-nix"
"spicetify-nix": "spicetify-nix",
"webcord": "webcord"
},
"locked": {
"lastModified": 1660172648,
"narHash": "sha256-aysHb+76bnmgscx3Jgsgtn/fxCLnaH0GYfB+aB2HXeA=",
"lastModified": 1660254597,
"narHash": "sha256-V+vDrkcz4Bi8mMO90GQ5jJTWyD2mWkq/6nd1KJ3rct0=",
"owner": "fufexan",
"repo": "dotfiles",
"rev": "d8ef562706bca897af2b7e0f178deffb02aa9c08",
"rev": "993963377a3f4b9156b9c285953225c9790b5b28",
"type": "github"
},
"original": {
@ -703,6 +829,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": {
"nixCargoIntegration": "nixCargoIntegration",
@ -820,17 +962,16 @@
"hyprland": {
"inputs": {
"nixpkgs": [
"fufexan",
"nixpkgs"
],
"wlroots": "wlroots"
},
"locked": {
"lastModified": 1660148977,
"narHash": "sha256-eR/qlC8eDY7A+bkkiF28xCG0cPJr4HilMcD3/QJ05TQ=",
"lastModified": 1660378115,
"narHash": "sha256-8EE7BQvnWaFq1eb6EpLyUrfwzyFDs0N7PYZ/IyhUoDc=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f64f94ca565a2ec9f174f57a20fcfbfddb762cb8",
"rev": "214c2c7b1c0182594a07a2c5ac7d99e9d7b5fcb3",
"type": "github"
},
"original": {
@ -860,27 +1001,6 @@
"type": "github"
}
},
"hyprland_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots_2"
},
"locked": {
"lastModified": 1660168160,
"narHash": "sha256-dBfG89ugpHbWwqSexCtGqpHs4lZxO5zXWHAT5P2v06I=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cd75606f4232787a9faf55db0835b29e3bb45ae9",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"kmonad": {
"inputs": {
"nixpkgs": [
@ -904,6 +1024,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": [
@ -975,6 +1110,28 @@
"type": "github"
}
},
"nil_2": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_5"
},
"locked": {
"lastModified": 1660216264,
"narHash": "sha256-96VKj3Wk2MvoWnH0WIPAFFNwcZYHj8NN7s1TZ6oEVAA=",
"owner": "oxalica",
"repo": "nil",
"rev": "c5ff7b1d04391a70015a3a5fc10ba1f889af235f",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "nil",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
@ -996,7 +1153,7 @@
},
"nix-gaming": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1659340932,
@ -1043,8 +1200,8 @@
},
"nixCargoIntegration_2": {
"inputs": {
"devshell": "devshell_4",
"dream2nix": "dream2nix_3",
"devshell": "devshell_5",
"dream2nix": "dream2nix_4",
"nixpkgs": [
"helix",
"nixpkgs"
@ -1150,18 +1307,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 0,
"narHash": "sha256-7Ye59iW/DUWb8PzptEqdyYPlv6y+IhqKecaoZl3q68A=",
"path": "/nix/store/3a2j1ra0ymsmrmibafh96gryipxidyy7-source",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1656401090,
"narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=",
@ -1177,7 +1322,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1659987637,
"narHash": "sha256-8l+5QiCkackVPu/F3vX7RCKHyYKxEsq/TKMuaG6UX5k=",
@ -1193,6 +1338,22 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1660167503,
"narHash": "sha256-RAjzibSoilQ7+okrwvez59Ho6Nvf0FJm/F6ZJGjTksg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ebcea6302e4b221e79656f7a718f5cb55affde2f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1660071133,
@ -1224,6 +1385,52 @@
"type": "github"
}
},
"poetry2nix": {
"flake": false,
"locked": {
"lastModified": 1632969109,
"narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "1.21.0",
"repo": "poetry2nix",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-utils": [
"fufexan",
"webcord",
"dream2nix",
"flake-utils-pre-commit"
],
"nixpkgs": [
"fufexan",
"webcord",
"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"
}
},
"rnix-lsp": {
"inputs": {
"naersk": [
@ -1261,7 +1468,8 @@
"fufexan": "fufexan",
"helix": "helix_2",
"home": "home",
"hyprland": "hyprland_2",
"hyprland": "hyprland",
"nil": "nil_2",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence",
@ -1286,6 +1494,23 @@
"type": "github"
}
},
"rust-analyzer-src_2": {
"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-overlay": {
"flake": false,
"locked": {
@ -1304,7 +1529,7 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"fufexan",
"helix",
@ -1354,7 +1579,7 @@
},
"rust-overlay_4": {
"inputs": {
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"helix",
"nixpkgs"
@ -1374,6 +1599,31 @@
"type": "github"
}
},
"rust-overlay_5": {
"inputs": {
"flake-utils": [
"nil",
"flake-utils"
],
"nixpkgs": [
"nil",
"nixpkgs"
]
},
"locked": {
"lastModified": 1659599305,
"narHash": "sha256-htzFq5RffyoKSZxiLfpUq5CyhkQwycsXB5ptale5e78=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "28cedcb8dfea9f1b96b0635cf99fe6bdca163f4e",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"nixpkgs": [
@ -1425,25 +1675,43 @@
"type": "github"
}
},
"wlroots": {
"flake": false,
"webcord": {
"inputs": {
"dream2nix": "dream2nix_3",
"nixpkgs": "nixpkgs_4",
"webcord": "webcord_2"
},
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1659738224,
"narHash": "sha256-bV3TLiCgptpKoUKLiH/5RMtiIsfn0hawdaCEHQFB6WY=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "3baf2a6bcfc4cb86c364f5724aaec80f28715a01",
"type": "gitlab"
"lastModified": 1660242753,
"narHash": "sha256-M9ibcsDzWHp/678lTyxwwgXgdFx2d1YCevoGEIBVnxc=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "0892178832a090f0b9ab1a61e20f5d1389cfb23e",
"type": "github"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
"owner": "fufexan",
"repo": "webcord-flake",
"type": "github"
}
},
"wlroots_2": {
"webcord_2": {
"flake": false,
"locked": {
"lastModified": 1659951368,
"narHash": "sha256-PiEuZVRjufVvQuub7/Vl9gHqlkBkl5jcoxHhLkntqsw=",
"owner": "SpacingBat3",
"repo": "WebCord",
"rev": "a8e64a78d1e3a8c3d5e11893ebb8ba1ed92d7d12",
"type": "github"
},
"original": {
"owner": "SpacingBat3",
"repo": "WebCord",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",

View File

@ -19,12 +19,15 @@
hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
fufexan.url = "github:fufexan/dotfiles";
fufexan.inputs.hyprland.follows = "hyprland";
blog.url = "git+https://git.gaze.systems/dusk/website.git";
blog.inputs.nixpkgs.follows = "nixpkgs";
bernbot.url = "github:yusdacra/bernbot";
bernbot.inputs.nixpkgs.follows = "nixpkgs";
discocss.url = "github:fufexan/discocss/flake";
discocss.inputs.nixpkgs.follows = "nixpkgs";
nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs: let

View File

@ -1,5 +1,9 @@
{inputs}:
final: prev: {
steam = prev.steam.override {
extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols];
extraProfile = ''
PATH="$PATH:${inputs.fufexan.packages.${prev.system}.gamescope}/bin"
'';
};
}

View File

@ -13,7 +13,7 @@
}
{
name = "nix";
language-server = {command = "${pkgs.rnix-lsp}/bin/rnix-lsp";};
language-server = {command = "${inputs.nil.packages.${pkgs.system}.default}/bin/nil";};
}
{
name = "rust";

View File

@ -6,9 +6,6 @@
home.sessionVariables = {
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
};
services = {

View File

@ -37,10 +37,13 @@ in {
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
];
wlr.settings.screencast = {
output_name = "eDP-1";
max_fps = 60;
exec_before = "pkill mako";
exec_after = "mako";
chooser_type = "default";
};
};
programs = {
# this is needed for impermanence
@ -51,6 +54,16 @@ in {
# gnome stuffs
seahorse.enable = true;
};
services = {
# provide location
geoclue2 = {
enable = true;
appConfig.gammastep = {
isAllowed = true;
isSystem = false;
};
};
};
# gnome keyring better fr fr
security.pam.services.patriot = {
enableGnomeKeyring = true;
@ -159,6 +172,7 @@ in {
cloudflared
lutris
protontricks
inputs.fufexan.packages.${system}.gamescope
];
};
programs = {