Compare commits
No commits in common. "aef80b50395eafafca075c9770636821dafc3b75" and "9faffed04bf0fa5e96742509ff393050f4d58d67" have entirely different histories.
aef80b5039
...
9faffed04b
@ -31,8 +31,6 @@
|
||||
LC_TELEPHONE = "en_US.UTF-8";
|
||||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
i18n.inputMethod.enabled = "ibus";
|
||||
i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ mozc ];
|
||||
|
||||
services.auto-cpufreq.enable = true;
|
||||
services.auto-cpufreq.settings = {
|
||||
@ -154,32 +152,6 @@
|
||||
vim
|
||||
emacs29-pgtk
|
||||
nfs-utils
|
||||
devenv
|
||||
cmake
|
||||
fontconfig
|
||||
harfbuzz
|
||||
freetype
|
||||
expat
|
||||
glib
|
||||
atk
|
||||
gtk3
|
||||
pango
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
zlib
|
||||
xorg.libxcb
|
||||
libxkbcommon
|
||||
libGL
|
||||
wayland
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
cargo
|
||||
gcc
|
||||
gnumake
|
||||
pkg-config
|
||||
fontconfig
|
||||
glibc
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
18
flake.lock
18
flake.lock
@ -197,21 +197,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1711657659,
|
||||
"narHash": "sha256-kdMlKb5nWzi+EUNdpyEBKjKL/ZY75T2cngH+zfKN+Vo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "7d11a87bb73d00d9fd5829b9eac36107bcdc2e28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"apple-silicon": "apple-silicon",
|
||||
@ -221,8 +206,7 @@
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"mir-home": "mir-home",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur"
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
@ -8,7 +8,6 @@
|
||||
url = "github:tpwrules/nixos-apple-silicon";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
nur.url = github:nix-community/NUR;
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@ -34,7 +33,6 @@
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
home-manager,
|
||||
nur,
|
||||
... }: {
|
||||
nixosConfigurations = {
|
||||
kremzeek = # {{{
|
||||
@ -138,7 +136,6 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
# inputs.nur.nixosModules.nur
|
||||
./configuration.nix {
|
||||
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
32
home.nix
32
home.nix
@ -1,10 +1,9 @@
|
||||
{ lib, config, pkgs, nur, inputs, ... }:
|
||||
{ lib, config, pkgs, inputs, ... }:
|
||||
|
||||
with lib.hm.gvariant;
|
||||
{
|
||||
imports = [
|
||||
./modules/dconf.nix
|
||||
./modules/shell.nix
|
||||
];
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
@ -12,6 +11,7 @@ with lib.hm.gvariant;
|
||||
home.homeDirectory = "/home/mir";
|
||||
home.packages = [
|
||||
pkgs.btop
|
||||
pkgs.firefox
|
||||
pkgs.killall
|
||||
pkgs.gdb
|
||||
pkgs.neofetch
|
||||
@ -67,7 +67,6 @@ with lib.hm.gvariant;
|
||||
TERMINAL = "kitty";
|
||||
TERM_PROGRAM = "kitty";
|
||||
BROWSER = "firefox";
|
||||
MOZ_USE_XINPUT2 = "1";
|
||||
};
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
@ -89,27 +88,12 @@ with lib.hm.gvariant;
|
||||
};
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
profiles = {
|
||||
default = {
|
||||
id = 0;
|
||||
name = "default";
|
||||
isDefault = true;
|
||||
settings = {
|
||||
"browser.startup.homepage" = "https://search.marq42.xyz";
|
||||
"browser.search.defaultenginename" = "searx";
|
||||
"borwser.search.order.1" = "searx";
|
||||
};
|
||||
search = {
|
||||
force = true;
|
||||
default = "searx";
|
||||
order = [ "searx" "Google" ];
|
||||
};
|
||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
vimium
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
export EDITOR=emacs\ -nw
|
||||
'';
|
||||
};
|
||||
# programs.gdb = {
|
||||
# enable = true;
|
||||
|
@ -1,41 +1,8 @@
|
||||
{ config, lib, pkgs, inputs, nur, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.extra-experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.buildMachines = [{
|
||||
hostName = "unicron";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 0;
|
||||
}];
|
||||
nix.distributedBuilds = true;
|
||||
nix.settings.builders = " ssh://unicron.local x86_64-linux " ;
|
||||
nix.extraOptions = ''
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
# dynamic linker
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
cmake
|
||||
fontconfig
|
||||
harfbuzz
|
||||
freetype
|
||||
expat
|
||||
glib
|
||||
atk
|
||||
gtk3
|
||||
pango
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
zlib
|
||||
xorg.libxcb
|
||||
libxkbcommon
|
||||
libGL
|
||||
wayland
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
];
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ inputs.nur.overlay ];
|
||||
|
||||
}
|
||||
|
@ -1,9 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
export EDITOR=emacs\ -nw
|
||||
'';
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user