Working basic config for whole system. Missing firefox extensions (through NUR) and some other basic things

This commit is contained in:
vorboyvo 2024-01-05 13:02:09 -05:00
parent ad93dd2ca6
commit c6495f053a
6 changed files with 105 additions and 15 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.lock

View file

@ -19,6 +19,14 @@
# package = pkgs.nixFlakes; # Ask Katie what that does # package = pkgs.nixFlakes; # Ask Katie what that does
settings.experimental-features = [ "nix-command" "flakes" ]; settings.experimental-features = [ "nix-command" "flakes" ];
}; };
# Enable Nix User Repository
# See https://github.com/nix-community/NUR#installation
# nixpkgs.config.packageOverrides = pkgs: {
# nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
# inherit pkgs;
# };
# };
networking.hostName = "oyvoLaptop"; # Define your hostname. networking.hostName = "oyvoLaptop"; # Define your hostname.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
@ -31,7 +39,7 @@
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "us"; keyMap = "us";
useXkbConfig = true; # use xkb.options in tty. # useXkbConfig = true; # use xkb.options in tty.
}; };
# Enable Wayland and Sway this way, for now (UPDATE: just using home manager lol) # Enable Wayland and Sway this way, for now (UPDATE: just using home manager lol)
@ -41,6 +49,7 @@
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
config.common.default = "*";
}; };
# Enable graphics. # Enable graphics.

View file

@ -8,6 +8,8 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# nur.url = "github:nix-community/NUR";
}; };
outputs = { self, nixpkgs, home-manager }: outputs = { self, nixpkgs, home-manager }:
let let
@ -17,10 +19,10 @@
nixosConfigurations = { nixosConfigurations = {
oyvoLaptop = nixpkgs.lib.nixosSystem { oyvoLaptop = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# nur.nixosModules.nur
]; ];
}; };
}; };

View file

@ -9,7 +9,10 @@
home.packages = with pkgs; home.packages = with pkgs;
[ texliveFull ] ++ # TeX distribution [ texliveFull ] ++ # TeX distribution
[ kitty ] ++ # Terminal emulator [ kitty ] ++ # Terminal emulator
[ firefox libreoffice ]; # Basic graphical apps [ firefox vifm pavucontrol ] ++ # Basic graphical apps
[ signal-desktop prismlauncher ] ++ # Personalized selection of graphical apps
[ bemenu j4-dmenu-desktop ] ++
[ noto-fonts ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -23,7 +26,7 @@
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
settings = { settings = {
font-size = 12; font-size = 11;
}; };
}; };
services.swayidle = { services.swayidle = {
@ -33,25 +36,86 @@
]; ];
}; };
programs.waybar = import ./wayland/waybar.nix { inherit config lib pkgs; }; # programs.waybar = import ./wayland/waybar.nix { inherit config lib pkgs; };
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = {
name = "NotoMono";
size = 11;
};
shellIntegration.enableZshIntegration = true; shellIntegration.enableZshIntegration = true;
}; };
programs.neovim = { programs.neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
viAlias = true;
vimAlias = true;
}; };
programs.zathura = { programs.zathura = {
enable = true; enable = true;
}; };
programs.thunderbird = { programs.firefox = {
enable = true; enable = true;
profiles = {
default = {
id = 0;
name = "Main Profile";
isDefault = true;
search = {
force = true;
default = "DuckDuckGo";
order = [ "DuckDuckGo" "Google" ];
engines = {
"Nix Packages" = {
urls = [{
template = "https://search.nixos.org/packages";
params = [
{ name = "type"; value = "packages"; }
{ name = "query"; value = "{searchTerms}"; }
];
}];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
};
"NixOS Wiki" = {
urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
iconUpdateURL = "https://nixos.wiki/favicon.png";
updateInterval = 24 * 60 * 60 * 1000; # every day
definedAliases = [ "@nw" ];
};
"HomeManager Unofficial Options" = {
urls = [{
template = "https://mipmip.github.io/home-manager-option-search";
params = [
{ name = "query"; value = "{searchTerms}"; }
];
}];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@hm" ];
};
"Google".metaData.alias = "@g"; #builtin engines only support specifying one additional alias
};
};
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
# ublock-origin
# bitwarden
# multi-account-containers
# ];
settings = {
"browser.search.region" = "CA";
"browser.search.isUS" = false;
};
};
};
}; };
# programs.thunderbird = {
# enable = true;
# };
} }

View file

@ -1,18 +1,32 @@
{ scripts, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
enable = true; enable = true;
config = { config = {
terminal = "kitty"; terminal = "kitty";
bars = [{
command = "${pkgs.lib.getExe pkgs.waybar}";
position = "bottom";
}];
modifier = "Mod4"; modifier = "Mod4";
fonts = {
names = [ "Noto Sans" ];
style = "Regular";
size = 12.0;
};
input = { "type:touchpad" = { natural_scroll = "enabled"; }; }; input = { "type:touchpad" = { natural_scroll = "enabled"; }; };
window = { window = {
border = 2; border = 2;
titlebar = true; titlebar = true;
}; };
menu = "j4-dmenu-desktop --dmenu='bemenu -i'";
focus.followMouse = false;
}; };
}; extraConfig =
''
output 'eDP-1' scale 1.50
'' + # Fractional scaling to 1.50
''
input type:touchpad {
natural_scroll disabled
dwt disabled
click_method clickfinger
}
''; # Disable fake scroll direction and disabling touchpad while typing, enable multi finger clicking
}

View file

@ -1,5 +1,5 @@
{ scripts, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
enable = true; enable = true;
}; }