WIP nonfree

This commit is contained in:
Nathan Anderson 2023-12-15 09:24:13 -07:00
parent 0896ee2fe2
commit 2f4788c73c
3 changed files with 59 additions and 15 deletions

View File

@ -1,5 +1,43 @@
{ {
"nodes": { "nodes": {
"firefox-addons": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1702612985,
"narHash": "sha256-dnlw/lHJO2Fk/jUHzkz4dYKHF4nQxmHps9Jx8zldoo4=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "ae18cb76153e8dda888a313daac932ba358002ae",
"type": "gitlab"
},
"original": {
"dir": "pkgs/firefox-addons",
"owner": "rycee",
"repo": "nur-expressions",
"type": "gitlab"
}
},
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -54,6 +92,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"

View File

@ -10,18 +10,20 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, ... }: outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... } @ inputs:
let let
inherit (self) outputs;
system = "x86_64-linux"; system = "x86_64-linux";
userName = "nate"; userName = "nate";
hostName = "winmax"; hostName = "winmax";
pkgs = import nixpkgs { pkgs = nixpkgs.legacyPackages.${system};
legacyPackages = system;
# smh steam
config.allowUnfree = true;
};
stablePkgs = import nixpkgs-stable { stablePkgs = import nixpkgs-stable {
legacyPackages = system; legacyPackages = system;
config.allowUnfree = true; config.allowUnfree = true;
@ -51,12 +53,8 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${userName} = import ./modules/home-manager/home.nix; home-manager.users.${userName} = import ./modules/home-manager/home.nix;
# Pass args to home.nix
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs; inherit inputs outputs userName hostName;
inherit userName;
inherit stablePkgs;
inherit hostName;
}; };
} }
]; ];

View File

@ -1,8 +1,11 @@
{ config, pkgs, inputs, stablePkgs, userName, hostName, ... }: { inputs, outputs, lib, config, pkgs, userName, hostName, ... }:
{ {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
#
nixpkgs.config.allowUnfree = true;
# inputs.nixpkgs-stable.config.allowUnfree = true;
home.username = userName; home.username = userName;
home.homeDirectory = "/home/${userName}"; home.homeDirectory = "/home/${userName}";
@ -16,7 +19,7 @@
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
bat bat
# stablePkgs.corectrl inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl
fd fd
firefox firefox
foot foot
@ -28,7 +31,7 @@
networkmanagerapplet networkmanagerapplet
obs-studio obs-studio
signal-desktop signal-desktop
# steam steam
waybar waybar
wofi wofi
xfce.thunar xfce.thunar
@ -44,6 +47,10 @@
# '') # '')
]; ];
# TODO not working firefox plugins
# extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ ublock-origin bitwarden ];
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'. # plain files is through 'home.file'.
home.file."${config.xdg.configHome}" = { home.file."${config.xdg.configHome}" = {