From d0248123abb99ae565b693d0183d55949cc7b59e Mon Sep 17 00:00:00 2001 From: Madeleine Date: Sun, 2 Apr 2023 16:03:21 +0100 Subject: [PATCH] inital support for macos --- flake.lock | 21 ++++++++ flake.nix | 25 +++++---- maddie/browserpass.nix | 11 ---- maddie/{ => common}/browser.nix | 3 +- maddie/{ => common}/btop.nix | 0 maddie/{ => common}/calculator.nix | 2 +- maddie/{ => common}/code.nix | 0 maddie/{ => common}/editor.nix | 0 maddie/common/exa.nix | 15 ++++++ maddie/{ => common}/fetch.nix | 0 maddie/{ => common}/git.nix | 9 ++++ maddie/{ => common}/git/git-sync.sh | 0 maddie/{ => common}/htop.nix | 0 maddie/{ => common}/jetbrains.nix | 0 maddie/{ => common}/kakoune.nix | 0 maddie/{ => common}/lf.nix | 0 maddie/{ => common}/lf/icons | 0 maddie/{ => common}/lf/scope | 0 maddie/{ => common}/media.nix | 0 maddie/{ => common}/messaging.nix | 4 +- maddie/{ => common}/mommy.nix | 0 maddie/{ => common}/mommy/shell-mommy.sh | 0 maddie/{ => common}/mpv.nix | 0 maddie/{ => common}/neovim.nix | 0 maddie/{ => common}/neovim/.gitignore | 0 maddie/{ => common}/neovim/LICENSE | 0 maddie/{ => common}/neovim/README.md | 0 maddie/{ => common}/neovim/init.lua | 4 +- maddie/{ => common}/neovim/lua/basics.lua | 0 maddie/{ => common}/neovim/lua/colours.lua | 0 maddie/{ => common}/neovim/lua/keymaps.lua | 0 .../{ => common}/neovim/lua/plugins/cmp.lua | 0 maddie/{ => common}/neovim/spell/en.utf-8.add | 0 .../neovim/spell/en.utf-8.add.spl | Bin maddie/{ => common}/passwords.nix | 5 -- maddie/{ => common}/processes.nix | 1 - maddie/{ => common}/rust.nix | 0 maddie/{ => common}/shell.nix | 2 - maddie/{ => common}/smart-home.nix | 0 maddie/{ => common}/ssh.nix | 5 -- maddie/{ => common}/ssh/id_ed25519_sk.pub | 0 maddie/{ => common}/tmux.nix | 0 maddie/{ => common}/zsh.nix | 0 maddie/firefox.nix | 48 ------------------ maddie/macos/home.nix | 19 +++++++ maddie/macos/testing.nix | 5 ++ maddie/macos/wezterm.nix | 13 +++++ maddie/{ => nixos}/audio.nix | 0 maddie/{ => nixos}/audio/ytdlp-music.sh | 0 maddie/{ => nixos}/bosskey.nix | 0 maddie/{ => nixos}/bosskey/bosskey.sh | 0 maddie/{ => nixos}/chromium.nix | 0 maddie/{ => nixos}/dmenu.nix | 0 maddie/{ => nixos}/dmenu/dmenu-bluetooth | 0 maddie/{ => nixos}/dmenu/dmenu-kdeconnect | 0 maddie/{ => nixos}/dmenu/dmenu-mount | 0 maddie/{ => nixos}/dmenu/dmenu-mpc | 0 maddie/{ => nixos}/dmenu/dmenu-pass | 0 maddie/{ => nixos}/dmenu/dmenu-power | 0 maddie/{ => nixos}/dmenu/dmenu-unicode | 0 maddie/{ => nixos}/dunst.nix | 0 maddie/{ => nixos}/dwm.nix | 0 maddie/{ => nixos}/files.nix | 0 maddie/{ => nixos}/games.nix | 0 maddie/{ => nixos}/gtk.nix | 0 maddie/{ => nixos}/home.nix | 0 maddie/{ => nixos}/kdeconnect.nix | 0 maddie/{ => nixos}/minecraft.nix | 0 maddie/{ => nixos}/mpd.nix | 0 maddie/{ => nixos}/nsxiv.nix | 0 maddie/{ => nixos}/nsxiv/exec/key-handler | 0 maddie/{ => nixos}/office.nix | 0 maddie/{ => nixos}/openrgb.nix | 0 maddie/{ => nixos}/pcmanfm.nix | 0 .../{ => nixos}/pcmanfm/default/pcmanfm.conf | 0 maddie/{ => nixos}/picom.nix | 0 maddie/{ => nixos}/qt.nix | 0 maddie/{ => nixos}/screenshot.nix | 0 maddie/{ => nixos}/screenshot/sss.sh | 0 maddie/{ => nixos}/slstatus.nix | 0 maddie/{ => nixos}/statusbar/sb-clock | 0 maddie/{ => nixos}/statusbar/sb-cpu | 0 maddie/{ => nixos}/statusbar/sb-disk | 0 maddie/{ => nixos}/statusbar/sb-forecast | 0 maddie/{ => nixos}/statusbar/sb-iplocate | 0 maddie/{ => nixos}/statusbar/sb-kernel | 0 maddie/{ => nixos}/statusbar/sb-memory | 0 maddie/{ => nixos}/statusbar/sb-temp | 0 maddie/{ => nixos}/statusbar/sb-uptime | 0 maddie/{ => nixos}/statusbar/sb-volume | 0 maddie/{ => nixos}/steam.nix | 0 maddie/{ => nixos}/steam/steam-killer.sh | 0 maddie/{ => nixos}/tabbed.nix | 0 maddie/{ => nixos}/tabbed/tabbed-st | 0 maddie/{ => nixos}/terminal.nix | 0 maddie/{ => nixos}/virtualisation.nix | 0 maddie/{ => nixos}/xdg.nix | 0 maddie/{ => nixos}/xorg.nix | 0 maddie/{ => nixos}/zathura.nix | 0 maddie/obs-studio.nix | 5 -- overlays.nix | 2 +- systems/desktop/packages.nix | 3 -- systems/macbookpro/finder.nix | 13 +++++ systems/macbookpro/fonts.nix | 10 ++++ systems/macbookpro/gpg.nix | 11 ++++ systems/macbookpro/keyboard.nix | 13 +++++ systems/macbookpro/nix.nix | 17 +++++++ systems/macbookpro/packages.nix | 25 +++++++++ systems/macbookpro/zsh.nix | 10 ++++ 109 files changed, 202 insertions(+), 99 deletions(-) delete mode 100644 maddie/browserpass.nix rename maddie/{ => common}/browser.nix (67%) rename maddie/{ => common}/btop.nix (100%) rename maddie/{ => common}/calculator.nix (71%) rename maddie/{ => common}/code.nix (100%) rename maddie/{ => common}/editor.nix (100%) create mode 100644 maddie/common/exa.nix rename maddie/{ => common}/fetch.nix (100%) rename maddie/{ => common}/git.nix (84%) rename maddie/{ => common}/git/git-sync.sh (100%) rename maddie/{ => common}/htop.nix (100%) rename maddie/{ => common}/jetbrains.nix (100%) rename maddie/{ => common}/kakoune.nix (100%) rename maddie/{ => common}/lf.nix (100%) rename maddie/{ => common}/lf/icons (100%) rename maddie/{ => common}/lf/scope (100%) rename maddie/{ => common}/media.nix (100%) rename maddie/{ => common}/messaging.nix (64%) rename maddie/{ => common}/mommy.nix (100%) rename maddie/{ => common}/mommy/shell-mommy.sh (100%) rename maddie/{ => common}/mpv.nix (100%) rename maddie/{ => common}/neovim.nix (100%) rename maddie/{ => common}/neovim/.gitignore (100%) rename maddie/{ => common}/neovim/LICENSE (100%) rename maddie/{ => common}/neovim/README.md (100%) rename maddie/{ => common}/neovim/init.lua (98%) rename maddie/{ => common}/neovim/lua/basics.lua (100%) rename maddie/{ => common}/neovim/lua/colours.lua (100%) rename maddie/{ => common}/neovim/lua/keymaps.lua (100%) rename maddie/{ => common}/neovim/lua/plugins/cmp.lua (100%) rename maddie/{ => common}/neovim/spell/en.utf-8.add (100%) rename maddie/{ => common}/neovim/spell/en.utf-8.add.spl (100%) rename maddie/{ => common}/passwords.nix (69%) rename maddie/{ => common}/processes.nix (80%) rename maddie/{ => common}/rust.nix (100%) rename maddie/{ => common}/shell.nix (94%) rename maddie/{ => common}/smart-home.nix (100%) rename maddie/{ => common}/ssh.nix (86%) rename maddie/{ => common}/ssh/id_ed25519_sk.pub (100%) rename maddie/{ => common}/tmux.nix (100%) rename maddie/{ => common}/zsh.nix (100%) delete mode 100644 maddie/firefox.nix create mode 100644 maddie/macos/home.nix create mode 100644 maddie/macos/testing.nix create mode 100644 maddie/macos/wezterm.nix rename maddie/{ => nixos}/audio.nix (100%) rename maddie/{ => nixos}/audio/ytdlp-music.sh (100%) rename maddie/{ => nixos}/bosskey.nix (100%) rename maddie/{ => nixos}/bosskey/bosskey.sh (100%) rename maddie/{ => nixos}/chromium.nix (100%) rename maddie/{ => nixos}/dmenu.nix (100%) rename maddie/{ => nixos}/dmenu/dmenu-bluetooth (100%) rename maddie/{ => nixos}/dmenu/dmenu-kdeconnect (100%) rename maddie/{ => nixos}/dmenu/dmenu-mount (100%) rename maddie/{ => nixos}/dmenu/dmenu-mpc (100%) rename maddie/{ => nixos}/dmenu/dmenu-pass (100%) rename maddie/{ => nixos}/dmenu/dmenu-power (100%) rename maddie/{ => nixos}/dmenu/dmenu-unicode (100%) rename maddie/{ => nixos}/dunst.nix (100%) rename maddie/{ => nixos}/dwm.nix (100%) rename maddie/{ => nixos}/files.nix (100%) rename maddie/{ => nixos}/games.nix (100%) rename maddie/{ => nixos}/gtk.nix (100%) rename maddie/{ => nixos}/home.nix (100%) rename maddie/{ => nixos}/kdeconnect.nix (100%) rename maddie/{ => nixos}/minecraft.nix (100%) rename maddie/{ => nixos}/mpd.nix (100%) rename maddie/{ => nixos}/nsxiv.nix (100%) rename maddie/{ => nixos}/nsxiv/exec/key-handler (100%) rename maddie/{ => nixos}/office.nix (100%) rename maddie/{ => nixos}/openrgb.nix (100%) rename maddie/{ => nixos}/pcmanfm.nix (100%) rename maddie/{ => nixos}/pcmanfm/default/pcmanfm.conf (100%) rename maddie/{ => nixos}/picom.nix (100%) rename maddie/{ => nixos}/qt.nix (100%) rename maddie/{ => nixos}/screenshot.nix (100%) rename maddie/{ => nixos}/screenshot/sss.sh (100%) rename maddie/{ => nixos}/slstatus.nix (100%) rename maddie/{ => nixos}/statusbar/sb-clock (100%) rename maddie/{ => nixos}/statusbar/sb-cpu (100%) rename maddie/{ => nixos}/statusbar/sb-disk (100%) rename maddie/{ => nixos}/statusbar/sb-forecast (100%) rename maddie/{ => nixos}/statusbar/sb-iplocate (100%) rename maddie/{ => nixos}/statusbar/sb-kernel (100%) rename maddie/{ => nixos}/statusbar/sb-memory (100%) rename maddie/{ => nixos}/statusbar/sb-temp (100%) rename maddie/{ => nixos}/statusbar/sb-uptime (100%) rename maddie/{ => nixos}/statusbar/sb-volume (100%) rename maddie/{ => nixos}/steam.nix (100%) rename maddie/{ => nixos}/steam/steam-killer.sh (100%) rename maddie/{ => nixos}/tabbed.nix (100%) rename maddie/{ => nixos}/tabbed/tabbed-st (100%) rename maddie/{ => nixos}/terminal.nix (100%) rename maddie/{ => nixos}/virtualisation.nix (100%) rename maddie/{ => nixos}/xdg.nix (100%) rename maddie/{ => nixos}/xorg.nix (100%) rename maddie/{ => nixos}/zathura.nix (100%) delete mode 100644 maddie/obs-studio.nix create mode 100644 systems/macbookpro/finder.nix create mode 100644 systems/macbookpro/fonts.nix create mode 100644 systems/macbookpro/gpg.nix create mode 100644 systems/macbookpro/keyboard.nix create mode 100644 systems/macbookpro/nix.nix create mode 100644 systems/macbookpro/packages.nix create mode 100644 systems/macbookpro/zsh.nix diff --git a/flake.lock b/flake.lock index 471748a..e42a541 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1680266963, + "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "99d4187d11be86b49baa3a1aec0530004072374f", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -37,6 +57,7 @@ }, "root": { "inputs": { + "darwin": "darwin", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 5699c84..43ca0a7 100644 --- a/flake.nix +++ b/flake.nix @@ -5,42 +5,47 @@ # Home manager home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + darwin.url = "github:LnL7/nix-darwin"; + darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager }: + outputs = { self, nixpkgs, home-manager, darwin }: let username = "maddie"; - pkgs = import nixpkgs { inherit system; config.allowUnfree = true; overlays = import ./overlays.nix; }; + pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; config.allowUnsupportedSystem = false; config.allowBroken = false; overlays = import ./overlays.nix; }; utils = import ./utils pkgs; specialArgs = { inherit username; inherit pkgs; }; in { - nixosConfigurations.luna = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - inherit pkgs; + nixosConfigurations."luna" = nixpkgs.lib.nixosSystem { inherit specialArgs; + inherit pkgs; + system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager { - home-manager.users.${username}.imports = utils.nixFilesIn ./maddie; + home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos; home-manager.extraSpecialArgs = specialArgs; } ] ++ utils.nixFilesIn ./systems/desktop; }; - darwinConfigurations."MMacBookPro" = inputs.darwin.lib.darwinSystem { - inherit pkgs; + darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem { inherit specialArgs; - system = "aarch64-darwin", + inherit pkgs; + system = "aarch64-darwin"; modules = [ home-manager.darwinModules.home-manager { - home-manager.users.${username}.imports = utils.nixFilesIn ./maddie; + home-manager.useUserPackages = true; + home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos; home-manager.extraSpecialArgs = specialArgs; } ] ++ utils.nixFilesIn ./systems/macbookpro; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; + formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixpkgs-fmt; }; } diff --git a/maddie/browserpass.nix b/maddie/browserpass.nix deleted file mode 100644 index 091d0af..0000000 --- a/maddie/browserpass.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.browserpass = { - enable = true; - browsers = [ - "chromium" - "firefox" - ]; - }; -} diff --git a/maddie/browser.nix b/maddie/common/browser.nix similarity index 67% rename from maddie/browser.nix rename to maddie/common/browser.nix index f68dff5..d0db707 100644 --- a/maddie/browser.nix +++ b/maddie/common/browser.nix @@ -2,8 +2,7 @@ { home.packages = with pkgs; [ - tor-browser-bundle-bin - librewolf + # librewolf amfora lynx ]; diff --git a/maddie/btop.nix b/maddie/common/btop.nix similarity index 100% rename from maddie/btop.nix rename to maddie/common/btop.nix diff --git a/maddie/calculator.nix b/maddie/common/calculator.nix similarity index 71% rename from maddie/calculator.nix rename to maddie/common/calculator.nix index fb1cf64..d371b89 100644 --- a/maddie/calculator.nix +++ b/maddie/common/calculator.nix @@ -2,6 +2,6 @@ { home.packages = with pkgs; [ - nodePackages.insect + # nodePackages.insect ]; } diff --git a/maddie/code.nix b/maddie/common/code.nix similarity index 100% rename from maddie/code.nix rename to maddie/common/code.nix diff --git a/maddie/editor.nix b/maddie/common/editor.nix similarity index 100% rename from maddie/editor.nix rename to maddie/common/editor.nix diff --git a/maddie/common/exa.nix b/maddie/common/exa.nix new file mode 100644 index 0000000..d1661e5 --- /dev/null +++ b/maddie/common/exa.nix @@ -0,0 +1,15 @@ +{ config, ... }: + +{ + programs.exa = { + enable = true; + enableAliases = true; + extraOptions = [ + "--group-directories-first" + "--time-style=long-iso" + "--git" + "-h" + ]; + icons = true; + }; +} diff --git a/maddie/fetch.nix b/maddie/common/fetch.nix similarity index 100% rename from maddie/fetch.nix rename to maddie/common/fetch.nix diff --git a/maddie/git.nix b/maddie/common/git.nix similarity index 84% rename from maddie/git.nix rename to maddie/common/git.nix index 5aaeb0b..039e8ea 100644 --- a/maddie/git.nix +++ b/maddie/common/git.nix @@ -37,5 +37,14 @@ init.defaultBranch = "development"; pull.rebase = "merges"; }; + + ignores = [ + "**/.DS_Store" + "**/._.DS_Store" + ".DS_Store" + "._.DS_Store" + "**/*.swp" + "*.swp" + ]; }; } diff --git a/maddie/git/git-sync.sh b/maddie/common/git/git-sync.sh similarity index 100% rename from maddie/git/git-sync.sh rename to maddie/common/git/git-sync.sh diff --git a/maddie/htop.nix b/maddie/common/htop.nix similarity index 100% rename from maddie/htop.nix rename to maddie/common/htop.nix diff --git a/maddie/jetbrains.nix b/maddie/common/jetbrains.nix similarity index 100% rename from maddie/jetbrains.nix rename to maddie/common/jetbrains.nix diff --git a/maddie/kakoune.nix b/maddie/common/kakoune.nix similarity index 100% rename from maddie/kakoune.nix rename to maddie/common/kakoune.nix diff --git a/maddie/lf.nix b/maddie/common/lf.nix similarity index 100% rename from maddie/lf.nix rename to maddie/common/lf.nix diff --git a/maddie/lf/icons b/maddie/common/lf/icons similarity index 100% rename from maddie/lf/icons rename to maddie/common/lf/icons diff --git a/maddie/lf/scope b/maddie/common/lf/scope similarity index 100% rename from maddie/lf/scope rename to maddie/common/lf/scope diff --git a/maddie/media.nix b/maddie/common/media.nix similarity index 100% rename from maddie/media.nix rename to maddie/common/media.nix diff --git a/maddie/messaging.nix b/maddie/common/messaging.nix similarity index 64% rename from maddie/messaging.nix rename to maddie/common/messaging.nix index 1f8bd2a..832d5f6 100644 --- a/maddie/messaging.nix +++ b/maddie/common/messaging.nix @@ -3,8 +3,8 @@ { home.packages = with pkgs; [ element-desktop # Matrix client - signal-desktop # Signal client + # signal-desktop # Signal client discord-canary # Discord client - ripcord # Better discord client + #ripcord # Better discord client ]; } diff --git a/maddie/mommy.nix b/maddie/common/mommy.nix similarity index 100% rename from maddie/mommy.nix rename to maddie/common/mommy.nix diff --git a/maddie/mommy/shell-mommy.sh b/maddie/common/mommy/shell-mommy.sh similarity index 100% rename from maddie/mommy/shell-mommy.sh rename to maddie/common/mommy/shell-mommy.sh diff --git a/maddie/mpv.nix b/maddie/common/mpv.nix similarity index 100% rename from maddie/mpv.nix rename to maddie/common/mpv.nix diff --git a/maddie/neovim.nix b/maddie/common/neovim.nix similarity index 100% rename from maddie/neovim.nix rename to maddie/common/neovim.nix diff --git a/maddie/neovim/.gitignore b/maddie/common/neovim/.gitignore similarity index 100% rename from maddie/neovim/.gitignore rename to maddie/common/neovim/.gitignore diff --git a/maddie/neovim/LICENSE b/maddie/common/neovim/LICENSE similarity index 100% rename from maddie/neovim/LICENSE rename to maddie/common/neovim/LICENSE diff --git a/maddie/neovim/README.md b/maddie/common/neovim/README.md similarity index 100% rename from maddie/neovim/README.md rename to maddie/common/neovim/README.md diff --git a/maddie/neovim/init.lua b/maddie/common/neovim/init.lua similarity index 98% rename from maddie/neovim/init.lua rename to maddie/common/neovim/init.lua index de906a8..68daca1 100644 --- a/maddie/neovim/init.lua +++ b/maddie/common/neovim/init.lua @@ -52,9 +52,7 @@ return require('packer').startup(function(use) use { 'xiyaowong/nvim-transparent', config = function() - require('transparent').setup({ - enable = false; - }) + vim.g.transparent_enabled = false end } diff --git a/maddie/neovim/lua/basics.lua b/maddie/common/neovim/lua/basics.lua similarity index 100% rename from maddie/neovim/lua/basics.lua rename to maddie/common/neovim/lua/basics.lua diff --git a/maddie/neovim/lua/colours.lua b/maddie/common/neovim/lua/colours.lua similarity index 100% rename from maddie/neovim/lua/colours.lua rename to maddie/common/neovim/lua/colours.lua diff --git a/maddie/neovim/lua/keymaps.lua b/maddie/common/neovim/lua/keymaps.lua similarity index 100% rename from maddie/neovim/lua/keymaps.lua rename to maddie/common/neovim/lua/keymaps.lua diff --git a/maddie/neovim/lua/plugins/cmp.lua b/maddie/common/neovim/lua/plugins/cmp.lua similarity index 100% rename from maddie/neovim/lua/plugins/cmp.lua rename to maddie/common/neovim/lua/plugins/cmp.lua diff --git a/maddie/neovim/spell/en.utf-8.add b/maddie/common/neovim/spell/en.utf-8.add similarity index 100% rename from maddie/neovim/spell/en.utf-8.add rename to maddie/common/neovim/spell/en.utf-8.add diff --git a/maddie/neovim/spell/en.utf-8.add.spl b/maddie/common/neovim/spell/en.utf-8.add.spl similarity index 100% rename from maddie/neovim/spell/en.utf-8.add.spl rename to maddie/common/neovim/spell/en.utf-8.add.spl diff --git a/maddie/passwords.nix b/maddie/common/passwords.nix similarity index 69% rename from maddie/passwords.nix rename to maddie/common/passwords.nix index 9575900..c43e87d 100644 --- a/maddie/passwords.nix +++ b/maddie/common/passwords.nix @@ -11,9 +11,4 @@ home.sessionVariables = { PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store"; }; - - services.pass-secret-service = { - enable = true; - storePath = "${config.xdg.dataHome}/password-store"; - }; } diff --git a/maddie/processes.nix b/maddie/common/processes.nix similarity index 80% rename from maddie/processes.nix rename to maddie/common/processes.nix index 27c0201..8ef33c9 100644 --- a/maddie/processes.nix +++ b/maddie/common/processes.nix @@ -4,6 +4,5 @@ home.packages = with pkgs; [ xorg.xkill # Kill X11 programs with mouse killall # Kill programs - gotop # Process manager in go ]; } diff --git a/maddie/rust.nix b/maddie/common/rust.nix similarity index 100% rename from maddie/rust.nix rename to maddie/common/rust.nix diff --git a/maddie/shell.nix b/maddie/common/shell.nix similarity index 94% rename from maddie/shell.nix rename to maddie/common/shell.nix index 1b283cb..5543933 100644 --- a/maddie/shell.nix +++ b/maddie/common/shell.nix @@ -5,8 +5,6 @@ # Aliases shellAliases = { # Core Programs - ls = "ls -lhN --color=auto --group-directories-first"; - ll = "ls -av"; cp = "cp -iv"; mv = "mv -iv"; rm = "rm -vI"; diff --git a/maddie/smart-home.nix b/maddie/common/smart-home.nix similarity index 100% rename from maddie/smart-home.nix rename to maddie/common/smart-home.nix diff --git a/maddie/ssh.nix b/maddie/common/ssh.nix similarity index 86% rename from maddie/ssh.nix rename to maddie/common/ssh.nix index b004949..d484c3c 100644 --- a/maddie/ssh.nix +++ b/maddie/common/ssh.nix @@ -1,11 +1,6 @@ { config, pkgs, username, ... }: { - # Drawterm - home.packages = with pkgs; [ - drawterm - ]; - # SSH programs.ssh = { enable = true; diff --git a/maddie/ssh/id_ed25519_sk.pub b/maddie/common/ssh/id_ed25519_sk.pub similarity index 100% rename from maddie/ssh/id_ed25519_sk.pub rename to maddie/common/ssh/id_ed25519_sk.pub diff --git a/maddie/tmux.nix b/maddie/common/tmux.nix similarity index 100% rename from maddie/tmux.nix rename to maddie/common/tmux.nix diff --git a/maddie/zsh.nix b/maddie/common/zsh.nix similarity index 100% rename from maddie/zsh.nix rename to maddie/common/zsh.nix diff --git a/maddie/firefox.nix b/maddie/firefox.nix deleted file mode 100644 index 3a4bb28..0000000 --- a/maddie/firefox.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, ... }: - -{ - programs.firefox = { - enable = true; - profiles = { - "maddie" = { - name = "Maddie"; - bookmarks = [ - { - name = "Home"; - bookmarks = [ - { - name = "BT Home Hub"; - url = "http://192.168.1.254/"; - } - { - name = "Home Assistant"; - url = "http://192.168.1.105:8123/lovelace/0"; - } - { - name = "Security Cameras"; - url = "http://192.168.1.108/"; - } - { - name = "Fast"; - url = "https://fast.com/"; - } - ]; - } - { - name = "Nix"; - bookmarks = [ - { - name = "NixOS Packages"; - url = "https://search.nixos.org/packages"; - } - { - name = "NixOS Options"; - url = "https://search.nixos.org/options"; - } - ]; - } - ]; - }; - }; - }; -} diff --git a/maddie/macos/home.nix b/maddie/macos/home.nix new file mode 100644 index 0000000..1b361b4 --- /dev/null +++ b/maddie/macos/home.nix @@ -0,0 +1,19 @@ +{ config, username, pkgs, lib, ... }: + +{ + programs.home-manager.enable = true; + home = { + inherit username; + homeDirectory = lib.mkForce "/Users/${username}"; + stateVersion = "23.05"; + }; + + # Install MacOS applications to the user environment if the targetPlatform is Darwin + home.file."Applications/home-manager-linked".source = let + apps = pkgs.buildEnv { + name = "home-manager-applications"; + paths = config.home.packages; + pathsToLink = "/Applications"; + }; + in lib.mkIf pkgs.stdenv.targetPlatform.isDarwin "${apps}/Applications"; +} diff --git a/maddie/macos/testing.nix b/maddie/macos/testing.nix new file mode 100644 index 0000000..cf79e90 --- /dev/null +++ b/maddie/macos/testing.nix @@ -0,0 +1,5 @@ +{ config, ... }: + +{ + programs.kitty.enable = true; +} diff --git a/maddie/macos/wezterm.nix b/maddie/macos/wezterm.nix new file mode 100644 index 0000000..20a043c --- /dev/null +++ b/maddie/macos/wezterm.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: + +{ + programs.wezterm = { + enable = true; + extraConfig = '' + return { + color_scheme = 'OneDark (base16)', + hide_tab_bar_if_only_one_tab = true + } + ''; + }; +} diff --git a/maddie/audio.nix b/maddie/nixos/audio.nix similarity index 100% rename from maddie/audio.nix rename to maddie/nixos/audio.nix diff --git a/maddie/audio/ytdlp-music.sh b/maddie/nixos/audio/ytdlp-music.sh similarity index 100% rename from maddie/audio/ytdlp-music.sh rename to maddie/nixos/audio/ytdlp-music.sh diff --git a/maddie/bosskey.nix b/maddie/nixos/bosskey.nix similarity index 100% rename from maddie/bosskey.nix rename to maddie/nixos/bosskey.nix diff --git a/maddie/bosskey/bosskey.sh b/maddie/nixos/bosskey/bosskey.sh similarity index 100% rename from maddie/bosskey/bosskey.sh rename to maddie/nixos/bosskey/bosskey.sh diff --git a/maddie/chromium.nix b/maddie/nixos/chromium.nix similarity index 100% rename from maddie/chromium.nix rename to maddie/nixos/chromium.nix diff --git a/maddie/dmenu.nix b/maddie/nixos/dmenu.nix similarity index 100% rename from maddie/dmenu.nix rename to maddie/nixos/dmenu.nix diff --git a/maddie/dmenu/dmenu-bluetooth b/maddie/nixos/dmenu/dmenu-bluetooth similarity index 100% rename from maddie/dmenu/dmenu-bluetooth rename to maddie/nixos/dmenu/dmenu-bluetooth diff --git a/maddie/dmenu/dmenu-kdeconnect b/maddie/nixos/dmenu/dmenu-kdeconnect similarity index 100% rename from maddie/dmenu/dmenu-kdeconnect rename to maddie/nixos/dmenu/dmenu-kdeconnect diff --git a/maddie/dmenu/dmenu-mount b/maddie/nixos/dmenu/dmenu-mount similarity index 100% rename from maddie/dmenu/dmenu-mount rename to maddie/nixos/dmenu/dmenu-mount diff --git a/maddie/dmenu/dmenu-mpc b/maddie/nixos/dmenu/dmenu-mpc similarity index 100% rename from maddie/dmenu/dmenu-mpc rename to maddie/nixos/dmenu/dmenu-mpc diff --git a/maddie/dmenu/dmenu-pass b/maddie/nixos/dmenu/dmenu-pass similarity index 100% rename from maddie/dmenu/dmenu-pass rename to maddie/nixos/dmenu/dmenu-pass diff --git a/maddie/dmenu/dmenu-power b/maddie/nixos/dmenu/dmenu-power similarity index 100% rename from maddie/dmenu/dmenu-power rename to maddie/nixos/dmenu/dmenu-power diff --git a/maddie/dmenu/dmenu-unicode b/maddie/nixos/dmenu/dmenu-unicode similarity index 100% rename from maddie/dmenu/dmenu-unicode rename to maddie/nixos/dmenu/dmenu-unicode diff --git a/maddie/dunst.nix b/maddie/nixos/dunst.nix similarity index 100% rename from maddie/dunst.nix rename to maddie/nixos/dunst.nix diff --git a/maddie/dwm.nix b/maddie/nixos/dwm.nix similarity index 100% rename from maddie/dwm.nix rename to maddie/nixos/dwm.nix diff --git a/maddie/files.nix b/maddie/nixos/files.nix similarity index 100% rename from maddie/files.nix rename to maddie/nixos/files.nix diff --git a/maddie/games.nix b/maddie/nixos/games.nix similarity index 100% rename from maddie/games.nix rename to maddie/nixos/games.nix diff --git a/maddie/gtk.nix b/maddie/nixos/gtk.nix similarity index 100% rename from maddie/gtk.nix rename to maddie/nixos/gtk.nix diff --git a/maddie/home.nix b/maddie/nixos/home.nix similarity index 100% rename from maddie/home.nix rename to maddie/nixos/home.nix diff --git a/maddie/kdeconnect.nix b/maddie/nixos/kdeconnect.nix similarity index 100% rename from maddie/kdeconnect.nix rename to maddie/nixos/kdeconnect.nix diff --git a/maddie/minecraft.nix b/maddie/nixos/minecraft.nix similarity index 100% rename from maddie/minecraft.nix rename to maddie/nixos/minecraft.nix diff --git a/maddie/mpd.nix b/maddie/nixos/mpd.nix similarity index 100% rename from maddie/mpd.nix rename to maddie/nixos/mpd.nix diff --git a/maddie/nsxiv.nix b/maddie/nixos/nsxiv.nix similarity index 100% rename from maddie/nsxiv.nix rename to maddie/nixos/nsxiv.nix diff --git a/maddie/nsxiv/exec/key-handler b/maddie/nixos/nsxiv/exec/key-handler similarity index 100% rename from maddie/nsxiv/exec/key-handler rename to maddie/nixos/nsxiv/exec/key-handler diff --git a/maddie/office.nix b/maddie/nixos/office.nix similarity index 100% rename from maddie/office.nix rename to maddie/nixos/office.nix diff --git a/maddie/openrgb.nix b/maddie/nixos/openrgb.nix similarity index 100% rename from maddie/openrgb.nix rename to maddie/nixos/openrgb.nix diff --git a/maddie/pcmanfm.nix b/maddie/nixos/pcmanfm.nix similarity index 100% rename from maddie/pcmanfm.nix rename to maddie/nixos/pcmanfm.nix diff --git a/maddie/pcmanfm/default/pcmanfm.conf b/maddie/nixos/pcmanfm/default/pcmanfm.conf similarity index 100% rename from maddie/pcmanfm/default/pcmanfm.conf rename to maddie/nixos/pcmanfm/default/pcmanfm.conf diff --git a/maddie/picom.nix b/maddie/nixos/picom.nix similarity index 100% rename from maddie/picom.nix rename to maddie/nixos/picom.nix diff --git a/maddie/qt.nix b/maddie/nixos/qt.nix similarity index 100% rename from maddie/qt.nix rename to maddie/nixos/qt.nix diff --git a/maddie/screenshot.nix b/maddie/nixos/screenshot.nix similarity index 100% rename from maddie/screenshot.nix rename to maddie/nixos/screenshot.nix diff --git a/maddie/screenshot/sss.sh b/maddie/nixos/screenshot/sss.sh similarity index 100% rename from maddie/screenshot/sss.sh rename to maddie/nixos/screenshot/sss.sh diff --git a/maddie/slstatus.nix b/maddie/nixos/slstatus.nix similarity index 100% rename from maddie/slstatus.nix rename to maddie/nixos/slstatus.nix diff --git a/maddie/statusbar/sb-clock b/maddie/nixos/statusbar/sb-clock similarity index 100% rename from maddie/statusbar/sb-clock rename to maddie/nixos/statusbar/sb-clock diff --git a/maddie/statusbar/sb-cpu b/maddie/nixos/statusbar/sb-cpu similarity index 100% rename from maddie/statusbar/sb-cpu rename to maddie/nixos/statusbar/sb-cpu diff --git a/maddie/statusbar/sb-disk b/maddie/nixos/statusbar/sb-disk similarity index 100% rename from maddie/statusbar/sb-disk rename to maddie/nixos/statusbar/sb-disk diff --git a/maddie/statusbar/sb-forecast b/maddie/nixos/statusbar/sb-forecast similarity index 100% rename from maddie/statusbar/sb-forecast rename to maddie/nixos/statusbar/sb-forecast diff --git a/maddie/statusbar/sb-iplocate b/maddie/nixos/statusbar/sb-iplocate similarity index 100% rename from maddie/statusbar/sb-iplocate rename to maddie/nixos/statusbar/sb-iplocate diff --git a/maddie/statusbar/sb-kernel b/maddie/nixos/statusbar/sb-kernel similarity index 100% rename from maddie/statusbar/sb-kernel rename to maddie/nixos/statusbar/sb-kernel diff --git a/maddie/statusbar/sb-memory b/maddie/nixos/statusbar/sb-memory similarity index 100% rename from maddie/statusbar/sb-memory rename to maddie/nixos/statusbar/sb-memory diff --git a/maddie/statusbar/sb-temp b/maddie/nixos/statusbar/sb-temp similarity index 100% rename from maddie/statusbar/sb-temp rename to maddie/nixos/statusbar/sb-temp diff --git a/maddie/statusbar/sb-uptime b/maddie/nixos/statusbar/sb-uptime similarity index 100% rename from maddie/statusbar/sb-uptime rename to maddie/nixos/statusbar/sb-uptime diff --git a/maddie/statusbar/sb-volume b/maddie/nixos/statusbar/sb-volume similarity index 100% rename from maddie/statusbar/sb-volume rename to maddie/nixos/statusbar/sb-volume diff --git a/maddie/steam.nix b/maddie/nixos/steam.nix similarity index 100% rename from maddie/steam.nix rename to maddie/nixos/steam.nix diff --git a/maddie/steam/steam-killer.sh b/maddie/nixos/steam/steam-killer.sh similarity index 100% rename from maddie/steam/steam-killer.sh rename to maddie/nixos/steam/steam-killer.sh diff --git a/maddie/tabbed.nix b/maddie/nixos/tabbed.nix similarity index 100% rename from maddie/tabbed.nix rename to maddie/nixos/tabbed.nix diff --git a/maddie/tabbed/tabbed-st b/maddie/nixos/tabbed/tabbed-st similarity index 100% rename from maddie/tabbed/tabbed-st rename to maddie/nixos/tabbed/tabbed-st diff --git a/maddie/terminal.nix b/maddie/nixos/terminal.nix similarity index 100% rename from maddie/terminal.nix rename to maddie/nixos/terminal.nix diff --git a/maddie/virtualisation.nix b/maddie/nixos/virtualisation.nix similarity index 100% rename from maddie/virtualisation.nix rename to maddie/nixos/virtualisation.nix diff --git a/maddie/xdg.nix b/maddie/nixos/xdg.nix similarity index 100% rename from maddie/xdg.nix rename to maddie/nixos/xdg.nix diff --git a/maddie/xorg.nix b/maddie/nixos/xorg.nix similarity index 100% rename from maddie/xorg.nix rename to maddie/nixos/xorg.nix diff --git a/maddie/zathura.nix b/maddie/nixos/zathura.nix similarity index 100% rename from maddie/zathura.nix rename to maddie/nixos/zathura.nix diff --git a/maddie/obs-studio.nix b/maddie/obs-studio.nix deleted file mode 100644 index 07f8a87..0000000 --- a/maddie/obs-studio.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, ... }: - -{ - programs.obs-studio.enable = true; -} diff --git a/overlays.nix b/overlays.nix index a4e4b6f..e61ca03 100644 --- a/overlays.nix +++ b/overlays.nix @@ -56,7 +56,7 @@ clockSupport = false; }; nerdfonts = prev.nerdfonts.override { - fonts = [ "Iosevka" "Terminus" ]; + fonts = [ "Iosevka" "Terminus" "JetBrainsMono" ]; }; }) ] diff --git a/systems/desktop/packages.nix b/systems/desktop/packages.nix index 433fa1d..9919547 100644 --- a/systems/desktop/packages.nix +++ b/systems/desktop/packages.nix @@ -16,9 +16,6 @@ # Processes killall appimage-run - ani-cli - yt-dlp - mediainfo # Filesystems dosfstools diff --git a/systems/macbookpro/finder.nix b/systems/macbookpro/finder.nix new file mode 100644 index 0000000..7c4d987 --- /dev/null +++ b/systems/macbookpro/finder.nix @@ -0,0 +1,13 @@ +{ config, ... }: + +{ + system.defaults = { + finder = { + AppleShowAllExtensions = true; + QuitMenuItem = true; + ShowPathbar = true; + ShowStatusBar = true; + }; + NSGlobalDomain.AppleShowAllExtensions = true; + }; +} diff --git a/systems/macbookpro/fonts.nix b/systems/macbookpro/fonts.nix new file mode 100644 index 0000000..3ad636f --- /dev/null +++ b/systems/macbookpro/fonts.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + fonts.fonts = with pkgs; [ + font-awesome + nerdfonts + ]; + + fonts.fontDir.enable = true; +} diff --git a/systems/macbookpro/gpg.nix b/systems/macbookpro/gpg.nix new file mode 100644 index 0000000..238bdc5 --- /dev/null +++ b/systems/macbookpro/gpg.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + programs.gnupg.agent = { + enable = true; + }; + + environment.systemPackages = with pkgs; [ + gnupg + ]; +} diff --git a/systems/macbookpro/keyboard.nix b/systems/macbookpro/keyboard.nix new file mode 100644 index 0000000..08a8789 --- /dev/null +++ b/systems/macbookpro/keyboard.nix @@ -0,0 +1,13 @@ +{ config, ... }: + +{ + system.keyboard = { + enableKeyMapping = true; + remapCapsLockToEscape = true; + }; + + system.defaults.NSGlobalDomain = { + InitialKeyRepeat = 14; + KeyRepeat = 1; + }; +} diff --git a/systems/macbookpro/nix.nix b/systems/macbookpro/nix.nix new file mode 100644 index 0000000..88d721e --- /dev/null +++ b/systems/macbookpro/nix.nix @@ -0,0 +1,17 @@ +{ config, pkgs, ... }: + +{ + # Enable flakes and nix-command + nix = { + package = pkgs.nixVersions.stable; + settings = { + experimental-features = [ "nix-command" "flakes" ]; + auto-optimise-store = true; + }; + gc = { + automatic = true; + options = "--delete-older-than 7d"; + }; + }; + services.nix-daemon.enable = true; +} diff --git a/systems/macbookpro/packages.nix b/systems/macbookpro/packages.nix new file mode 100644 index 0000000..6881309 --- /dev/null +++ b/systems/macbookpro/packages.nix @@ -0,0 +1,25 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + # Processes + killall + + # Filesystems + dosfstools + + # Archives + zip + unzip + unrar + p7zip + + # Cli tools + wget + fzf + bat + + # Git + git + ]; +} diff --git a/systems/macbookpro/zsh.nix b/systems/macbookpro/zsh.nix new file mode 100644 index 0000000..2a5ba4c --- /dev/null +++ b/systems/macbookpro/zsh.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + programs.zsh = { + enable = true; + enableSyntaxHighlighting = true; + enableCompletion = true; + }; + environment.loginShell = pkgs.zsh; +}