Finish felixalbpc, cleanup home-manager
This commit is contained in:
parent
f74bc0ec5e
commit
a05526b4bc
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./neovim.nix
|
||||
|
@ -11,7 +11,6 @@
|
|||
bottom
|
||||
ncdu
|
||||
neofetch
|
||||
nodejs
|
||||
sshfs
|
||||
sshuttle
|
||||
];
|
||||
|
|
|
@ -21,7 +21,6 @@ in {
|
|||
telescope-nvim
|
||||
|
||||
nvim-lspconfig
|
||||
# copilot-vim
|
||||
nvim-treesitter
|
||||
|
||||
coc-css
|
||||
|
@ -125,7 +124,9 @@ in {
|
|||
map <Leader><Space> :noh<CR>
|
||||
|
||||
" Start with copilot disabled
|
||||
if exists("*Copilot")
|
||||
autocmd VimEnter * Copilot disable
|
||||
endif
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
programs = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
history.extended = true;
|
||||
|
||||
prezto = {
|
||||
enable = true;
|
||||
|
@ -14,8 +15,6 @@
|
|||
pwdLength = "long";
|
||||
showReturnVal = true;
|
||||
};
|
||||
history.extended = true;
|
||||
historySubstringSearch.enable = true;
|
||||
terminal.autoTitle = true;
|
||||
|
||||
pmodules = [
|
||||
|
@ -23,6 +22,7 @@
|
|||
"terminal"
|
||||
"editor"
|
||||
"history"
|
||||
"history-substring-search"
|
||||
# "directory"
|
||||
"spectrum"
|
||||
# "utility"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
imports =
|
||||
[
|
||||
../../base.nix
|
||||
# ./hardware-configuration.nix
|
||||
./hardware-configuration.nix
|
||||
./desktop
|
||||
];
|
||||
|
||||
|
@ -16,6 +16,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
tempAddresses = "disabled";
|
||||
hostName = "felixalbpc";
|
||||
nameservers = [ "129.241.0.200" "129.241.0.201" "2001:700:300::200" "2001:700:300::201" ];
|
||||
domain = "it.ntnu.no";
|
||||
|
@ -24,6 +25,10 @@
|
|||
|
||||
console.keyMap = "no";
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"copilot.vim"
|
||||
];
|
||||
|
||||
users.users.felixalb = {
|
||||
uid = 1328256;
|
||||
extraGroups = [ "wheel" ];
|
||||
|
|
|
@ -1,29 +1,38 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./remote.nix
|
||||
./gnome.nix
|
||||
./xfce.nix
|
||||
];
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
xkbOptions = "ctrl:nocaps";
|
||||
xkb = {
|
||||
options = "ctrl:nocaps";
|
||||
variant = "intl";
|
||||
layout = "no,us";
|
||||
xkbVariant = "intl";
|
||||
};
|
||||
windowManager.qtile.enable = true;
|
||||
};
|
||||
|
||||
programs.hyprland.enable = true;
|
||||
|
||||
hardware.keyboard.zsa.enable = true;
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
xclip
|
||||
home-manager.users.felixalb = {
|
||||
services = {
|
||||
dunst.enable = true;
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
i3lock
|
||||
libnotify
|
||||
pamixer
|
||||
pavucontrol
|
||||
sxhkd
|
||||
xclip
|
||||
xss-lock
|
||||
];
|
||||
};
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnomeExtensions.appindicator
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
|
||||
programs.dconf.enable = true;
|
||||
}
|
|
@ -0,0 +1,35 @@
|
|||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/7516ebdb-14c3-4cb5-9d06-5e9d0e34b798";
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/02ac773e-31ff-4579-ad9a-859ba74f2a9e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/77ED-720D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-label/swap"; }
|
||||
];
|
||||
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
|
@ -2,27 +2,54 @@
|
|||
{
|
||||
imports = [
|
||||
./../../home/base.nix
|
||||
./../../home/alacritty.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
aerc
|
||||
catimg
|
||||
chromium
|
||||
dante
|
||||
dig
|
||||
element-desktop
|
||||
jq
|
||||
maim
|
||||
mpv
|
||||
oauth2ms
|
||||
openssl
|
||||
openstackclient
|
||||
pwgen
|
||||
remmina
|
||||
w3m
|
||||
|
||||
python3
|
||||
] ++ (with python3Packages; [
|
||||
(python311.withPackages (ps: with ps; [
|
||||
numpy
|
||||
pycryptodome
|
||||
python-novaclient
|
||||
requests
|
||||
]);
|
||||
]))
|
||||
];
|
||||
|
||||
programs = {
|
||||
zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
|
||||
git.extraConfig.user.email = "felix.albrigtsen@ntnu.no";
|
||||
aerc.enable = true;
|
||||
alacritty.enable = true;
|
||||
firefox.enable = true;
|
||||
git.extraConfig.user.email = "felix.albrigtsen@ntnu.no";
|
||||
rofi.enable = true;
|
||||
zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
|
||||
|
||||
neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
|
||||
};
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
|
||||
defaultApplications = {
|
||||
"text/html" = "firefox.desktop";
|
||||
"x-scheme-handler/http" = "firefox.desktop";
|
||||
"x-scheme-handler/https" = "firefox.desktop";
|
||||
"x-scheme-handler/about" = "firefox.desktop";
|
||||
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||
};
|
||||
};
|
||||
|
||||
home.stateVersion = "24.05";
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
cocoapods
|
||||
gnutar
|
||||
nix-index
|
||||
nodejs
|
||||
tldr
|
||||
unstable.snicat
|
||||
w3m
|
||||
|
@ -40,8 +41,11 @@
|
|||
prezto.pmodules = [ "ssh" ];
|
||||
};
|
||||
|
||||
# Ctrl+y + ,
|
||||
programs.neovim.plugins = with pkgs.vimPlugins; [ coc-emmet emmet-vim ];
|
||||
programs.neovim.plugins = with pkgs.vimPlugins; [
|
||||
coc-emmet
|
||||
copilot-vim
|
||||
emmet-vim # Ctrl+y + ,
|
||||
];
|
||||
|
||||
# Copy Applications to ~/Applications to allow them to be launched from Spotlight
|
||||
disabledModules = [ "targets/darwin/linkapps.nix" ];
|
||||
|
|
Loading…
Reference in New Issue