This commit is contained in:
dusk 2023-02-25 02:08:04 +03:00
parent 8cbabf0599
commit f71ea4be09
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 39 additions and 119 deletions

View File

@ -309,44 +309,6 @@
"type": "github" "type": "github"
} }
}, },
"eww": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1672946489,
"narHash": "sha256-IliWerC9qk4MxYNRoe/8uuQZkqjPJPsph46fmVBvo9U=",
"owner": "elkowar",
"repo": "eww",
"rev": "6a64a286291456984011c4fb160def106ee55dff",
"type": "github"
},
"original": {
"owner": "elkowar",
"repo": "eww",
"type": "github"
}
},
"flake-compat": {
"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"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -384,21 +346,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"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_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -413,7 +360,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -479,14 +426,14 @@
"inputs": { "inputs": {
"nci": "nci_2", "nci": "nci_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1676058777, "lastModified": 1677212844,
"narHash": "sha256-zyIksNoVO6WqGv1ezsgbGdRdA9XFzw/MQrv7V0ewfGc=", "narHash": "sha256-UGxPlSUFjsf79T/77cBE9ICjgXlrVJ3bYbTX7erUgnc=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "6929a12f291fa5dee50cde9c89845b206b7333fd", "rev": "621ab0e57f051790a663dd4a32c841bb96bdd527",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +450,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1675935446, "lastModified": 1677276957,
"narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "narHash": "sha256-/vhdNhQj2CWgqdfD2KLEZWDleOfen0t2EiaGiyivnJU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "rev": "664945b3e09b4551c4e63e16efebd493cf5eac74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +474,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1676066608, "lastModified": 1677259491,
"narHash": "sha256-wUfFD5kZ4+MSX92Zruy/W64m7E5CzORfiVdLOuyJ15o=", "narHash": "sha256-nTIqi2mNJfV5tuQ+52nR3OGymv6tSC8HEQdR5EDHzT8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "bda8208aaa3d7eb9f14d49691b919f8f2e9f5594", "rev": "1089e858b49975a4b9f6e49d377726ee4f164f96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,18 +581,18 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1676062747, "lastModified": 1676390054,
"narHash": "sha256-jUZrWQRIO/lDeInw1Kn6WSnQxbuSfakOsTcBQiztxRQ=", "narHash": "sha256-w0KvrM+9WIEYr0juDh4Vs39ed2IaT0T696fp9pZ7i1I=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "a304ab352b1194d6b6e0dd2ca3efe979dcbb50c9", "rev": "944d5c335531778a1d7b54a97bf7fb5ec0c3e976",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -695,11 +642,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1675933606, "lastModified": 1677232326,
"narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +722,11 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676084149, "lastModified": 1677107974,
"narHash": "sha256-abTVSVKLol9er5rXPFJ65lB7kIGv3pFswLYtsJd3+Cg=", "narHash": "sha256-1+7OEEvxJLTyg+4U9DXMnpZw+o6gSQb37lj9e3hzzSw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "13ad7c7fe8e309526caa18cbcfb7a7c87c51cfd6", "rev": "73294e8760f2fcacfead0d2f29e354031b211ec7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -822,11 +769,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1675942811, "lastModified": 1677063315,
"narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "724bfc0892363087709bd3a5a1666296759154b1", "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,11 +785,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1676087160, "lastModified": 1677277666,
"narHash": "sha256-el2tNbWUhpz0IBoORS144xjMTi9WIqbQWRBmrsF4M64=", "narHash": "sha256-XpLjEdvFexiK7m0pA/JYWSYmuKYVCrnVwq2hja7meOc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1ddd5cf5cc7215ea63f1dee09016b53cc79034e5", "rev": "a13614be5eec4d5c377bcd4da3f230349bd64afd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -855,7 +802,6 @@
"inputs": { "inputs": {
"bernbot": "bernbot", "bernbot": "bernbot",
"blog": "blog", "blog": "blog",
"eww": "eww",
"helix": "helix", "helix": "helix",
"home": "home", "home": "home",
"hyprland": "hyprland", "hyprland": "hyprland",
@ -889,28 +835,6 @@
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [
"eww",
"nixpkgs"
]
},
"locked": {
"lastModified": 1661655464,
"narHash": "sha256-by9Hb0mNVdiCR7TBvUHIgDb0QIv3znp8VMGh7Bl35VQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "0c4c1432353e12b325d1472bea99e364871d2cb3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_3": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
@ -930,7 +854,7 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_4": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nil", "nil",

View File

@ -33,8 +33,9 @@
nil.url = "github:oxalica/nil"; nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs"; nil.inputs.nixpkgs.follows = "nixpkgs";
eww.url = "github:elkowar/eww"; # needed for hyprland setup
eww.inputs.nixpkgs.follows = "nixpkgs"; # eww.url = "github:elkowar/eww";
# eww.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:Misterio77/nix-colors"; nix-colors.url = "github:Misterio77/nix-colors";
# catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; # catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";

View File

@ -31,6 +31,7 @@
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
config.allowBroken = true;
overlays = overlays ++ newPkgs; overlays = overlays ++ newPkgs;
}; };
pkgsToExport = import ./pkgs-to-export.nix pkgs; pkgsToExport = import ./pkgs-to-export.nix pkgs;

View File

@ -144,18 +144,17 @@ in {
# caches / history stuff # caches / history stuff
".directory_history" ".directory_history"
".cache" ".cache"
"notes"
] ]
++ mkPaths ".local/share" [ ++ mkPaths ".local/share" [
"direnv" "direnv"
"zsh" "zsh"
"keyrings" "keyrings"
"lutris" # "lutris"
"Terraria" "Terraria"
"PrismLauncher" "PrismLauncher"
] ]
++ mkPaths ".config" [ ++ mkPaths ".config" [
"lutris" # "lutris"
"dconf" "dconf"
]; ];
files = l.flatten [ files = l.flatten [
@ -217,26 +216,21 @@ in {
font-awesome font-awesome
dejavu_fonts dejavu_fonts
# Programs # Programs
bitwarden
krita krita
cachix
gnupg gnupg
imv imv
mpv mpv
ffmpeg ffmpeg
mupdf mupdf
xdg-utils xdg-utils
rust-analyzer # lutris
cloudflared
lutris
protontricks protontricks
# fractal-next # fractal-next
obs-studio # obs-studio
libreoffice-fresh libreoffice-fresh
# helvum helvum
easyeffects
nix-output-monitor nix-output-monitor
prismlauncher # prismlauncher
godot_4 godot_4
]; ];
}; };