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

making some basic changes to syl and user

Browse source
This commit is contained in:
Chris Cochrun 2022-05-07 14:21:11 -05:00
parent 9f2249219b
commit 0c92894205
8 changed files with 253 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fish/config.fish
View file

@ -212,10 +212,13 @@ alias la "exa -la"
alias mpf "mpv --profile=fast"
alias mps "mpv --profile=slow"
alias suspend "systemctl suspend"
alias sysuse "systemctl --user"
alias sys "systemctl"
alias ec "emacsclient -t"
alias ecc "emacsclient -c"
alias mkdir "mkdir -pv"
alias upnix "update-nix"
alias nupd "update-nix"
alias nupg "upgrade-nix"
### Start X at login
if status is-login

6
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1651800560,
"narHash": "sha256-LUfR0/Fv8DA0uu8Uex2S1QcLiE4B5ylplbXmMs6/YoM=",
"lastModified": 1651886851,
"narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "538343be863cb0b9e9f1471e6dc09e0e140c7b3d",
"rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6",
"type": "github"
},
"original": {

30
flake.nix
View file

@ -19,24 +19,30 @@
lib = nixpkgs.lib;
in {
homeConfigurations = {
chris = home-manager.lib.homeManagerConfiguration {
inherit system pkgs username;
homeDirectory = "/home/chris";
configuration = {
imports = [
./user/home.nix
];
};
stateVersion = "22.05";
};
};
# homeConfigurations = {
# chris = home-manager.lib.homeManagerConfiguration {
# inherit system pkgs username;
# homeDirectory = "/home/chris";
# configuration = {
# imports = [
# ./user/home.nix
# ];
# };
# stateVersion = "22.05";
# };
# };
nixosConfigurations = {
syl = lib.nixosSystem {
inherit system;
modules = [
./system/syl/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
}
];
};
kaladin = lib.nixosSystem {

9
scripts/update-nix
View file

@ -1,5 +1,6 @@
#!/bin/sh
nix-channel --update
sudo nix-channel --update
home-manager switch
sudo nixos-rebuild switch
currentdir=$(pwd)
cd ~/.dotfiles
nix flake update
nix flake lock
cd $currentdir

5
scripts/upgrade-nix Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
currentdir=$(pwd)
cd ~/.dotfiles
nixos-rebuild --use-remote-sudo switch --flake .#
cd $currentdir

1
scripts/webcam
View file

@ -1,3 +1,4 @@
#!/bin/sh
echo 'cam'
mpv --profile=wc --untimed av://av4l2:/dev/video0 --title='webcam'

15
system/syl/configuration.nix
View file

@ -101,7 +101,6 @@
users.users.chris = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "input" ]; # Enable ‘sudo’ for the user.
shell = pkgs.zsh;
};
programs.partition-manager.enable = true;
@ -141,6 +140,20 @@
sddm-kcm
ydotool
bottles
exa mpv yt-dlp rofi-emoji
nerdfonts latte-dock bat
libsForQt5.bismuth libnotify
rofi-wayland ripgrep bc
sysstat procs papirus-icon-theme
phinger-cursors plasma-hud kde-cli-tools
macchina meson ninja cmake
extra-cmake-modules gzip
htop btop firefox kate kdialog openlp
libreoffice-fresh vlc
neochat haskellPackages.greenclip
pulsemixer any-nix-shell wtype
spotdl kdenlive ffmpeg neofetch
xdotool
];
# EMACS

221
user/home.nix
View file

@ -18,6 +18,41 @@
# 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";
@ -25,19 +60,6 @@
};
home.packages = with pkgs; [
exa mpv yt-dlp rofi-emoji
nerdfonts latte-dock bat
libsForQt5.bismuth bc libnotify
rofi-wayland ripgrep
sysstat procs papirus-icon-theme
phinger-cursors plasma-hud kde-cli-tools
macchina meson ninja cmake gnumake
extra-cmake-modules gcc gzip
htop btop firefox kate kdialog openlp
easyeffects libreoffice-fresh vlc
neochat haskellPackages.greenclip
pulsemixer any-nix-shell wtype
spotdl kdenlive ffmpeg
];
programs.mu.enable = true;
@ -48,12 +70,173 @@
# defaultEditor = true;
# };
programs.mbsync.enable = true;
programs.mbsync = {
enable = true;
extraConfig = ''
IMAPAccount gmail
Host imap.gmail.com
User ccochrun21@gmail.com
Pass spveovqcgxpnaodn
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
Pass Gr@$$B00ts#21
AuthMechs LOGIN
SSLType IMAPS
IMAPAccount outlook
Host outlook.office365.com
User chris.cochrun@outlook.com
Pass GrassR00ts21
AuthMechs LOGIN
SSLType IMAPS
IMAPAccount cochrun
Host mail.cochrun.xyz
User chris@cochrun.xyz
Pass Gr@$$B00ts#21
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;
home.file.".mbsyncrc" = {
source = ./.mbsyncrc;
};
services.nextcloud-client = {
enable = true;
@ -161,7 +344,9 @@
ec = "emacsclient -t";
ecc = "emacsclient -c";
mkdir = "mkdir -pv";
upnix = "update-nix";
nupd = "update-nix";
nupg = "upgrade-nix";
sysuse = "systemctl --user";
};
initExtra = ''
macchina