diff --git a/configuration.nix b/configuration.nix index 77f6cfb..f54cf3e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -3,9 +3,9 @@ let VERSION = "22.11"; # HOME-MANAGER = builtins.fetchTarball # "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; - unstable = import UNSTABLE_TARBALL { + unstable = import unstable_tarball { config = config.nixpkgs.config; }; nextcloud_scrapsync = pkgs.writeScriptBin @@ -20,6 +20,7 @@ in imports = [ ./hardware-configuration.nix + ]; networking.hostName = "workstation"; @@ -44,14 +45,11 @@ console = { services = { xserver = { enable = true; - # videoDrivers = [ "nvidia" "modesetting" ]; videoDrivers = [ "nvidia" ]; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; - # wacom.enable = true; layout = "us"; libinput.enable = true; # Wacom required? - # useGlamor = true; }; }; @@ -123,7 +121,7 @@ blender # cgi animation and sculpting godot # game development unstable.gdtoolkit # gdscript language server krita # art to your heart desire! -# drawpile # arty party with friends!! +drawpile # arty party with friends!! mypaint # not the best art program mypaint-brushes # but it's got some mypaint-brushes1 # nice damn brushes @@ -183,6 +181,7 @@ HentaiAtHome # uh-oh yt-dlp # downloads videos from most video websites unstable.gallery-dl # similar to yt-dlp but for most image gallery websites gdu # disk-space utility, somewhat useful +du-dust # rusty du gocryptfs # encrypted filesystem! shhh!!! exa # like ls but with colors 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! lm_sensors # for extension, displays cpu temp - # My own scripts nextcloud_scrapsync ffmpeg4discord @@ -315,7 +313,6 @@ home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true; home-manager.users.jawz = { config, pkgs, ... }:{ - # imports = [ ./dotfiles/dconf.nix ]; home.stateVersion = VERSION; home.packages = with pkgs; [ ]; @@ -394,7 +391,6 @@ programs = { bat = { enable = true; config = { - # map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; pager = "less -FR"; theme = "base16"; }; }; @@ -403,10 +399,6 @@ programs = { userName = "Danilo Reyes"; userEmail = "CaptainJawZ@outlook.com"; }; - # gpg = { - # enable = true; - # homedir = "${config.xdg.dataHome}/gnupg"; - # }; htop = { enable = true; package = pkgs.htop-vim; @@ -459,8 +451,6 @@ environment.variables = rec { XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_STATE_HOME = "\${HOME}/.local/state"; - SCRIPTS = "\${HOME}/Development/Scripts"; - # DEV PATH CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config"; CABAL_DIR = "\${XDG_CACHE_HOME}/cabal"; @@ -564,15 +554,9 @@ services = { enable = true; drivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; }; - # ipp-usb.enable = true; # usb scanner avahi.enable = true; avahi.nssmdns = true; fstrim.enable = true; - # jellyfin = { - # enable = true; - # group = "jawz"; - # user = "jawz"; - # }; btrfs.autoScrub = { enable = true; fileSystems = [ @@ -581,7 +565,6 @@ services = { "/mnt/disk2" ]; }; - # mediatomb.enable = true; openssh = { enable = true; ports = [ 25152 ]; @@ -689,7 +672,6 @@ systemd.user.services = { # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; -# Or disable the firewall altogether. networking.firewall.enable = false; system.copySystemConfiguration = true; diff --git a/configuration.org b/configuration.org index aedce7e..7914d25 100755 --- a/configuration.org +++ b/configuration.org @@ -40,9 +40,9 @@ let VERSION = "22.11"; # HOME-MANAGER = builtins.fetchTarball # "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; - unstable = import UNSTABLE_TARBALL { + unstable = import unstable_tarball { config = config.nixpkgs.config; }; nextcloud_scrapsync = pkgs.writeScriptBin @@ -64,6 +64,7 @@ the two ones I need are hardware and home-manager. imports = [ ./hardware-configuration.nix + ]; #+end_src @@ -123,14 +124,11 @@ undesirable packages from installing. services = { xserver = { enable = true; - # videoDrivers = [ "nvidia" "modesetting" ]; videoDrivers = [ "nvidia" ]; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; - # wacom.enable = true; layout = "us"; libinput.enable = true; # Wacom required? - # useGlamor = true; }; }; @@ -258,7 +256,7 @@ blender # cgi animation and sculpting godot # game development unstable.gdtoolkit # gdscript language server krita # art to your heart desire! -# drawpile # arty party with friends!! +drawpile # arty party with friends!! mypaint # not the best art program mypaint-brushes # but it's got some mypaint-brushes1 # nice damn brushes @@ -354,6 +352,7 @@ HentaiAtHome # uh-oh yt-dlp # downloads videos from most video websites unstable.gallery-dl # similar to yt-dlp but for most image gallery websites gdu # disk-space utility, somewhat useful +du-dust # rusty du gocryptfs # encrypted filesystem! shhh!!! exa # like ls but with colors 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! lm_sensors # for extension, displays cpu temp - # My own scripts nextcloud_scrapsync ffmpeg4discord @@ -543,7 +541,6 @@ home-manager.useGlobalPkgs = true; #+begin_src nix home-manager.users.jawz = { config, pkgs, ... }:{ - # imports = [ ./dotfiles/dconf.nix ]; home.stateVersion = VERSION; home.packages = with pkgs; [ ]; #+end_src @@ -644,7 +641,6 @@ programs = { bat = { enable = true; config = { - # map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; pager = "less -FR"; theme = "base16"; }; }; @@ -653,10 +649,6 @@ programs = { userName = "Danilo Reyes"; userEmail = "CaptainJawZ@outlook.com"; }; - # gpg = { - # enable = true; - # homedir = "${config.xdg.dataHome}/gnupg"; - # }; htop = { enable = true; package = pkgs.htop-vim; @@ -731,8 +723,6 @@ environment.variables = rec { XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_STATE_HOME = "\${HOME}/.local/state"; - SCRIPTS = "\${HOME}/Development/Scripts"; - # DEV PATH CABAL_CONFIG = "\${XDG_CONFIG_HOME}/cabal/config"; CABAL_DIR = "\${XDG_CACHE_HOME}/cabal"; @@ -857,15 +847,9 @@ services = { enable = true; drivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; }; - # ipp-usb.enable = true; # usb scanner avahi.enable = true; avahi.nssmdns = true; fstrim.enable = true; - # jellyfin = { - # enable = true; - # group = "jawz"; - # user = "jawz"; - # }; btrfs.autoScrub = { enable = true; fileSystems = [ @@ -874,7 +858,6 @@ services = { "/mnt/disk2" ]; }; - # mediatomb.enable = true; openssh = { enable = true; ports = [ 25152 ]; @@ -994,7 +977,6 @@ Open ports in the firewall. #+begin_src nix # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; -# Or disable the firewall altogether. networking.firewall.enable = false; #+end_src