diff --git a/configuration.nix b/configuration.nix index e23c88b..a348560 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - VERSION = "22.11"; + VERSION = "23.05"; # HOME-MANAGER = builtins.fetchTarball # "https://github.com/nix-community/home-manager/archive/master.tar.gz"; unstable_tarball = @@ -67,7 +67,7 @@ in { # Remember to close this bracket at the end of the document ]); # Sets up QT to use adwaita themes. - qt5 = { + qt = { enable = true; platformTheme = "gnome"; style = "adwaita"; @@ -113,40 +113,40 @@ in { # Remember to close this bracket at the end of the document blender # cgi animation and sculpting godot # game development - unstable.gdtoolkit # gdscript language server + 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 - unstable.gimp # the coolest bestest art program to never exist + pureref # create inspiration/reference boards + gimp # the coolest bestest art program to never exist lutris # game/emulator manager - # unstable.grapejuice # roblox manager + # grapejuice # roblox manager minecraft # minecraft official launcher parsec-bin # remote gaming with friends - unstable.protonup-qt # update proton-ge + protonup-qt # update proton-ge libreoffice-fresh # office, but based calibre # ugly af eBook library manager foliate # gtk eBook reader gnome-feeds # feed reader, maybe will replace with nextcloud - # unstable.wike # gtk wikipedia wow! - unstable.furtherance # I made this one tehee track time utility + wike # gtk wikipedia wow! + furtherance # I made this one tehee track time utility gnome.simple-scan # scanner # sequeler # friendly SQL client blanket # background noise - unstable.czkawka # duplicate finder + czkawka # duplicate finder pika-backup # backups # tilix # used to be my favourite terminal, but it's so outdated, that each time I use it less and less… 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 - # libgda # for pano shell extension + denaro # manage your finances + # celeste # sync tool for any cloud provider + libgda # for pano shell extension celluloid # video player cozy # audiobooks player @@ -154,7 +154,7 @@ in { # Remember to close this bracket at the end of the document handbrake # video converter, may be unnecessary curtail # image compressor pitivi # video editor - unstable.identity # compare images or videos + identity # compare images or videos mousai # poor man shazam tagger # tag music files # bottles # wine prefix manager @@ -227,6 +227,7 @@ in { # Remember to close this bracket at the end of the document # PYTHON. python3 # base language pipenv # python development workflow for humans + poetry # dependency management made easy # C# & Rust # omnisharp-roslyn # c# linter and code formatter @@ -244,8 +245,8 @@ in { # Remember to close this bracket at the end of the document hunspellDicts.en_CA # Themes - unstable.adw-gtk3 - # unstable.gradience # theme customizer, allows you to modify adw-gtk3 themes + adw-gtk3 + # gradience # theme customizer, allows you to modify adw-gtk3 themes gnome.gnome-tweaks # tweaks for the gnome desktop environment # Fonts @@ -262,53 +263,58 @@ in { # Remember to close this bracket at the end of the document symbola (papirus-icon-theme.override { color = "adwaita"; }) - ]) ++ (with pkgs.python311Packages; [ - black # Python code formatter + ]) ++ (with pkgs.python3Packages; [ flake8 # wraper for pyflakes, pycodestyle and mccabe isort # sort Python imports nose # testing and running python scripts pipx # install python packages in a virtual environment pyflakes # checks source code for errors - pylint # bug and style checker for python pytest # framework for writing tests speedtest-cli # check internet speed from the comand line editorconfig # follow rules of contributin - ]) ++ (with pkgs.python310Packages; - [ - poetry # dependency management made easy + black # Python code formatter + pylint # bug and style checker for python + (buildPythonApplication rec { + pname = "download"; + version = "1.5"; + src = ./scripts/download/.; + doCheck = false; + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ pyyaml types-pyyaml ]; + }) - ]) ++ (with pkgs.bat-extras; [ - batman # man pages - batpipe # piping - batgrep # ripgrep - batdiff # this is getting crazy! - batwatch # probably my next best friend - prettybat # trans your sourcecode! + ]) ++ (with pkgs.bat-extras; [ + batman # man pages + batpipe # piping + batgrep # ripgrep + batdiff # this is getting crazy! + batwatch # probably my next best friend + prettybat # trans your sourcecode! - ]) ++ (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.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.gnomeExtensions; [ - appindicator - gsconnect - freon - panel-scroll - reading-strip - tactile - ]) ++ (with unstable.pkgs.gnomeExtensions; - [ - pano + ]) ++ (with pkgs.gnomeExtensions; [ + appindicator + gsconnect + freon + panel-scroll + reading-strip + tactile + pano + # ]) ++ (with unstable.pkgs.gnomeExtensions; [ - ]) ++ (with pkgs.nodePackages; [ - # dockerfile-language-server-nodejs - markdownlint-cli - prettier - pnpm - ]); + ]) ++ (with pkgs.nodePackages; [ + dockerfile-language-server-nodejs + pyright + markdownlint-cli + prettier + pnpm + ]); }; # <--- end of package list fonts.fontconfig.enable = true; @@ -438,6 +444,7 @@ in { # Remember to close this bracket at the end of the document }; services = { + lorri.enable = true; emacs = { enable = true; defaultEditor = true; @@ -537,6 +544,7 @@ in { # Remember to close this bracket at the end of the document }; programs = { + fish.enable = true; mtr.enable = true; neovim = { enable = true; @@ -569,8 +577,10 @@ in { # Remember to close this bracket at the end of the document openssh = { enable = true; ports = [ 25152 ]; - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; startWhenNeeded = true; listenAddresses = [{ addr = "0.0.0.0"; diff --git a/configuration.org b/configuration.org index 0bea81e..cf5dc08 100755 --- a/configuration.org +++ b/configuration.org @@ -37,7 +37,7 @@ variables, and other functions. #+begin_src nix { config, pkgs, ... }: let - VERSION = "22.11"; + VERSION = "23.05"; # HOME-MANAGER = builtins.fetchTarball # "https://github.com/nix-community/home-manager/archive/master.tar.gz"; unstable_tarball = builtins.fetchTarball @@ -152,7 +152,7 @@ environment.gnome.excludePackages = (with pkgs; [ ]); # Sets up QT to use adwaita themes. -qt5 = { +qt = { enable = true; platformTheme = "gnome"; style = "adwaita"; @@ -254,14 +254,14 @@ goals is to create a workflow between this ecosystem of applications. #+begin_src nix blender # cgi animation and sculpting godot # game development -unstable.gdtoolkit # gdscript language server +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 -unstable.gimp # the coolest bestest art program to never exist +pureref # create inspiration/reference boards +gimp # the coolest bestest art program to never exist #+end_src *** GAMING @@ -271,10 +271,10 @@ anticipated, most everything seems to run seamlessly. #+begin_src nix lutris # game/emulator manager -# unstable.grapejuice # roblox manager +# grapejuice # roblox manager minecraft # minecraft official launcher parsec-bin # remote gaming with friends -unstable.protonup-qt # update proton-ge +protonup-qt # update proton-ge #+end_src *** PRODUCTIVITY @@ -286,8 +286,8 @@ libreoffice-fresh # office, but based calibre # ugly af eBook library manager foliate # gtk eBook reader gnome-feeds # feed reader, maybe will replace with nextcloud -# unstable.wike # gtk wikipedia wow! -unstable.furtherance # I made this one tehee track time utility +wike # gtk wikipedia wow! +furtherance # I made this one tehee track time utility gnome.simple-scan # scanner #+end_src @@ -298,15 +298,15 @@ if just for a try and play a little. #+begin_src nix # sequeler # friendly SQL client blanket # background noise -unstable.czkawka # duplicate finder +czkawka # duplicate finder pika-backup # backups # tilix # used to be my favourite terminal, but it's so outdated, that each time I use it less and less… 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 -# libgda # for pano shell extension +denaro # manage your finances +# celeste # sync tool for any cloud provider +libgda # for pano shell extension #+end_src *** MULTIMEDIA @@ -321,7 +321,7 @@ gnome-podcasts # podcast player handbrake # video converter, may be unnecessary curtail # image compressor pitivi # video editor -unstable.identity # compare images or videos +identity # compare images or videos mousai # poor man shazam tagger # tag music files # bottles # wine prefix manager @@ -408,6 +408,7 @@ nixfmt # linting # PYTHON. python3 # base language pipenv # python development workflow for humans +poetry # dependency management made easy # C# & Rust # omnisharp-roslyn # c# linter and code formatter @@ -436,8 +437,8 @@ main draws of Linux for me. #+begin_src nix # Themes -unstable.adw-gtk3 -# unstable.gradience # theme customizer, allows you to modify adw-gtk3 themes +adw-gtk3 +# gradience # theme customizer, allows you to modify adw-gtk3 themes gnome.gnome-tweaks # tweaks for the gnome desktop environment # Fonts @@ -453,19 +454,26 @@ symbola ** PYTHON #+begin_src nix -]) ++ (with pkgs.python311Packages; [ - black # Python code formatter +]) ++ (with pkgs.python3Packages; [ flake8 # wraper for pyflakes, pycodestyle and mccabe isort # sort Python imports nose # testing and running python scripts pipx # install python packages in a virtual environment pyflakes # checks source code for errors - pylint # bug and style checker for python pytest # framework for writing tests speedtest-cli # check internet speed from the comand line editorconfig # follow rules of contributin -]) ++ (with pkgs.python310Packages; [ - poetry # dependency management made easy + black # Python code formatter + pylint # bug and style checker for python + (buildPythonApplication rec { + pname = "download"; + version = "1.5"; + src = ./scripts/download/.; + doCheck = false; + buildInputs = [ setuptools ]; + propagatedBuildInputs = + [ pyyaml types-pyyaml ]; + }) #+end_src ** BAT-EXTRAS @@ -501,15 +509,16 @@ symbola panel-scroll reading-strip tactile -]) ++ (with unstable.pkgs.gnomeExtensions; [ pano +# ]) ++ (with unstable.pkgs.gnomeExtensions; [ #+end_src ** NODEJS PACKAGES #+begin_src nix ]) ++ (with pkgs.nodePackages; [ - # dockerfile-language-server-nodejs + dockerfile-language-server-nodejs + pyright markdownlint-cli prettier pnpm @@ -689,6 +698,7 @@ xdg = { #+begin_src nix services = { + lorri.enable = true; emacs = { enable = true; defaultEditor = true; @@ -825,6 +835,7 @@ of some services. #+begin_src nix programs = { + fish.enable = true; mtr.enable = true; neovim = { enable = true; @@ -863,8 +874,10 @@ services = { openssh = { enable = true; ports = [ 25152 ]; - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; startWhenNeeded = true; listenAddresses = [ { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 05cecee..dc985f1 100755 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -12,7 +12,6 @@ }; grub = { enable = true; - version = 2; device = "nodev"; efiSupport = true; enableCryptodisk = true; diff --git a/secrets.nix b/secrets.nix new file mode 100644 index 0000000..e69de29