Compare commits

..

No commits in common. "19bc2ec4689c9f913a574f698369b0d6f312f377" and "ae7223b2137a31ca152df32933ff8eb457bde317" have entirely different histories.

8 changed files with 54 additions and 144 deletions

View file

@ -106,11 +106,11 @@
},
"bleedingpkgs": {
"locked": {
"lastModified": 1731295903,
"narHash": "sha256-9T4S/rndz6zD9suTtJMBnAbIDMb1Kkqi6IERvYngaTA=",
"lastModified": 1730781761,
"narHash": "sha256-/0gVcFiZaQAROSySTXXblCzGZc6ZvQQzLpxuF40AoJ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e635cf8d9fb548dd4190988696621180a3114601",
"rev": "aa689c679c90ea9a84c99cfb1ef5a7ab4ddbbf9b",
"type": "github"
},
"original": {
@ -324,24 +324,6 @@
"type": "github"
}
},
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -512,11 +494,11 @@
]
},
"locked": {
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"type": "github"
},
"original": {
@ -549,11 +531,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1731298349,
"narHash": "sha256-ty2AUv6YTmFU0JISG6crCozMiTE6Xk/xO10n2LLP15Q=",
"lastModified": 1730704640,
"narHash": "sha256-Xp6uQdt80HeW76ROtm03gpUYbKuH2exvH1nSTB9Roug=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "4d8bfd8aa018fce108a94edb6cfc6613e5496180",
"rev": "6f41db5aa7c094c2110636424a36479720a9bc8f",
"type": "github"
},
"original": {
@ -565,11 +547,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1731297151,
"narHash": "sha256-Vh3aAXZcWhqWSt71ljsQO6uEni4KXC+v7jYJQKu7SQY=",
"lastModified": 1730704733,
"narHash": "sha256-n3wuR4SrSh/5v0NkDMFIRayUC65xCs9ZsdA7917etWQ=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "657ccb0474732c9fae87685393775f9bab87928c",
"rev": "7c518d7624b76c30cf8d82e7f929bdb75ab09d23",
"type": "github"
},
"original": {
@ -647,11 +629,11 @@
]
},
"locked": {
"lastModified": 1731153869,
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
"lastModified": 1730698801,
"narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
"rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0",
"type": "github"
},
"original": {
@ -708,11 +690,11 @@
]
},
"locked": {
"lastModified": 1731209121,
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
"lastModified": 1730604744,
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
"type": "github"
},
"original": {
@ -773,18 +755,6 @@
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-lib_3": {
"locked": {
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
@ -803,11 +773,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github"
},
"original": {
@ -833,22 +803,6 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plugins-lsp-progress": {
"flake": false,
"locked": {
@ -928,8 +882,7 @@
"vesktop-bin": "vesktop-bin",
"viminal": "viminal",
"wallpapers": "wallpapers",
"zen-browser": "zen-browser",
"zen-browser-source": "zen-browser-source"
"zen-browser": "zen-browser"
}
},
"rust-analyzer-src": {
@ -998,11 +951,11 @@
]
},
"locked": {
"lastModified": 1731298576,
"narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=",
"lastModified": 1730693770,
"narHash": "sha256-jepwWtXntoBDQGJ/d7Myc9SFsYT6DwTqjAZJFGC2Akc=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3",
"rev": "2d871e2a5fb8c9d8d04a3bdd8f206aec81df2d6d",
"type": "github"
},
"original": {
@ -1028,11 +981,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1731090365,
"narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
"lastModified": 1729963473,
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
"owner": "danth",
"repo": "stylix",
"rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
"rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
"type": "github"
},
"original": {
@ -1119,17 +1072,16 @@
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
@ -1234,11 +1186,11 @@
]
},
"locked": {
"lastModified": 1730925960,
"narHash": "sha256-S5zn2So/kwgZcW+2ICsXS1E+yJPBAFx1fQXyC2DfIZM=",
"lastModified": 1730231756,
"narHash": "sha256-x9NUlceUFCKg5sc+MaAQtDXl5413HX5N3aU8Zdwu/HU=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "29ef2755b4ba40f3c0c00cf89b7a8c9c62b977b2",
"rev": "3a15e3f2c835f95ae211a8a973a1e30994880fcc",
"type": "github"
},
"original": {
@ -1246,25 +1198,6 @@
"repo": "zen-browser-flake",
"type": "github"
}
},
"zen-browser-source": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1731292739,
"narHash": "sha256-c0ED1Yu1AamD3RXsH1kLvvP8gdhGp/HB8AJfzJw7Ph0=",
"owner": "youwen5",
"repo": "zen-browser-source-flake",
"rev": "dc72f9d9456cd732ad9eb78f8e3d676aa807d554",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-source-flake",
"type": "github"
}
}
},
"root": "root",

View file

@ -86,8 +86,6 @@
url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
zen-browser-source.url = "github:youwen5/zen-browser-source-flake";
};
outputs =

View file

@ -25,6 +25,10 @@
services.gnome.gnome-keyring.enable = true;
nix = {
settings.experimental-features = [
"nix-command"
"flakes"
];
optimise.automatic = true;
# gc = {
# automatic = true;
@ -36,21 +40,6 @@
min-free = ${toString (100 * 1024 * 1024)}
max-free = ${toString (1024 * 1024 * 1024)}
'';
settings = {
experimental-features = [
"nix-command"
"flakes"
];
substituters = [
"https://cache.nixos.org"
"https://zen-browser.cachix.org"
];
trusted-public-keys = [
"hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
"zen-browser.cachix.org-1:z/QLGrEkiBYF/7zoHX1Hpuv0B26QrmbVBSy9yDD2tSs="
];
};
};
programs.nh = {

View file

@ -4,21 +4,14 @@
...
}:
let
# bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
inherit (pkgs) system;
bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
in
# stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
# nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
{
nixpkgs.overlays = [
(self: super: {
zen-browser =
if system == "x86_64-linux" then
inputs.zen-browser.packages.${system}.default
else if system == "aarch64-linux" then
inputs.zen-browser-source.packages.${system}.default
else
null;
_7zz = bleedingpkgs._7zz;
})
];
}

View file

@ -1,11 +1,8 @@
{ inputs, pkgs, ... }:
{ pkgs, ... }:
let
createCommon = import ../common-packages.nix;
in
{
home.packages =
(createCommon pkgs)
++ [
];
home.packages = (createCommon pkgs) ++ (with pkgs; [ ]);
}

View file

@ -39,6 +39,4 @@ pkgs: with pkgs; [
gcc
hledger
zen-browser
]

View file

@ -10,14 +10,18 @@ in
{
home.packages =
(createCommon pkgs)
++ (with pkgs; [
bitwarden-desktop
modrinth-app
lutris
sbctl
r2modman
zoom-us
]);
++ (
with pkgs;
[
bitwarden-desktop
modrinth-app
lutris
sbctl
r2modman
zoom-us
]
++ [ zen-browser ]
);
home.sessionVariables = {
DEFAULT_BROWSER = "${zen-browser}/bin/zen";

View file

@ -4,7 +4,5 @@
kitty.variant256Colors = true;
neovim.enable = false;
kde.enable = true;
gnome.enable = true;
swaync.enable = false;
};
}