Compare commits

..

No commits in common. "14acb57ba4ee5edfe4b2bf3d9030a961b2e43105" and "861b93dadab50c1f8ac04ccbc2b77067dae53424" have entirely different histories.

5 changed files with 7 additions and 101 deletions

View File

@ -131,27 +131,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"zen-browser",
"nixpkgs"
]
},
"locked": {
"lastModified": 1752603129,
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nix-rosetta-builder": { "nix-rosetta-builder": {
"inputs": { "inputs": {
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
@ -280,8 +259,7 @@
"emacs-larstvei": "emacs-larstvei", "emacs-larstvei": "emacs-larstvei",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-rosetta-builder": "nix-rosetta-builder", "nix-rosetta-builder": "nix-rosetta-builder",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"zen-browser": "zen-browser"
} }
}, },
"systems": { "systems": {
@ -298,27 +276,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"zen-browser": {
"inputs": {
"home-manager": "home-manager_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1755922982,
"narHash": "sha256-YMchUKtaIhICzwwiAP/j6G+KaqRA8xSnGV2dfdVXoHw=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "25f56c0f5b813312f38078418b2229ada41c4bcc",
"type": "github"
},
"original": {
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@ -17,10 +17,6 @@
url = "github:cpick/nix-rosetta-builder"; url = "github:cpick/nix-rosetta-builder";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-larstvei.url = "github:larstvei/emacs-flake"; emacs-larstvei.url = "github:larstvei/emacs-flake";
}; };
@ -31,7 +27,6 @@
home-manager, home-manager,
nix-rosetta-builder, nix-rosetta-builder,
emacs-larstvei, emacs-larstvei,
zen-browser,
... ...
}: }:
{ {
@ -52,10 +47,7 @@
nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem { nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = { inherit emacs-larstvei; };
inherit emacs-larstvei;
inherit zen-browser;
};
modules = [ modules = [
home-manager.nixosModules.default home-manager.nixosModules.default
./hosts/thinkpad/configuration.nix ./hosts/thinkpad/configuration.nix

View File

@ -1,26 +0,0 @@
{ zen-browser, ... }:
{
imports = [
zen-browser.homeModules.beta
];
programs.zen-browser = {
enable = true;
policies = {
DisableAppUpdate = true;
DisableTelemetry = true;
AutofillAddressesEnabled = false;
AutoFillCreditCardEnabled = false;
DisablePocket = true;
DisableProfileImport = true;
DisableSetDesktopBackground = true;
DontCheckDefaultBrowser = true;
HomepageURL = "https://start.hadi.diy";
StartPage = "homepage";
NewTabPage = true;
OfferToSaveLogins = false;
# find more options here: https://mozilla.github.io/policy-templates/
};
};
}

View File

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
emacs-larstvei, emacs-larstvei,
zen-browser,
... ...
}: }:
let let
@ -18,25 +17,20 @@ in
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = { inherit emacs-larstvei; };
inherit emacs-larstvei; users.${v.username}.imports = [ ../../home ];
inherit zen-browser;
};
users.${v.username}.imports = [
../../home
../../home/desktop
];
}; };
# Define a user account. Don't forget to set a password with passwd.
users.users.${v.username} = { users.users.${v.username} = {
isNormalUser = true; isNormalUser = true;
description = "Lars Tveito"; description = "Lars Tveito";
home = v.userHome; home = v.userHome;
shell = pkgs.fish;
extraGroups = [ extraGroups = [
"networkmanager" "networkmanager"
"wheel" "wheel"
]; ];
packages = with pkgs; [ ]; # keep empty; HM will provide user packages
}; };
networking.hostName = v.hostName; networking.hostName = v.hostName;

View File

@ -1,12 +1 @@
{ pkgs, ... }: { }
{
fonts.packages = import ../../home/fonts { inherit pkgs; };
programs.fish.enable = true;
environment.shells = [ pkgs.fish ];
nixpkgs.config.allowUnfree = true;
programs._1password.enable = true;
programs._1password-gui.enable = true;
}