chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating nixos on syl

Browse source
This commit is contained in:
Chris Cochrun 2022-06-29 11:24:14 -05:00
parent a7476a1222
commit 06e78fce2b
10 changed files with 556 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
system/kaladin/configuration.nix
View file

@ -54,11 +54,11 @@
enable = true;
windowManager.awesome = {
enable = true;
# package = pkgs.myAwesome;
package = pkgs.myAwesome;
};
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
desktopManager.gnome.enable = true;
# desktopManager.gnome.enable = true;
};
# programs.qt5ct.enable = true;
@ -206,6 +206,7 @@
# firefox
kate
kdialog
plasma5Packages.khotkeys
openlp
inkscape
libreoffice-fresh
@ -255,17 +256,21 @@
clang
clang-tools
cmake
qtcreator
extra-cmake-modules
pkg-config
libsForQt5.wrapQtAppsHook
# LIBRARIES FOR DEV
qt5.full
qt5.qtbase
qt5.qtquickcontrols2
qt5.qtx11extras
libsForQt5.appstream-qt
libsForQt5.kdelibs4support
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
plasma5Packages.kirigami2
# plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
@ -287,8 +292,9 @@
owner = "awesomeWM";
repo = "awesome";
rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ=";
sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
};
patches = [];
});
}
)
@ -306,7 +312,7 @@
services.emacs = {
enable = true;
package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
};
services.samba-wsdd.enable = true;
services.samba = {

22
system/syl/configuration.nix
View file

@ -58,11 +58,11 @@
enable = true;
windowManager.awesome = {
enable = true;
# package = pkgs.myAwesome;
package = pkgs.myAwesome;
};
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
desktopManager.gnome.enable = true;
# desktopManager.gnome.enable = true;
};
# programs.qt5ct.enable = true;
@ -223,6 +223,7 @@
# firefox
kate
kdialog
plasma5Packages.khotkeys
openlp
inkscape
libreoffice-fresh
@ -275,27 +276,31 @@
clang
clang-tools
cmake
qtcreator
extra-cmake-modules
pkg-config
libsForQt5.wrapQtAppsHook
# LIBRARIES FOR DEV
qt5.full
qt5.qtbase
qt5.qtquickcontrols2
qt5.qtx11extras
libsForQt5.appstream-qt
libsForQt5.kdelibs4support
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
plasma5Packages.kirigami2
# plasma5Packages.kirigami2
sqlite
fennel
# (libsForQt5.callPackage ../../LightlyShaders {})
(libsForQt5.callPackage ../../LightlyShaders {})
];
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
sha256 = "1wjp97qkq32y7bkajy3v3m4n2igxwzim7v4wbf5wphhsxqbsvir8";
}))
(self: super:
@ -307,8 +312,9 @@
owner = "awesomeWM";
repo = "awesome";
rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ=";
sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
};
patches = [];
});
}
)
@ -326,7 +332,7 @@
services.emacs = {
enable = true;
package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
};
services.samba-wsdd.enable = true;
services.samba = {
@ -366,7 +372,7 @@
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];

42
system/syl/hardware-configuration.nix
View file

@ -10,41 +10,27 @@
boot.kernelModules = [ "kvm-intel" "acpi_call" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
boot.loader.efi.efiSysMountPoint = "/boot/efi";
fileSystems."/" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f";
{ device = "/dev/disk/by-uuid/db28ba7c-a15d-4c81-8373-99f2f171cac5";
fsType = "btrfs";
options = [ "subvol=root" "noatime" "nodiratime" "ssd" "compress=zstd" "space_cache" ];
options = [ "subvol=@" ];
};
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/5db54453-8ae9-4ba0-b381-01255ac7d7f7";
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f";
fsType = "btrfs";
options = [ "subvol=home" "noatime" "nodiratime" "ssd" "compress=zstd" "space_cache" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f";
fsType = "btrfs";
options = [ "subvol=nix" "noatime" "nodiratime" "ssd" "compress=zstd" "space_cache" ];
};
fileSystems."/var/log" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f";
fsType = "btrfs";
options = [ "subvol=log" "noatime" "nodiratime" "ssd" "compress=zstd" "space_cache" ];
neededForBoot = true;
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E9C0-3E97";
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/BA76-3723";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/4f3c6d93-3be2-480c-8be8-fb9200c06b0c"; }
];
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp170s0.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;