From 808a3c51a89aa57c379ca7faedcd7c40c8b955ce Mon Sep 17 00:00:00 2001 From: Madeleine Date: Sat, 15 Jul 2023 18:41:50 +0100 Subject: [PATCH] fixes and new apps --- flake.lock | 18 +++++----- maddie/common/code.nix | 1 - maddie/common/kakoune.nix | 3 -- maddie/common/python.nix | 18 ++++++++++ maddie/nixos/jetbrains.nix | 1 + systems/mdesktop/syncthing.nix | 60 ++++++++++++++++------------------ systems/mdesktop/xorg.nix | 5 ++- systems/mmacbookpro/apps.nix | 3 +- 8 files changed, 63 insertions(+), 46 deletions(-) create mode 100644 maddie/common/python.nix diff --git a/flake.lock b/flake.lock index f40e11b..e9e7abb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1689178160, - "narHash": "sha256-TVR0hn/JWo1qmtvgzqjfNerLPsIxfdFR3hf3QrnEj7U=", + "lastModified": 1689281837, + "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "795492c9a895762f36f6c1ff43d6e0de66fdffa8", + "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1689134369, - "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", + "lastModified": 1689362769, + "narHash": "sha256-5V7Z7T9019pGsFnYH6va5h6Wveq8FKmXa/xLfj0DhNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", + "rev": "c1cdce3d89741d402d8fd2c93e3d2643ff85b053", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689138773, - "narHash": "sha256-NEcJPQfwc1jNDI/ITvieJW2Y+IWdGIYCFHLJl5PGx3o=", + "lastModified": 1689352711, + "narHash": "sha256-xWYFt8vWnstDIVsZ26y9mf6h3714lVmXd6l+hTQz6tw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf57c599729771cd23054a18c0f3a391ae85e193", + "rev": "2047c642ce0f75307e8a0f2ec94715218c481184", "type": "github" }, "original": { diff --git a/maddie/common/code.nix b/maddie/common/code.nix index d4c3e95..049d6f6 100644 --- a/maddie/common/code.nix +++ b/maddie/common/code.nix @@ -2,7 +2,6 @@ { home.packages = with pkgs; [ - python3Full # Python go # Go ]; } diff --git a/maddie/common/kakoune.nix b/maddie/common/kakoune.nix index 0658a6f..fbc26ec 100644 --- a/maddie/common/kakoune.nix +++ b/maddie/common/kakoune.nix @@ -1,9 +1,6 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ - python310Packages.python-lsp-server - ]; programs.kakoune = { enable = true; config = { diff --git a/maddie/common/python.nix b/maddie/common/python.nix new file mode 100644 index 0000000..1539c78 --- /dev/null +++ b/maddie/common/python.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: + +let + packages = ps: with ps; [ + tkinter + pillow + psycopg + passlib + argon2_cffi + python-dotenv + python-lsp-server + ]; +in +{ + home.packages = [ + (pkgs.python311.withPackages packages) + ]; +} diff --git a/maddie/nixos/jetbrains.nix b/maddie/nixos/jetbrains.nix index e153807..51b934f 100644 --- a/maddie/nixos/jetbrains.nix +++ b/maddie/nixos/jetbrains.nix @@ -5,6 +5,7 @@ jetbrains.clion jetbrains.goland jetbrains.webstorm + jetbrains.datagrip jetbrains.pycharm-professional ]; } diff --git a/systems/mdesktop/syncthing.nix b/systems/mdesktop/syncthing.nix index ab6dd0e..e1f4d2d 100644 --- a/systems/mdesktop/syncthing.nix +++ b/systems/mdesktop/syncthing.nix @@ -10,38 +10,36 @@ guiAddress = "0.0.0.0:8384"; overrideFolders = true; overrideDevices = true; - settings = { - devices = { - "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; - "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; - "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; + devices = { + "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; + "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; + "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; + }; + folders = { + "Documents" = { + path = "/home/${username}/Documents"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; }; - folders = { - "Documents" = { - path = "/home/${username}/Documents"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Pictures" = { - path = "/home/${username}/Pictures"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Videos" = { - path = "/home/${username}/Videos"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Music" = { - path = "/home/${username}/Music"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Android Camera" = { - id = "pixel_7_pro_2qyx-photos"; - path = "/home/${username}/Pictures/DCIM"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - ".Hidden" = { - path = "/home/${username}/.Hidden"; - devices = [ "M.Phone.Pixel" ]; - }; + "Pictures" = { + path = "/home/${username}/Pictures"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Videos" = { + path = "/home/${username}/Videos"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Music" = { + path = "/home/${username}/Music"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Android Camera" = { + id = "pixel_7_pro_2qyx-photos"; + path = "/home/${username}/Pictures/DCIM"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + ".Hidden" = { + path = "/home/${username}/.Hidden"; + devices = [ "M.Phone.Pixel" ]; }; }; }; diff --git a/systems/mdesktop/xorg.nix b/systems/mdesktop/xorg.nix index f8389c2..b4267a6 100644 --- a/systems/mdesktop/xorg.nix +++ b/systems/mdesktop/xorg.nix @@ -9,9 +9,12 @@ layout = "gb"; xkbOptions = "eurosign:e"; - # Use startx for starting window managers displayManager = { + # Use startx for starting window managers startx.enable = true; + + # Use KDE Plasma 5 + # plasma5.enable = true; }; }; } diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix index 6a79b67..a546716 100644 --- a/systems/mmacbookpro/apps.nix +++ b/systems/mmacbookpro/apps.nix @@ -53,6 +53,7 @@ "tower" "secretive" "visual-studio-code" + "sf-symbols" # Learning "anki" @@ -67,7 +68,7 @@ ]; masApps = { "Codye" = 1516894961; - "Xcode" = 497799835; + /* "Xcode" = 497799835; */ }; }; }