remove unstable
This commit is contained in:
Leonardo Eugênio
parent
82fb005bc1
commit
05e598acf0
53
flake.lock
53
flake.lock
|
|
@ -54,22 +54,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"alacritty-sixel": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1677700854,
|
||||
"narHash": "sha256-qYc1Yz6+dKEK87VcouYP5IYa0tqk54DcCgveCsV/c6I=",
|
||||
"owner": "ayosec",
|
||||
"repo": "alacritty",
|
||||
"rev": "713c5415262ab091a645f976907dacaf40703ae8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ayosec",
|
||||
"repo": "alacritty",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
|
@ -445,7 +429,7 @@
|
|||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
"nixpkgs"
|
||||
],
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
|
|
@ -614,21 +598,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1689444953,
|
||||
"narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8acef304efe70152463a6399f73e636bcc363813",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1673796341,
|
||||
|
|
@ -707,27 +676,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ranger-sixel": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1681665489,
|
||||
"narHash": "sha256-NJKjj+jmaHnauA6qCEGu9N+EPqfcoL0jF1PotGZ/kDc=",
|
||||
"owner": "remi6397",
|
||||
"repo": "ranger",
|
||||
"rev": "0283f4c2c6c0abae7f1279d3cc0b6e7bf313134e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "remi6397",
|
||||
"ref": "feature/sixel",
|
||||
"repo": "ranger",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"alacritty-sixel": "alacritty-sixel",
|
||||
"demoji": "demoji",
|
||||
"dhist": "dhist",
|
||||
"dzgui-nix": "dzgui-nix",
|
||||
|
|
@ -740,11 +691,9 @@
|
|||
"nix-software-center": "nix-software-center",
|
||||
"nixos-conf-editor": "nixos-conf-editor",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur",
|
||||
"plymouth-themes": "plymouth-themes",
|
||||
"ranger-icons": "ranger-icons",
|
||||
"ranger-sixel": "ranger-sixel",
|
||||
"tlauncher": "tlauncher",
|
||||
"wl-crosshair": "wl-crosshair"
|
||||
}
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -2,7 +2,6 @@
|
|||
description = "My system config";
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.05";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
|
@ -14,15 +13,9 @@
|
|||
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
alacritty-sixel.url = "github:ayosec/alacritty";
|
||||
alacritty-sixel.flake = false;
|
||||
|
||||
ranger-sixel.url = "github:remi6397/ranger/feature/sixel";
|
||||
ranger-sixel.flake = false;
|
||||
|
||||
ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
|
||||
ranger-icons.flake = false;
|
||||
|
||||
|
|
@ -72,7 +65,7 @@
|
|||
nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
|
||||
nix-software-center.url = "github:vlinkz/nix-software-center";
|
||||
};
|
||||
outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }:
|
||||
outputs = inputs@{ nixpkgs, home-manager, nur, ... }:
|
||||
let
|
||||
inherit (import ./user/variables.nix) desktop;
|
||||
system = "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@ in
|
|||
|
||||
programs.corectrl.enable = true;
|
||||
|
||||
# hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
||||
# # For 32 bit applications
|
||||
# # Only available on unstable
|
||||
# hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
||||
# environment.variables = { AMD_VULKAN_ICD = "RADV"; };
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
nur
|
||||
scripts
|
||||
sway
|
||||
unstable
|
||||
sixel-patches
|
||||
themes
|
||||
new-packages
|
||||
patches
|
||||
|
|
@ -17,14 +15,6 @@
|
|||
|
||||
sway = (import ./sway.nix);
|
||||
|
||||
unstable = (final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (prev) system config;
|
||||
};
|
||||
});
|
||||
|
||||
sixel-patches = (import ./sixel-patches.nix (inputs));
|
||||
|
||||
themes = (final: prev: {
|
||||
material-wifi-icons = final.stdenv.mkDerivation rec {
|
||||
name = "material-wifi-icons";
|
||||
|
|
@ -33,7 +23,7 @@
|
|||
install -D material-wifi.ttf $out/share/fonts/${name}
|
||||
'';
|
||||
};
|
||||
papirus_red = (final.unstable.papirus-icon-theme.override { color = "red"; });
|
||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||
orchis_theme_compact = (final.orchis-theme.override {
|
||||
border-radius = 0;
|
||||
tweaks = [ "compact" "solid" ];
|
||||
|
|
@ -51,10 +41,9 @@
|
|||
maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
|
||||
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
||||
|
||||
webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: {
|
||||
webcord = prev.webcord.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
|
||||
});
|
||||
mullvad = final.unstable.mullvad;
|
||||
});
|
||||
|
||||
patches = (final: prev: {
|
||||
|
|
@ -68,15 +57,6 @@
|
|||
patches = old.patches
|
||||
++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
||||
});
|
||||
|
||||
qutebrowser = prev.qutebrowser.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "pinusc";
|
||||
repo = "qutebrowser";
|
||||
rev = "feature/tree-tabs";
|
||||
sha256 = "sha256-4WgO/xS/vg3sJAWjIGcQqHmA0O7rzTy7cGtBT8H+Q0o=";
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
variables = (final: prev: {
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
inputs: (final: prev: {
|
||||
alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
|
||||
src = inputs.alacritty-sixel;
|
||||
cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
|
||||
inherit src;
|
||||
outputHash = "sha256-W3RKvIAhE8+4srSx7jVfMFU/vNcky9Rs6e6uHhxw2WE=";
|
||||
});
|
||||
}));
|
||||
ranger = (prev.ranger.overridePythonAttrs (old-ranger: rec {
|
||||
src = inputs.ranger-sixel;
|
||||
checkInputs = [ ];
|
||||
propagatedBuildInputs = with prev.python3Packages;
|
||||
old-ranger.propagatedBuildInputs ++ [ astroid pylint pytest ];
|
||||
}));
|
||||
})
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ in {
|
|||
obs-studio
|
||||
imagemagick
|
||||
mpc-cli
|
||||
pkgs.unstable.helvum
|
||||
helvum
|
||||
gimp
|
||||
inkscape
|
||||
kdenlive
|
||||
|
|
|
|||
|
|
@ -46,9 +46,6 @@
|
|||
. ${pkgs.nix}/etc/profile.d/nix.sh
|
||||
|
||||
${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
|
||||
|
||||
${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
|
||||
${pkgs.nix}/bin/nix-channel --update nixpkgs
|
||||
'';
|
||||
environmentVariables = {
|
||||
ENV = "/etc/profile";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
||||
];
|
||||
};
|
||||
package = pkgs.unstable.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -46,9 +46,6 @@
|
|||
. ${pkgs.nix}/etc/profile.d/nix.sh
|
||||
|
||||
${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
|
||||
|
||||
${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
|
||||
${pkgs.nix}/bin/nix-channel --update nixpkgs
|
||||
'';
|
||||
environmentVariables = {
|
||||
ENV = "/etc/profile";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ in
|
|||
config = {
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.helix;
|
||||
settings = {
|
||||
theme = "my-theme";
|
||||
editor = {
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
# steam # It's enabled in the system config
|
||||
tlauncher
|
||||
gamescope
|
||||
unstable.amdgpu_top
|
||||
amdgpu_top
|
||||
glxinfo
|
||||
vulkan-tools
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue