diff --git a/configuration.nix b/configuration.nix index 870df13..bb454a5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,12 @@ -{ config, pkgs, ... -}: { # Remember to close this bracket at the end of the document +{ config, pkgs, ... }: +let + VERSION = "22.11"; + # HOME-MANAGER = builtins.fetchTarball + # "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + UNSTABLE_TARBALL = + builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master"; + unstable = import UNSTABLE_TARBALL { config = config.nixpkgs.config; }; +in { # Remember to close this bracket at the end of the document imports = [ ./hardware-configuration.nix ]; @@ -89,24 +96,26 @@ home-manager.users.jawz = { config, pkgs, ... }: { # imports = [ ./dotfiles/dconf.nix ]; - home.stateVersion = "22.11"; + home.stateVersion = VERSION; home.packages = (with pkgs; [ # Art blender # cgi animation and sculpting godot # game development - # gdtoolkit # gdscript language server + unstable.gdtoolkit # gdscript language server krita # art to your heart desire! drawpile # arty party with friends!! mypaint # not the best art program mypaint-brushes # but it's got some mypaint-brushes1 # nice damn brushes + unstable.pureref # create inspiration/reference boards # Gaming lutris # game/emulator manager grapejuice # roblox manager minecraft # minecraft official launcher parsec-bin # remote gaming with friends + unstable.protonup-qt # update proton-ge # Productivity libreoffice-fresh # office, but based @@ -119,12 +128,14 @@ # Misc sequeler # friendly SQL client blanket # background noise - czkawka # duplicate finder + unstable.czkawka # duplicate finder # pika-backup # backups tilix # terminal gnome-obfuscate # censor private information metadata-cleaner # remove any metadata and geolocation from files # gnome-recipes # migrate these to mealie and delete + unstable.denaro # manage your finances + unstable.celeste # sync tool for any cloud provider # Multimedia celluloid # video player @@ -133,7 +144,7 @@ handbrake # video converter, may be unnecessary curtail # image compressor pitivi # video editor - # identity # compare images or videos + unstable.identity # compare images or videos mousai # poor man shazam # bottles # wine prefix manager obs-studio # screen recorder & streamer @@ -155,6 +166,7 @@ trash-cli # oop! didn't meant to delete that ffmpeg_5 # coolest video converter! yt-dlp # downloads videos from most video websites + unstable.gallery-dl # similar to yt-dlp but for most image gallery websites neofetch # use once for brag, never again rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS tldr # man for retards @@ -190,7 +202,7 @@ pipenv # python development workflow for humans # C# & Rust - omnisharp-roslyn + omnisharp-roslyn # c# linter and code formatter # HASKELL # cabal-install # haskell interface @@ -200,7 +212,7 @@ # Node-js # nodePackages.pnpm - gnome.gnome-tweaks + gnome.gnome-tweaks # tweaks for the gnome desktop environment gnomeExtensions.appindicator gnomeExtensions.gsconnect @@ -212,6 +224,8 @@ # Themes adwaita-qt + unstable.adw-gtk3 + unstable.gradience # theme customizer, allows you to modify adw-gtk3 themes # Fonts (nerdfonts.override { @@ -224,6 +238,7 @@ "Iosevka" ]; }) + symbola # (papirus-icon-theme.override { # color = "grey"; @@ -241,6 +256,13 @@ pytest # framework for writing tests speedtest-cli # check internet speed from the comand line + ]) ++ (with pkgs.fishPlugins; [ + sponge # keep history clean from typos + fzf-fish # fish command line with fzf keybindings + colored-man-pages # self explanatory + autopair-fish # who has time for a closing bracket? + bass # integrate bash utilities on fish + ]) ++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs markdownlint-cli @@ -309,6 +331,12 @@ sudo nixos-rebuild switch -I nixos-config=$nix_file ''; + mkcd = '' + + mkdir -pv $argv + cd $argv + + ''; }; }; @@ -466,6 +494,6 @@ system.copySystemConfiguration = true; - system.stateVersion = "22.11"; + system.stateVersion = VERSION; } diff --git a/configuration.org b/configuration.org index 9446127..f896692 100755 --- a/configuration.org +++ b/configuration.org @@ -63,10 +63,21 @@ * ABOUT -Setting up the document. +Setting up the document. Also in theory this should allow me to set up +variables, and other functions. #+begin_src nix { config, pkgs, ... }: +let + VERSION = "22.11"; + # HOME-MANAGER = builtins.fetchTarball + # "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + UNSTABLE_TARBALL = builtins.fetchTarball + https://github.com/nixos/nixpkgs/tarball/master; + unstable = import UNSTABLE_TARBALL { + config = config.nixpkgs.config; + }; +in { # Remember to close this bracket at the end of the document #+end_src @@ -222,15 +233,21 @@ users.users.jawz = { extraGroups = [ "wheel" "networkmanager" "docker" ]; initialPassword = "password"; shell = pkgs.fish; - packages = with pkgs; [ ]; + packages = with pkgs; [ + ]; }; #+end_src * MISC SETTINGS -** ALLOW NON FREE packages +** NIXPKGS settings +this allows to install unfree packages, and also a toggle for installing +packages from the unstable repository by preppending "unstable" to the package +name. #+begin_src nix -nixpkgs.config = { allowUnfree = true; }; +nixpkgs.config = { + allowUnfree = true; +}; #+end_src ** ENABLE FONTCONFIG @@ -263,7 +280,7 @@ necessary. #+begin_src nix home-manager.users.jawz = { config, pkgs, ... }:{ # imports = [ ./dotfiles/dconf.nix ]; - home.stateVersion = "22.11"; + home.stateVersion = VERSION; home.packages = (with pkgs; [ #+end_src @@ -276,18 +293,20 @@ home-manager.users.jawz = { config, pkgs, ... }:{ # Art blender # cgi animation and sculpting godot # game development -# gdtoolkit # gdscript language server +unstable.gdtoolkit # gdscript language server krita # art to your heart desire! drawpile # arty party with friends!! mypaint # not the best art program mypaint-brushes # but it's got some mypaint-brushes1 # nice damn brushes +unstable.pureref # create inspiration/reference boards # Gaming lutris # game/emulator manager grapejuice # roblox manager minecraft # minecraft official launcher parsec-bin # remote gaming with friends +unstable.protonup-qt # update proton-ge # Productivity libreoffice-fresh # office, but based @@ -300,12 +319,14 @@ tagger # tag music files # Misc sequeler # friendly SQL client blanket # background noise -czkawka # duplicate finder +unstable.czkawka # duplicate finder # pika-backup # backups tilix # terminal gnome-obfuscate # censor private information metadata-cleaner # remove any metadata and geolocation from files # gnome-recipes # migrate these to mealie and delete +unstable.denaro # manage your finances +unstable.celeste # sync tool for any cloud provider # Multimedia celluloid # video player @@ -314,7 +335,7 @@ gnome-podcasts # podcast player handbrake # video converter, may be unnecessary curtail # image compressor pitivi # video editor -# identity # compare images or videos +unstable.identity # compare images or videos mousai # poor man shazam # bottles # wine prefix manager obs-studio # screen recorder & streamer @@ -340,6 +361,7 @@ exa # like ls but with colors trash-cli # oop! didn't meant to delete that ffmpeg_5 # coolest video converter! yt-dlp # downloads videos from most video websites +unstable.gallery-dl # similar to yt-dlp but for most image gallery websites neofetch # use once for brag, never again rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS tldr # man for retards @@ -379,7 +401,7 @@ python3 # base language pipenv # python development workflow for humans # C# & Rust -omnisharp-roslyn +omnisharp-roslyn # c# linter and code formatter # HASKELL # cabal-install # haskell interface @@ -393,7 +415,7 @@ omnisharp-roslyn *** GNOME EXTENSIONS #+begin_src nix -gnome.gnome-tweaks +gnome.gnome-tweaks # tweaks for the gnome desktop environment gnomeExtensions.appindicator gnomeExtensions.gsconnect @@ -415,11 +437,14 @@ Also, this finishes the packages array, put new modules above. #+begin_src nix # Themes adwaita-qt +unstable.adw-gtk3 +unstable.gradience # theme customizer, allows you to modify adw-gtk3 themes # Fonts (nerdfonts.override { fonts = [ "Agave" "CascadiaCode" "SourceCodePro" "Ubuntu" "FiraCode" "Iosevka" ]; }) +symbola # (papirus-icon-theme.override { # color = "grey"; @@ -442,6 +467,17 @@ adwaita-qt speedtest-cli # check internet speed from the comand line #+end_src +** FISH PLUGINS + +#+begin_src nix +]) ++ (with pkgs.fishPlugins; [ + sponge # keep history clean from typos + fzf-fish # fish command line with fzf keybindings + colored-man-pages # self explanatory + autopair-fish # who has time for a closing bracket? + bass # integrate bash utilities on fish +#+end_src + ** NPM #+begin_src nix @@ -526,9 +562,16 @@ echo $nix_file nixfmt $nix_file sudo nixos-rebuild switch -I nixos-config=$nix_file #+end_src - #+begin_src nix ''; + mkcd = '' +#+end_src +#+begin_src fish + mkdir -pv $argv + cd $argv +#+end_src +#+begin_src nix + ''; }; }; #+end_src @@ -772,7 +815,7 @@ of the first install of this system. Before changing this value read the documentation for this option. #+begin_src nix -system.stateVersion = "22.11"; +system.stateVersion = VERSION; #+end_src ** CLOSING :D