jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc cleanup preparing for agenix

Browse Source
This commit is contained in:
Danilo Reyes
2023-05-29 20:40:55 -06:00
parent 45c64ea07e
commit c8b521084c
2 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configuration.nix
View File

@@ -3,9 +3,9 @@ let
VERSION = "22.11"; VERSION = "22.11";
# HOME-MANAGER = builtins.fetchTarball # HOME-MANAGER = builtins.fetchTarball
# "https://github.com/nix-community/home-manager/archive/master.tar.gz"; # "https://github.com/nix-community/home-manager/archive/master.tar.gz";
UNSTABLE_TARBALL = builtins.fetchTarball unstable_tarball = builtins.fetchTarball
https://github.com/nixos/nixpkgs/tarball/master; https://github.com/nixos/nixpkgs/tarball/master;
unstable = import UNSTABLE_TARBALL { unstable = import unstable_tarball {
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
nextcloud_scrapsync = pkgs.writeScriptBin nextcloud_scrapsync = pkgs.writeScriptBin
@@ -20,6 +20,7 @@ in
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
<home-manager/nixos> <home-manager/nixos>
<agenix/modules/age.nix>
]; ];
networking.hostName = "workstation"; networking.hostName = "workstation";
@@ -44,14 +45,11 @@ console = {
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
# videoDrivers = [ "nvidia" "modesetting" ];
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
# wacom.enable = true;
layout = "us"; layout = "us";
libinput.enable = true; # Wacom required? libinput.enable = true; # Wacom required?
# useGlamor = true;
}; };
}; };
@@ -123,7 +121,7 @@ blender # cgi animation and sculpting
godot # game development godot # game development
unstable.gdtoolkit # gdscript language server unstable.gdtoolkit # gdscript language server
krita # art to your heart desire! krita # art to your heart desire!
# drawpile # arty party with friends!! drawpile # arty party with friends!!
mypaint # not the best art program mypaint # not the best art program
mypaint-brushes # but it's got some mypaint-brushes # but it's got some
mypaint-brushes1 # nice damn brushes mypaint-brushes1 # nice damn brushes
@@ -183,6 +181,7 @@ HentaiAtHome # uh-oh
yt-dlp # downloads videos from most video websites yt-dlp # downloads videos from most video websites
unstable.gallery-dl # similar to yt-dlp but for most image gallery websites unstable.gallery-dl # similar to yt-dlp but for most image gallery websites
gdu # disk-space utility, somewhat useful gdu # disk-space utility, somewhat useful
du-dust # rusty du
gocryptfs # encrypted filesystem! shhh!!! gocryptfs # encrypted filesystem! shhh!!!
exa # like ls but with colors exa # like ls but with colors
trash-cli # oop! didn't meant to delete that trash-cli # oop! didn't meant to delete that
@@ -198,7 +197,6 @@ xdg-ninja # help declutter $HOME
torrenttools # create torrent files from the terminal! torrenttools # create torrent files from the terminal!
lm_sensors # for extension, displays cpu temp lm_sensors # for extension, displays cpu temp
# My own scripts # My own scripts
nextcloud_scrapsync nextcloud_scrapsync
ffmpeg4discord ffmpeg4discord
@@ -315,7 +313,6 @@ home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.jawz = { config, pkgs, ... }:{ home-manager.users.jawz = { config, pkgs, ... }:{
# imports = [ ./dotfiles/dconf.nix ];
home.stateVersion = VERSION; home.stateVersion = VERSION;
home.packages = with pkgs; [ ]; home.packages = with pkgs; [ ];
@@ -394,7 +391,6 @@ programs = {
bat = { bat = {
enable = true; enable = true;
config = { config = {
# map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
pager = "less -FR"; pager = "less -FR";
theme = "base16"; }; theme = "base16"; };
}; };
@@ -403,10 +399,6 @@ programs = {
userName = "Danilo Reyes"; userName = "Danilo Reyes";
userEmail = "CaptainJawZ@outlook.com"; userEmail = "CaptainJawZ@outlook.com";
}; };
# gpg = {
# enable = true;
# homedir = "${config.xdg.dataHome}/gnupg";
# };
htop = { htop = {
enable = true; enable = true;
package = pkgs.htop-vim; package = pkgs.htop-vim;
@@ -459,8 +451,6 @@ environment.variables = rec {
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
XDG_STATE_HOME = "\${HOME}/.local/state"; XDG_STATE_HOME = "\${HOME}/.local/state";
SCRIPTS = "\${HOME}/Development/Scripts";
# DEV PATH # DEV PATH
CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config"; CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config";
CABAL_DIR = "\${XDG_CACHE_HOME}/cabal"; CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
@@ -564,15 +554,9 @@ services = {
enable = true; enable = true;
drivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; drivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
}; };
# ipp-usb.enable = true; # usb scanner
avahi.enable = true; avahi.enable = true;
avahi.nssmdns = true; avahi.nssmdns = true;
fstrim.enable = true; fstrim.enable = true;
# jellyfin = {
# enable = true;
# group = "jawz";
# user = "jawz";
# };
btrfs.autoScrub = { btrfs.autoScrub = {
enable = true; enable = true;
fileSystems = [ fileSystems = [
@@ -581,7 +565,6 @@ services = {
"/mnt/disk2" "/mnt/disk2"
]; ];
}; };
# mediatomb.enable = true;
openssh = { openssh = {
enable = true; enable = true;
ports = [ 25152 ]; ports = [ 25152 ];
@@ -689,7 +672,6 @@ systemd.user.services = {
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
networking.firewall.enable = false; networking.firewall.enable = false;
system.copySystemConfiguration = true; system.copySystemConfiguration = true;

28
configuration.org
View File

@@ -40,9 +40,9 @@ let
VERSION = "22.11"; VERSION = "22.11";
# HOME-MANAGER = builtins.fetchTarball # HOME-MANAGER = builtins.fetchTarball
# "https://github.com/nix-community/home-manager/archive/master.tar.gz"; # "https://github.com/nix-community/home-manager/archive/master.tar.gz";
UNSTABLE_TARBALL = builtins.fetchTarball unstable_tarball = builtins.fetchTarball
https://github.com/nixos/nixpkgs/tarball/master; https://github.com/nixos/nixpkgs/tarball/master;
unstable = import UNSTABLE_TARBALL { unstable = import unstable_tarball {
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
nextcloud_scrapsync = pkgs.writeScriptBin nextcloud_scrapsync = pkgs.writeScriptBin
@@ -64,6 +64,7 @@ the two ones I need are hardware and home-manager.
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
<home-manager/nixos> <home-manager/nixos>
<agenix/modules/age.nix>
]; ];
#+end_src #+end_src
@@ -123,14 +124,11 @@ undesirable packages from installing.
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
# videoDrivers = [ "nvidia" "modesetting" ];
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
# wacom.enable = true;
layout = "us"; layout = "us";
libinput.enable = true; # Wacom required? libinput.enable = true; # Wacom required?
# useGlamor = true;
}; };
}; };
@@ -258,7 +256,7 @@ blender # cgi animation and sculpting
godot # game development godot # game development
unstable.gdtoolkit # gdscript language server unstable.gdtoolkit # gdscript language server
krita # art to your heart desire! krita # art to your heart desire!
# drawpile # arty party with friends!! drawpile # arty party with friends!!
mypaint # not the best art program mypaint # not the best art program
mypaint-brushes # but it's got some mypaint-brushes # but it's got some
mypaint-brushes1 # nice damn brushes mypaint-brushes1 # nice damn brushes
@@ -354,6 +352,7 @@ HentaiAtHome # uh-oh
yt-dlp # downloads videos from most video websites yt-dlp # downloads videos from most video websites
unstable.gallery-dl # similar to yt-dlp but for most image gallery websites unstable.gallery-dl # similar to yt-dlp but for most image gallery websites
gdu # disk-space utility, somewhat useful gdu # disk-space utility, somewhat useful
du-dust # rusty du
gocryptfs # encrypted filesystem! shhh!!! gocryptfs # encrypted filesystem! shhh!!!
exa # like ls but with colors exa # like ls but with colors
trash-cli # oop! didn't meant to delete that trash-cli # oop! didn't meant to delete that
@@ -369,7 +368,6 @@ xdg-ninja # help declutter $HOME
torrenttools # create torrent files from the terminal! torrenttools # create torrent files from the terminal!
lm_sensors # for extension, displays cpu temp lm_sensors # for extension, displays cpu temp
# My own scripts # My own scripts
nextcloud_scrapsync nextcloud_scrapsync
ffmpeg4discord ffmpeg4discord
@@ -543,7 +541,6 @@ home-manager.useGlobalPkgs = true;
#+begin_src nix #+begin_src nix
home-manager.users.jawz = { config, pkgs, ... }:{ home-manager.users.jawz = { config, pkgs, ... }:{
# imports = [ ./dotfiles/dconf.nix ];
home.stateVersion = VERSION; home.stateVersion = VERSION;
home.packages = with pkgs; [ ]; home.packages = with pkgs; [ ];
#+end_src #+end_src
@@ -644,7 +641,6 @@ programs = {
bat = { bat = {
enable = true; enable = true;
config = { config = {
# map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
pager = "less -FR"; pager = "less -FR";
theme = "base16"; }; theme = "base16"; };
}; };
@@ -653,10 +649,6 @@ programs = {
userName = "Danilo Reyes"; userName = "Danilo Reyes";
userEmail = "CaptainJawZ@outlook.com"; userEmail = "CaptainJawZ@outlook.com";
}; };
# gpg = {
# enable = true;
# homedir = "${config.xdg.dataHome}/gnupg";
# };
htop = { htop = {
enable = true; enable = true;
package = pkgs.htop-vim; package = pkgs.htop-vim;
@@ -731,8 +723,6 @@ environment.variables = rec {
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
XDG_STATE_HOME = "\${HOME}/.local/state"; XDG_STATE_HOME = "\${HOME}/.local/state";
SCRIPTS = "\${HOME}/Development/Scripts";
# DEV PATH # DEV PATH
CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config"; CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config";
CABAL_DIR = "\${XDG_CACHE_HOME}/cabal"; CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
@@ -857,15 +847,9 @@ services = {
enable = true; enable = true;
drivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; drivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
}; };
# ipp-usb.enable = true; # usb scanner
avahi.enable = true; avahi.enable = true;
avahi.nssmdns = true; avahi.nssmdns = true;
fstrim.enable = true; fstrim.enable = true;
# jellyfin = {
# enable = true;
# group = "jawz";
# user = "jawz";
# };
btrfs.autoScrub = { btrfs.autoScrub = {
enable = true; enable = true;
fileSystems = [ fileSystems = [
@@ -874,7 +858,6 @@ services = {
"/mnt/disk2" "/mnt/disk2"
]; ];
}; };
# mediatomb.enable = true;
openssh = { openssh = {
enable = true; enable = true;
ports = [ 25152 ]; ports = [ 25152 ];
@@ -994,7 +977,6 @@ Open ports in the firewall.
#+begin_src nix #+begin_src nix
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
networking.firewall.enable = false; networking.firewall.enable = false;
#+end_src #+end_src