Compare commits

...

6 Commits

6 changed files with 116 additions and 11 deletions

View File

@ -31,6 +31,8 @@
LC_TELEPHONE = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "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.enable = true;
services.auto-cpufreq.settings = { services.auto-cpufreq.settings = {
@ -152,6 +154,32 @@
vim vim
emacs29-pgtk emacs29-pgtk
nfs-utils 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; services.flatpak.enable = true;

View File

@ -197,6 +197,21 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
@ -206,7 +221,8 @@
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"mir-home": "mir-home", "mir-home": "mir-home",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur"
} }
}, },
"rust-overlay": { "rust-overlay": {

View File

@ -8,6 +8,7 @@
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
nur.url = github:nix-community/NUR;
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -33,6 +34,7 @@
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
home-manager, home-manager,
nur,
... }: { ... }: {
nixosConfigurations = { nixosConfigurations = {
kremzeek = # {{{ kremzeek = # {{{
@ -136,6 +138,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# inputs.nur.nixosModules.nur
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View File

@ -1,9 +1,10 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, nur, inputs, ... }:
with lib.hm.gvariant; with lib.hm.gvariant;
{ {
imports = [ imports = [
./modules/dconf.nix ./modules/dconf.nix
./modules/shell.nix
]; ];
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
@ -11,7 +12,6 @@ with lib.hm.gvariant;
home.homeDirectory = "/home/mir"; home.homeDirectory = "/home/mir";
home.packages = [ home.packages = [
pkgs.btop pkgs.btop
pkgs.firefox
pkgs.killall pkgs.killall
pkgs.gdb pkgs.gdb
pkgs.neofetch pkgs.neofetch
@ -67,6 +67,7 @@ with lib.hm.gvariant;
TERMINAL = "kitty"; TERMINAL = "kitty";
TERM_PROGRAM = "kitty"; TERM_PROGRAM = "kitty";
BROWSER = "firefox"; BROWSER = "firefox";
MOZ_USE_XINPUT2 = "1";
}; };
programs.kitty = { programs.kitty = {
enable = true; enable = true;
@ -88,12 +89,27 @@ with lib.hm.gvariant;
}; };
programs.firefox = { programs.firefox = {
enable = true; enable = true;
}; profiles = {
programs.bash = { default = {
enable = true; id = 0;
initExtra = '' name = "default";
export EDITOR=emacs\ -nw 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.gdb = { # programs.gdb = {
# enable = true; # enable = true;

View File

@ -1,8 +1,41 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, nur, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.extra-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 # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ inputs.nur.overlay ];
} }

9
modules/shell.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, lib, pkgs, ... }:
{
programs.bash = {
enable = true;
initExtra = ''
export EDITOR=emacs\ -nw
'';
};
}