Updating nixos on syl

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

View file

@ -52,7 +52,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
owner = "awesomeWM"; owner = "awesomeWM";
repo = "awesome"; repo = "awesome";
rev = "c539e0e4350a42f813952fc28dd8490f42d934b3"; rev = "c539e0e4350a42f813952fc28dd8490f42d934b3";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ="; sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
}; };
}); });
qt5ct = final.qt5ct.overrideAttrs (old: rec { qt5ct = final.qt5ct.overrideAttrs (old: rec {
@ -143,11 +143,11 @@ services.xserver = {
enable = true; enable = true;
windowManager.awesome = { windowManager.awesome = {
enable = true; enable = true;
# package = pkgs.myAwesome; package = pkgs.myAwesome;
}; };
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
desktopManager.gnome.enable = true; # desktopManager.gnome.enable = true;
}; };
# programs.qt5ct.enable = true; # programs.qt5ct.enable = true;
@ -295,6 +295,7 @@ brave
# firefox # firefox
kate kate
kdialog kdialog
plasma5Packages.khotkeys
openlp openlp
inkscape inkscape
libreoffice-fresh libreoffice-fresh
@ -343,17 +344,21 @@ gdb
clang clang
clang-tools clang-tools
cmake cmake
qtcreator
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
libsForQt5.wrapQtAppsHook
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.full qt5.full
qt5.qtbase qt5.qtbase
qt5.qtquickcontrols2 qt5.qtquickcontrols2
qt5.qtx11extras qt5.qtx11extras
libsForQt5.appstream-qt
libsForQt5.kdelibs4support
libsForQt5.kirigami2 libsForQt5.kirigami2
libsForQt5.ki18n libsForQt5.ki18n
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
plasma5Packages.kirigami2 # plasma5Packages.kirigami2
sqlite sqlite
fennel fennel
#+end_src #+end_src
@ -383,8 +388,9 @@ For some reason the emacs overlay has a specific sha256. So I'll create it in ea
owner = "awesomeWM"; owner = "awesomeWM";
repo = "awesome"; repo = "awesome";
rev = "3a542219f3bf129546ae79eb20e384ea28fa9798"; rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ="; sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
}; };
patches = [];
}); });
} }
) )
@ -406,7 +412,7 @@ Emacs service
#+begin_src nix #+begin_src nix
services.emacs = { services.emacs = {
enable = true; 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 ]));
}; };
#+end_src #+end_src
@ -543,14 +549,14 @@ Notice how I am including all of my software here. It may be a big file, but hav
macchina macchina
# Dev tools # Dev tools
<<dev-tools>> <<dev-tools>>
# <<lightlyshaders>> <<lightlyshaders>>
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [
(import (builtins.fetchTarball { (import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix"; sha256 = "1wjp97qkq32y7bkajy3v3m4n2igxwzim7v4wbf5wphhsxqbsvir8";
})) }))
<<overlays>> <<overlays>>
@ -570,7 +576,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
# services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
@ -603,41 +609,27 @@ Now in the =hardware-configuration.nix= file, I didn't change much because I wan
boot.kernelModules = [ "kvm-intel" "acpi_call" ]; boot.kernelModules = [ "kvm-intel" "acpi_call" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
boot.loader.efi.efiSysMountPoint = "/boot/efi";
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f"; { device = "/dev/disk/by-uuid/db28ba7c-a15d-4c81-8373-99f2f171cac5";
fsType = "btrfs"; 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."/boot/efi" =
{ device = "/dev/disk/by-uuid/BA76-3723";
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";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/disk/by-uuid/4f3c6d93-3be2-480c-8be8-fb9200c06b0c"; }
]; # 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"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
@ -847,6 +839,483 @@ Kaladin is still not fullly setup, so I'll be working on that more and more as t
** Home ** Home
I also use home-manager for managing dotfiles. This means that everything is contained in this folder and then tangled out to their respective places when rebuilding the system. I also use home-manager for managing dotfiles. This means that everything is contained in this folder and then tangled out to their respective places when rebuilding the system.
#+begin_src nix :tangle user/home.nix
{ config, pkgs, ... }:
{
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "chris";
home.homeDirectory = "/home/chris";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "21.11"; # Did you read the comment?
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# accounts.email.accounts = {
# personal = {
# address = "chris@cochrun.xyz";
# mbsync.enable = true;
# create = "maildir";
# mu.enable = true;
# imap = {
# host = "mail.cochrun.xyz";
# port = 993;
# tls.enable = true;
# };
# smtp = {
# host = "mail.cochrun.xyz";
# port = 25;
# tls.enable = true;
# };
# };
# work = {
# address = "chris@tfcconnection.org";
# mbsync.enable = true;
# create = "maildir";
# mu.enable = true;
# imap = {
# host = "outlook.office365.com";
# port = 993;
# tls.enable = true;
# };
# smtp = {
# host = "mail.cochrun.xyz";
# port = 25;
# tls.enable = true;
# };
# };
# };
programs.git = {
enable = true;
userName = "Chris Cochrun";
userEmail = "chris@cochrun.xyz";
};
home.packages = with pkgs; [
];
programs.mu.enable = true;
programs.mbsync = {
enable = true;
extraConfig = ''
IMAPAccount gmail
Host imap.gmail.com
User ccochrun21@gmail.com
PassCmd "rbw get gmail"
AuthMechs LOGIN
SSLType IMAPS
SSLVersions SSLv3
# CertificateFile /opt/local/share/curl/curl-ca-bundle.crt
IMAPAccount office
Host outlook.office365.com
User chris@tfcconnection.org
PassCmd "rbw get 'Office 365'"
AuthMechs LOGIN
SSLType IMAPS
IMAPAccount outlook
Host outlook.office365.com
User chris.cochrun@outlook.com
PassCmd "rbw get outlook"
AuthMechs LOGIN
SSLType IMAPS
IMAPAccount cochrun
Host mail.cochrun.xyz
User chris@cochrun.xyz
PassCmd "rbw get 'Office 365'"
AuthMechs LOGIN
SSLType IMAPS
# SSLVersions SSLv3
# CertificateFile /opt/local/share/curl/curl-ca-bundle.crt
# THEN WE SPECIFY THE LOCAL AND REMOTE STORAGE
# - THE REMOTE STORAGE IS WHERE WE GET THE MAIL FROM (E.G., THE
# SPECIFICATION OF AN IMAP ACCOUNT)
# - THE LOCAL STORAGE IS WHERE WE STORE THE EMAIL ON OUR COMPUTER
# REMOTE STORAGE (USE THE IMAP ACCOUNT SPECIFIED ABOVE)
IMAPStore gmail-remote
Account gmail
MaildirStore gmail-local
Path ~/Maildir/gmail/
Inbox ~/Maildir/gmail/INBOX
IMAPStore office-remote
Account office
# LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail)
MaildirStore office-local
Path ~/Maildir/office/
Inbox ~/Maildir/office/INBOX
Subfolders Verbatim
IMAPStore outlook-remote
Account outlook
MaildirStore outlook-local
Path ~/Maildir/outlook/
Inbox ~/Maildir/outlook/INBOX
Subfolders Verbatim
IMAPStore cochrun-remote
Account cochrun
MaildirStore cochrun-local
Path ~/Maildir/cochrun/
Inbox ~/Maildir/cochrun/INBOX
Subfolders Verbatim
# CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS
#
# CONNECTIONS ARE SPECIFIED USING PATTERNS, WHICH MATCH REMOTE MAIl
# FOLDERS. SOME COMMONLY USED PATTERS INCLUDE:
#
# 1 "*" TO MATCH EVERYTHING
# 2 "!DIR" TO EXCLUDE "DIR"
# 3 "DIR" TO MATCH DIR
Channel gmail-inbox
Far :gmail-remote:
Near :gmail-local:
Patterns "INBOX"
Create Both
Expunge Both
SyncState *
Channel gmail-trash
Far :gmail-remote:"[Gmail]/Bin"
Near :gmail-local:"[Gmail].Bin"
Create Both
Expunge Both
SyncState *
Channel gmail-sent
Far :gmail-remote:"[Gmail]/Sent Mail"
Near :gmail-local:"[Gmail].Sent Mail"
Create Both
Expunge Both
SyncState *
Channel gmail-all
Far :gmail-remote:"[Gmail]/All Mail"
Near :gmail-local:"[Gmail].All Mail"
Create Both
Expunge Both
SyncState *
Channel gmail-starred
Far :gmail-remote:"[Gmail]/Starred"
Near :gmail-local:"[Gmail].Starred"
Create Both
Expunge Both
SyncState *
Channel office-inbox
Far :office-remote:
Near :office-local:
Patterns "*"
Create Both
Expunge Both
SyncState *
Channel outlook-inbox
Far :outlook-remote:
Near :outlook-local:
Patterns "*"
Create Both
Expunge Both
SyncState *
Channel cochrun-inbox
Far :cochrun-remote:
Near :cochrun-local:
Patterns "*"
Create Both
Expunge Both
SyncState *
# GROUPS PUT TOGETHER CHANNELS, SO THAT WE CAN INVOKE
# MBSYNC ON A GROUP TO SYNC ALL CHANNELS
#
# FOR INSTANCE: "mbsync gmail" GETS MAIL FROM
# "gmail-inbox", "gmail-sent", and "gmail-trash"
#
# Group gmail
# Channel gmail-inbox
# Channel gmail-sent
# Channel gmail-trash
# Channel gmail-all
# Channel gmail-starred
Group office
Channel office-inbox
Group outlook
Channel outlook-inbox
Group cochrun
Channel cochrun-inbox
'';
};
programs.msmtp.enable = true;
services.mbsync.enable = true;
programs.obs-studio = {
enable = true;
plugins = [ pkgs.obs-studio-plugins.obs-websocket
pkgs.obs-studio-plugins.obs-move-transition ];
};
services.nextcloud-client = {
enable = true;
startInBackground = true;
};
services.syncthing.enable = true;
services.kdeconnect.enable = true;
services.easyeffects.enable = true;
services.espanso = {
enable = true;
settings = {
toggle_key = "RIGHT_CTRL";
matches = [
{ # dates
trigger = ":date";
replace = "{{mydate}}";
vars = [{
name = "mydate";
type = "date";
params = {format = "%m/%d/%Y";};
}];
}
{ # Shell commands
trigger = ":shell";
replace = "{{output}}";
vars = [{
name = "output";
type = "shell";
params = { cmd = "echo Hello from your shell";};
}];
}
{ # simple text
trigger = ":gml";
replace = "ccochrun21@gmail.com";
}
{
trigger = ":otl";
replace = "chris.cochrun@outlook.com";
}
{
trigger = ":tfcml";
replace = "chris@tfcconnection.org";
}
{
trigger = ":name";
replace = "Chris Cochrun";
}
{
trigger = ":cn";
replace = "A Giant Gummy Lizard";
}
];
};
};
home.file.".config/rofi" = {
source = ../rofi;
recursive = true;
};
programs.firefox = {
enable = true;
package = pkgs.firefox-wayland.override {
cfg = {
enableTridactylNative = true;
};
};
profiles.chris = {
name = "default";
path = "nw77o6yc.default";
isDefault = true;
};
};
home.file.".mozilla/firefox/nw77o6yc.default/chrome" = {
source = ../firefox/chrome;
recursive = true;
};
home.file.".config/tridactyl" = {
source = ../tridactyl;
recursive = true;
};
programs.rbw.enable = true;
home.file.".config/rbw" = {
source = ../rbw;
recursive = true;
};
home.file.".config/fish/config.fish" = {
source = ../fish/config.fish;
};
home.file.".config/fish/functions" = {
source = ../fish/functions;
};
programs.qutebrowser.enable = true;
home.file.".config/qutebrowser" = {
source = ../qutebrowser;
recursive = true;
};
home.file.".config/mpv" = {
source = ../mpv;
recursive = true;
};
home.file.".config/imv" = {
source = ../imv;
recursive = true;
};
home.file.".config/macchina" = {
source = ../macchina;
recursive = true;
};
home.file.".config/awesome" = {
source = ../awesome;
recursive = true;
};
home.file.".config/awesome/bling" = {
source = ../awesome/bling;
recursive = true;
};
home.file.".config/awesome/rubato" = {
source = ../awesome/rubato;
recursive = true;
};
home.file.".config/alacritty" = {
source = ../alacritty;
recursive = true;
};
home.file.".config/picom.conf" = {
source = ../picom.conf;
};
# home.file.".config/networkmanager-dmenu/config.ini" = {
# source = ../networkmanager-dmenu/config.ini;
# };
home.file."bin" = {
source = ../scripts;
recursive = true;
};
programs.starship.enable = true;
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
autocd = true;
dotDir = ".config/zsh";
shellAliases = {
ls = "exa -l";
la = "exa -la";
mpf = "mpv --profile=fast";
mps = "mpv --profile=slow";
ec = "emacsclient -t";
ecc = "emacsclient -c";
mkdir = "mkdir -pv";
nupd = "update-nix";
nupg = "upgrade-nix";
suspend = "systemctl suspend";
sysuse = "systemctl --user";
myip = "curl icanhazip.com";
};
initExtra = ''
pfetch
'';
};
xdg.desktopEntries = {
mpv-slow = {
name = "MPV";
genericName = "Play from MPV but at normal speed";
exec = "alacritty -e mpv --profile=slow %U";
terminal = true;
categories = [ "Application" ];
mimeType = [ "audio/ogg" "audio/mpeg" "audio/opus" "audio/x-opus+ogg" "audio/x-wav" ];
};
imv-rifle = {
name = "IMV";
genericName = "Show images in current directory in IMV";
exec = "/home/chris/bin/rifle-imv %U";
terminal = false;
categories = [ "Application" ];
mimeType = [ "image/gif" "image/jpeg" "image/png" "image/heif" ];
};
};
systemd.user.services = {
ydotoold = {
Unit = {
Description = "An auto-input utility for wayland";
Documentation = [ "man:ydotool(1)" "man:ydotoold(8)" ];
};
Service = {
ExecStart = "/run/current-system/sw/bin/ydotoold --socket-path /tmp/ydotools";
};
Install = {
WantedBy = ["default.target"];
};
};
ethminer = {
Unit = {
Description = "Mining at home";
};
Service = {
ExecStart = "/run/current-system/sw/bin/ethminer ";
};
Install = {
WantedBy = ["default.target"];
};
};
};
}
#+end_src
* Thanks! * Thanks!
* EXTRA * EXTRA

View file

@ -183,7 +183,7 @@
(awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer")) (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer"))
{:description "Open Writer" :group "apps" }) {:description "Open Writer" :group "apps" })
;;ff ;;ff
(awful.key [modkey] "b" (fn [] (awful.spawn "qblof")) (awful.key [modkey] "b" (fn [] (awful.spawn "fflof"))
{:description "launch browser" :group "apps"}) {:description "launch browser" :group "apps"})
;; rofi ;; rofi
(awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh")) (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh"))

View file

@ -236,4 +236,4 @@ end
# end # end
# fm6000 -r -c blue # fm6000 -r -c blue
# any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source

View file

@ -26,7 +26,7 @@
owner = "awesomeWM"; owner = "awesomeWM";
repo = "awesome"; repo = "awesome";
rev = "c539e0e4350a42f813952fc28dd8490f42d934b3"; rev = "c539e0e4350a42f813952fc28dd8490f42d934b3";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ="; sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
}; };
}); });
qt5ct = final.qt5ct.overrideAttrs (old: rec { qt5ct = final.qt5ct.overrideAttrs (old: rec {

View file

@ -3,3 +3,4 @@ od https://odysee.com/$/following
nc https://staff.tfcconnection.org/apps/dashboard/ nc https://staff.tfcconnection.org/apps/dashboard/
nch https://nc.cochrun.xyz/apps/files/ nch https://nc.cochrun.xyz/apps/files/
bw https://bitwarden.tfcconnection.org/#/vault bw https://bitwarden.tfcconnection.org/#/vault
azu https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
# Usage: ww -f "window class filter" -c "run if not found" # Usage: ww -f "window class filter" -c "run if not found"
# Usage: ww -fa "window title filter" -c "run if not found" # Usage: ww -fa "window title filter" -c "run if not found"

View file

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

View file

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

View file

@ -10,41 +10,27 @@
boot.kernelModules = [ "kvm-intel" "acpi_call" ]; boot.kernelModules = [ "kvm-intel" "acpi_call" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
boot.loader.efi.efiSysMountPoint = "/boot/efi";
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/500ad375-8fe0-4888-8f57-ee9d5ea1fd9f"; { device = "/dev/disk/by-uuid/db28ba7c-a15d-4c81-8373-99f2f171cac5";
fsType = "btrfs"; 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."/boot/efi" =
{ device = "/dev/disk/by-uuid/BA76-3723";
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";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/disk/by-uuid/4f3c6d93-3be2-480c-8be8-fb9200c06b0c"; }
]; # 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"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -233,6 +233,12 @@
programs.msmtp.enable = true; programs.msmtp.enable = true;
services.mbsync.enable = true; services.mbsync.enable = true;
programs.obs-studio = {
enable = true;
plugins = [ pkgs.obs-studio-plugins.obs-websocket
pkgs.obs-studio-plugins.obs-move-transition ];
};
services.nextcloud-client = { services.nextcloud-client = {
enable = true; enable = true;
startInBackground = true; startInBackground = true;