This commit is contained in:
dusk 2022-08-27 18:27:28 +03:00
parent 95ed494861
commit a626d70d05
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
6 changed files with 50 additions and 307 deletions

View File

@ -46,30 +46,6 @@
"type": "github" "type": "github"
} }
}, },
"alejandra_2": {
"inputs": {
"fenix": "fenix_3",
"flakeCompat": "flakeCompat_2",
"nixpkgs": [
"webcord-flake",
"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": { "base16-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -197,22 +173,6 @@
"type": "github" "type": "github"
} }
}, },
"crane_5": {
"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": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -322,22 +282,6 @@
"type": "github" "type": "github"
} }
}, },
"devshell_6": {
"flake": false,
"locked": {
"lastModified": 1653917170,
"narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
"owner": "numtide",
"repo": "devshell",
"rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"discocss": { "discocss": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -614,35 +558,6 @@
"type": "github" "type": "github"
} }
}, },
"dream2nix_5": {
"inputs": {
"alejandra": "alejandra_2",
"crane": "crane_5",
"devshell": "devshell_6",
"flake-utils-pre-commit": "flake-utils-pre-commit_2",
"gomod2nix": "gomod2nix_2",
"mach-nix": "mach-nix_2",
"nixpkgs": [
"webcord-flake",
"nixpkgs"
],
"poetry2nix": "poetry2nix_2",
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1660051305,
"narHash": "sha256-74Io9RB1VEZyVqSnNfG0VfxxdOyiY/CkSDE1nY4gBRc=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "2fe7790152d4b18fc60a8194459959fc7e4a2e60",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dream2nix",
"type": "github"
}
},
"ema": { "ema": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -758,30 +673,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix_3": {
"inputs": {
"nixpkgs": [
"webcord-flake",
"dream2nix",
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_3"
},
"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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -867,21 +758,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils-pre-commit_2": {
"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": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1619345332, "lastModified": 1619345332,
@ -988,22 +864,6 @@
"type": "github" "type": "github"
} }
}, },
"flakeCompat_2": {
"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"
}
},
"fu": { "fu": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@ -1073,22 +933,6 @@
"type": "github" "type": "github"
} }
}, },
"gomod2nix_2": {
"flake": false,
"locked": {
"lastModified": 1627572165,
"narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=",
"owner": "tweag",
"repo": "gomod2nix",
"rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8",
"type": "github"
},
"original": {
"owner": "tweag",
"repo": "gomod2nix",
"type": "github"
}
},
"haskell-flake": { "haskell-flake": {
"locked": { "locked": {
"lastModified": 1660319056, "lastModified": 1660319056,
@ -1130,17 +974,15 @@
"helix_2": { "helix_2": {
"inputs": { "inputs": {
"nixCargoIntegration": "nixCargoIntegration_2", "nixCargoIntegration": "nixCargoIntegration_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_6",
"nixpkgs"
],
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1661057642, "lastModified": 1661468342,
"narHash": "sha256-4CQG4KBBrdGq83Kho4DME1R2nYlQus2l2RlgGKgPzd8=", "narHash": "sha256-K+zHUaeZX/NOo3V4HNzQGCLIYhmN4tOUSAoM/+4Ss6c=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "ed74e6d5d405dd37e067c5fd41e2ae908da22a3c", "rev": "86a8ea57bb3cb651cf9bee3fd1ae37f7e134c526",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1195,17 +1037,15 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_7",
"nixpkgs"
],
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1661028330, "lastModified": 1661505983,
"narHash": "sha256-bG/bmkc23TTLzmP1WLmSpr3s5blwxysqV2m9x7gihYQ=", "narHash": "sha256-tLRL8DFBnh5V0i9SgMIBaHyRmmojBTnfJm030LlAG1U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "9513031da30861b6ab593625aebe88b811758427", "rev": "10f529ada72270cb5a903aea118fc79114352b78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1273,21 +1113,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"mach-nix_2": {
"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": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1617,6 +1442,38 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1655624069,
"narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1660908602,
"narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "495b19d5b3e62b4ec7e846bdfb6ef3d9c3b83492",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1660908602, "lastModified": 1660908602,
"narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=", "narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=",
@ -1664,23 +1521,6 @@
"type": "github" "type": "github"
} }
}, },
"poetry2nix_2": {
"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": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -1710,33 +1550,6 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks_2": {
"inputs": {
"flake-utils": [
"webcord-flake",
"dream2nix",
"flake-utils-pre-commit"
],
"nixpkgs": [
"webcord-flake",
"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": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": [ "naersk": [
@ -1779,9 +1592,8 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence", "nixos-persistence": "nixos-persistence",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_8",
"nur": "nur", "nur": "nur"
"webcord-flake": "webcord-flake"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -1818,23 +1630,6 @@
"type": "github" "type": "github"
} }
}, },
"rust-analyzer-src_3": {
"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": { "rust-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2043,28 +1838,6 @@
"type": "github" "type": "github"
} }
}, },
"webcord-flake": {
"inputs": {
"dream2nix": "dream2nix_5",
"nixpkgs": [
"nixpkgs"
],
"webcord": "webcord_3"
},
"locked": {
"lastModified": 1660242753,
"narHash": "sha256-M9ibcsDzWHp/678lTyxwwgXgdFx2d1YCevoGEIBVnxc=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "0892178832a090f0b9ab1a61e20f5d1389cfb23e",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "webcord-flake",
"type": "github"
}
},
"webcord_2": { "webcord_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2081,22 +1854,6 @@
"type": "github" "type": "github"
} }
}, },
"webcord_3": {
"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": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {

View File

@ -15,9 +15,7 @@
nixinate.inputs.nixpkgs.follows = "nixpkgs"; nixinate.inputs.nixpkgs.follows = "nixpkgs";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
helix.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
fufexan.url = "github:fufexan/dotfiles"; fufexan.url = "github:fufexan/dotfiles";
fufexan.inputs.hyprland.follows = "hyprland"; fufexan.inputs.hyprland.follows = "hyprland";
blog.url = "git+https://git.gaze.systems/dusk/website.git"; blog.url = "git+https://git.gaze.systems/dusk/website.git";
@ -28,8 +26,6 @@
discocss.inputs.nixpkgs.follows = "nixpkgs"; discocss.inputs.nixpkgs.follows = "nixpkgs";
nil.url = "github:oxalica/nil"; nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs"; nil.inputs.nixpkgs.follows = "nixpkgs";
webcord-flake.url = "github:fufexan/webcord-flake";
webcord-flake.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs: let outputs = inputs: let

View File

@ -118,6 +118,7 @@
enableGC = true; enableGC = true;
autoMount = true; autoMount = true;
}; };
gvfs.enable = true;
}; };
virtualisation = { virtualisation = {

Binary file not shown.

View File

@ -6,15 +6,14 @@
}: { }: {
imports = [inputs.discocss.hmModule]; imports = [inputs.discocss.hmModule];
# programs.discocss = { programs.discocss = {
# enable = true; enable = true;
# discord = inputs.webcord-flake.packages.${pkgs.system}.webcord; discord = inputs.fufexan.packages.${pkgs.system}.discord-electron-openasar;
# discordAlias = true; discordAlias = true;
# css = builtins.readFile ./theme.css; css = builtins.readFile ./theme.css;
# }; };
home.packages = [inputs.webcord-flake.packages.${pkgs.system}.webcord];
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
".config/WebCord" ".config/discord"
]; ];
} }

View File

@ -43,15 +43,5 @@
}; };
}; };
}; };
themes = {
catppuccin_mocha = builtins.fromTOML (
builtins.readFile (
builtins.fetchurl {
url = "https://raw.githubusercontent.com/catppuccin/helix/47710cbb38a5462973a484283a749543914c73e9/italics/catppuccin_mocha.toml";
sha256 = "sha256:1bv07mmi6hz7igd2pz7brcgs154989hnq8jmxy8px9d1jpx753di";
}
)
);
};
}; };
} }