This commit is contained in:
dusk 2022-12-28 09:31:14 +03:00
parent 0adcaea70e
commit 55de7a4aad
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
13 changed files with 45 additions and 34 deletions

View File

@ -83,7 +83,7 @@
"catppuccin-discord": {
"flake": false,
"locked": {
"narHash": "sha256-cOf1czMIKlTt0XLeZAw0Z398Pa8h2d90IPPT43+gjoI=",
"narHash": "sha256-F189DRR/QaGFQhSUED64UnPHrq6nhoLHOzitiPWVUYM=",
"type": "file",
"url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
},
@ -471,11 +471,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1670292968,
"narHash": "sha256-s0W84bCJKT0zqLEuT9HfJJRnoJhsvRoXjVPt5zmzDn8=",
"lastModified": 1670336313,
"narHash": "sha256-aGJH6PQjMzDDzuBBHpTNIwp1NHYCWUpA00YcFbdoDow=",
"owner": "helix-editor",
"repo": "helix",
"rev": "453a75a3739338348024b6c676231aef9ef6cb7b",
"rev": "af532147c97987d6170dc06a52aa3434ebf1b9d4",
"type": "github"
},
"original": {
@ -516,11 +516,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1670267535,
"narHash": "sha256-The+YCkkQ0dYXJWECktItiki7l8ImTsP2u1DKXkTzk0=",
"lastModified": 1670358704,
"narHash": "sha256-zBClR9FjbV3So2xDoQci6aKjsnkFVtrD1Ipnd1dY1oo=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "da76a1ed9eab3d1b5cf5fae4d040f8efe08b586c",
"rev": "993c382e74faddefeb62b3ab7a7281bd9a69990b",
"type": "github"
},
"original": {
@ -757,11 +757,11 @@
"nixpkgs-wayland": {
"flake": false,
"locked": {
"lastModified": 1670205845,
"narHash": "sha256-hOkPA1NxTt68ClZeJF/42tGklqeeMAYuMHR+PXt9xHw=",
"lastModified": 1670350038,
"narHash": "sha256-3iFzmg3nh83lV++6jNKLzz/wXIrRfx+h2JVRsw0viKM=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "7a42bdbb71bed152dc0fccb696b988985ecb412f",
"rev": "7a9e28e2fb249bc6ff31b668ccd3b005e5157aaa",
"type": "github"
},
"original": {
@ -804,17 +804,17 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1670064435,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=",
"lastModified": 1669411043,
"narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c",
"rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
"type": "github"
}
},

View File

@ -2,7 +2,7 @@
description = "config!!!";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/5dc7114b7b256d217fe7752f1614be2514e61bb8";
nur.url = "github:nix-community/NUR";
home.url = "github:nix-community/home-manager/master";

View File

@ -122,12 +122,5 @@
gvfs.enable = true;
};
virtualisation = {
waydroid.enable = false;
podman.enable = false;
docker.enable = false;
libvirtd.enable = false;
};
system.stateVersion = "22.05";
}

View File

@ -0,0 +1 @@
../../../modules/gnome-boxes/default.nix

View File

@ -0,0 +1,4 @@
{pkgs, ...}: {
virtualisation.libvirtd.enable = true;
environment.systemPackages = [pkgs.gnome.gnome-boxes];
}

View File

@ -3,6 +3,6 @@
includeGrammarIf = grammar:
prev.lib.any
(name: grammar.name == name)
["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css"];
["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css" "zig"];
};
}

View File

@ -1 +1,2 @@
{inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
# {inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
final: prev: prev

View File

@ -1,5 +0,0 @@
{inputs}: final: prev: {
polymc = prev.polymc.overrideAttrs (old: {
patches = [((toString inputs.self) + "/pkgs-set/patches/polymc-offline.patch")];
});
}

View File

@ -0,0 +1,5 @@
{inputs}: final: prev: {
prismlauncher = prev.prismlauncher.overrideAttrs (old: {
patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
});
}

View File

@ -19,6 +19,10 @@
name = "rust";
language-server = {command = "${pkgs.rust-analyzer}/bin/rust-analyzer";};
}
{
name = "zig";
language-server = {command = "${pkgs.zls}/bin/zls";};
}
];
settings = {
theme = "catppuccin_mocha";

View File

@ -93,8 +93,7 @@
};
output = {
"*" = {
bg = "${config.home.homeDirectory}/wallpaper.png fill";
adaptive_sync = "on";
bg = "${config.home.homeDirectory}/.config/wallpaper fill";
};
"eDP-1" = {
scale = "2";

View File

@ -33,6 +33,7 @@ in {
"/home/patriot/proj"
"/home/patriot/games"
"/home/patriot/.var"
"/home/patriot/.config/libvirt"
];
systemPackages = with pkgs; [qt5.qtwayland];
shells = with pkgs; [bashInteractive zsh];
@ -50,11 +51,15 @@ in {
# this is needed for impermanence
fuse.userAllowOther = true;
adb.enable = true;
# steam.enable = true;
steam.enable = true;
# gnome stuffs
seahorse.enable = true;
dconf.enable = true;
weylus.users = ["patriot"];
java = {
enable = true;
package = pkgs.jre8;
};
};
services = {
syncthing.folders = {
@ -102,7 +107,7 @@ in {
["sway" "foot"]
# desktop stuff
["wayland"]
["chromium" "discord"]
["chromium"]
# cli stuff
["zoxide" "zsh" "fzf" "starship" "direnv"]
# dev stuff
@ -140,10 +145,13 @@ in {
"keyrings"
"lutris"
"Terraria"
"gnome-boxes"
"PrismLauncher"
]
++ mkPaths ".config" [
"lutris"
"dconf"
"gnome-boxes"
];
files = l.flatten [
".config/wallpaper"
@ -231,7 +239,8 @@ in {
libreoffice-fresh
helvum
nix-output-monitor
spotify
gamescope
prismlauncher
];
};
programs = {