diff options
| -rw-r--r-- | flake.lock | 137 | ||||
| -rw-r--r-- | flake.nix | 23 | ||||
| -rw-r--r-- | ivi/ivi.nix | 12 | ||||
| -rw-r--r-- | machines/work.nix | 34 | ||||
| -rw-r--r-- | mut/neovim/init.lua | 2 | ||||
| -rw-r--r-- | profiles/core/configuration.nix | 24 | ||||
| -rw-r--r-- | profiles/core/hm.nix | 6 | ||||
| -rw-r--r-- | profiles/core/home.nix | 39 | ||||
| -rw-r--r-- | profiles/station/mpv.nix | 4 | ||||
| -rw-r--r-- | profiles/station/music.nix | 34 | ||||
| -rw-r--r-- | profiles/station/nonfree.nix | 23 | ||||
| -rw-r--r-- | profiles/station/packages.nix | 83 | ||||
| -rw-r--r-- | profiles/station/suckless.nix | 12 | ||||
| -rw-r--r-- | profiles/station/virtualisation.nix | 24 | ||||
| -rw-r--r-- | secrets/porkbun | 2 |
15 files changed, 253 insertions, 206 deletions
@@ -23,11 +23,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1698921442, - "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=", + "lastModified": 1704875591, + "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "660180bbbeae7d60dad5a92b30858306945fd427", + "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -164,14 +164,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", + "lastModified": 1704029560, + "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", + "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1702079131, - "narHash": "sha256-N2ROd7RWOaM+tJXnA/FG4LVm2g5a9ZivuJySgjXeHtY=", + "lastModified": 1706140641, + "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", "owner": "neovim", "repo": "neovim", - "rev": "f45bf44176461992e7ed7c381aa9750e8955517f", + "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1702080282, - "narHash": "sha256-0UsaopYnkMC8I4dkWj8o/EqHeOFCW0FfiDFfiIWS2dw=", + "lastModified": 1706141075, + "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3fdcc32da91e0fc560ba3cfdcee205e285d90df0", + "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", "type": "github" }, "original": { @@ -268,13 +268,33 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1702272962, + "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", "type": "github" }, "original": { @@ -316,11 +336,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701568804, - "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "type": "github" }, "original": { @@ -332,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701693815, - "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=", + "lastModified": 1706006310, + "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573", + "rev": "b43bb235efeab5324c5e486882ef46749188eee2", "type": "github" }, "original": { @@ -348,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -379,11 +399,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -399,6 +419,7 @@ "dns": "dns", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_3", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -434,11 +455,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701728052, - "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", + "lastModified": 1707015547, + "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", + "rev": "23f61b897c00b66855074db471ba016e0cda20dd", "type": "github" }, "original": { @@ -462,13 +483,31 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -16,6 +16,9 @@ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + + nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ @@ -64,6 +67,26 @@ iso = (mkSystem { modules = [./iso.nix]; } []); }; + darwinConfigurations."work" = let + machine = ivi.machines."work"; + system = "aarch64-darwin"; + pkgs = import nixpkgs {inherit system;}; + lib = (nixpkgs.lib.extend (_: _: home-manager.lib)).extend (import ./ivi self); + in + inputs.nix-darwin.lib.darwinSystem + { + inherit lib system; + specialArgs = {inherit self machine inputs;}; + modules = [ + ./machines/work.nix + ] ++ (attrValues (modulesIn ./profiles/core)) ++ (attrValues (modulesIn ./profiles/station)) + ++ [({ config, ... }: { + nixpkgs.overlays = with lib; [(composeManyExtensions [ + (import ./overlays/vimPlugins.nix {inherit pkgs;}) + inputs.neovim-nightly-overlay.overlay + ])];}) + ]; }; + deploy.nodes = mapAttrs (hostname: machine: { diff --git a/ivi/ivi.nix b/ivi/ivi.nix index d5a4fc7..973992d 100644 --- a/ivi/ivi.nix +++ b/ivi/ivi.nix @@ -48,6 +48,11 @@ self: lib: with lib; let type = bool; default = false; }; + isDarwin = mkOption { + description = "The machine is a fake machine"; + type = bool; + default = false; + }; tailnet = mkOption { type = with types; attrsOf (submodule ({ name, config, ... }: { freeformType = attrs; @@ -92,6 +97,13 @@ self: lib: with lib; let ]; machines = { + work = { + isFake = true; + isDarwin = true; + profiles = [ + "core" + ]; + }; wsl = { isFake = true; profiles = [ diff --git a/machines/work.nix b/machines/work.nix new file mode 100644 index 0000000..c987b79 --- /dev/null +++ b/machines/work.nix @@ -0,0 +1,34 @@ +{ self, pkgs, ... }: { + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = + [ pkgs.vim + pkgs.podman + pkgs.qemu + ]; + + services.tailscale.enable = true; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + # nix.package = pkgs.nix; + + # Necessary for using flakes on this system. + nix.settings.experimental-features = "nix-command flakes"; + + nix.extraOptions = ''extra-platforms = x86_64-darwin aarch64-darwin ''; + + # Create /etc/zshrc that loads the nix-darwin environment. + programs.zsh.enable = true; # default shell on catalina + # programs.fish.enable = true; + + # Set Git commit hash for darwin-version. + system.configurationRevision = self.rev or self.dirtyRev or null; + + # Used for backwards compatibility, please read the changelog before changing. + # $ darwin-rebuild changelog + system.stateVersion = 4; + + # The platform the configuration will be used on. + nixpkgs.hostPlatform = "aarch64-darwin"; +} diff --git a/mut/neovim/init.lua b/mut/neovim/init.lua index bf643df..aaa1260 100644 --- a/mut/neovim/init.lua +++ b/mut/neovim/init.lua @@ -1 +1 @@ -return require("conf")
\ No newline at end of file +return require("conf") diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index be03f3c..87403eb 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -6,35 +6,18 @@ }: with lib; { imports = [ (mkAliasOptionModule [ "ivi" ] [ "users" "users" ivi.username ]) ]; - services.resolved.fallbackDns = [ - "1.1.1.1#one.one.one.one" - "1.0.0.1#one.one.one.one" - "2606:4700:4700::1111#one.one.one.one" - "2606:4700:4700::1001#one.one.one.one" - ]; time.timeZone = "Europe/Amsterdam"; users.users = { ${ivi.username} = { + home = "/Users/ivi"; uid = 1000; - isNormalUser = true; description = ivi.realName; - extraGroups = ["wheel" "networkmanager" "docker" "transmission"]; openssh.authorizedKeys.keys = ivi.sshKeys; }; root = { openssh.authorizedKeys.keys = config.ivi.openssh.authorizedKeys.keys; }; }; - security = { - sudo = { - wheelNeedsPassword = false; - extraConfig = '' - Defaults env_keep+="EDITOR" - Defaults env_keep+="SSH_CONNECTION SSH_CLIENT SSH_TTY" - Defaults env_keep+="http_proxy https_proxy" - ''; - }; - }; environment.systemPackages = with pkgs; [ man-pages man-pages-posix @@ -53,11 +36,6 @@ pinentry-curses gnused gnutls - pciutils - dnsutils - iputils - inetutils - usbutils zoxide binwalk unzip diff --git a/profiles/core/hm.nix b/profiles/core/hm.nix index 2d3d085..9e5174d 100644 --- a/profiles/core/hm.nix +++ b/profiles/core/hm.nix @@ -1,11 +1,9 @@ {inputs, config, lib, ...}: with lib; { imports = [ - inputs.home-manager.nixosModules.default + inputs.home-manager.darwinModules.default (mkAliasOptionModule [ "hm" ] [ "home-manager" "users" ivi.username ]) ]; - system.extraDependencies = collectFlakeInputs inputs.home-manager; - home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -14,7 +12,7 @@ }; hm = { - home.stateVersion = config.system.stateVersion; + home.stateVersion = "24.05"; home.enableNixpkgsReleaseCheck = false; systemd.user.startServices = "sd-switch"; diff --git a/profiles/core/home.nix b/profiles/core/home.nix index 3e27540..5a659ae 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -4,44 +4,15 @@ ... }: { hm = { + home.packages = with pkgs; [ + github-cli + ]; fonts.fontconfig.enable = true; # https://github.com/nix-community/home-manager/issues/4692 # home.file.".local/bin".source = config.lib.meta.mkMutableSymlink /mut/bin; xdg = { enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "text/x-shellscript" = ["text.desktop"]; - "application/x-bittorrent" = ["torrent.desktop"]; - "text/plain" = ["text.desktop"]; - "application/postscript" = ["pdf.desktop"]; - "application/pdf" = ["pdf.desktop"]; - "image/png" = ["img.desktop"]; - "image/jpeg" = ["img.desktop"]; - "image/gif" = ["img.desktop"]; - "application/rss+xml" = ["rss.desktop"]; - "video/x-matroska" = ["video.desktop"]; - "video/mp4" = ["video.desktop"]; - "x-scheme-handler/lbry" = ["lbry.desktop"]; - "inode/directory" = ["file.desktop"]; - "application/x-ica" = ["wfica.desktop"]; - "x-scheme-handler/magnet" = ["torrent.desktop"]; - "x-scheme-handler/mailto" = ["mail.desktop"]; - "x-scheme-handler/msteams" = ["teams.desktop"]; - }; - }; - mime.enable = true; - desktopEntries = { - text= { type = "Application"; name = "Text editor"; exec = "${pkgs.st}/bin/st -e kak %u"; }; - file = { type = "Application"; name = "File Manager"; exec = "${pkgs.st}/bin/st -e lfub %u"; }; - torrent = { type = "Application"; name = "Torrent"; exec = "${pkgs.coreutils}/bin/env transadd %U"; }; - img = { type = "Application"; name = "Image Viewer"; exec = "${pkgs.sxiv}/bin/sxiv -a %u"; }; - video = { type = "Application"; name = "Video Viewer"; exec = "${pkgs.mpv}/bin/mpv -quiet %f"; }; - mail = { type = "Application"; name = "Mail"; exec = "${pkgs.st}/bin/st -e neomutt %u"; }; - pdf = { type = "Application"; name = "PDF reader"; exec = "${pkgs.zathura}/bin/zathura %u"; }; - rss = { type = "Application"; name = "RSS feed addition"; exec = "${pkgs.coreutils}/bin/env rssadd %u"; }; - }; + mime.enable = false; }; programs.ssh = { @@ -184,7 +155,7 @@ }; }; services.gpg-agent = { - enable = true; + enable = false; enableSshSupport = true; defaultCacheTtl = 34550000; maxCacheTtl = 34550000; diff --git a/profiles/station/mpv.nix b/profiles/station/mpv.nix index b5a9fce..71b152c 100644 --- a/profiles/station/mpv.nix +++ b/profiles/station/mpv.nix @@ -1,13 +1,11 @@ { - flake, - config, pkgs, ... }: { hm = { programs.mpv = { - enable = true; + enable = false; scripts = [ (with pkgs; stdenv.mkDerivation rec { pname = "mpv-sockets"; diff --git a/profiles/station/music.nix b/profiles/station/music.nix index b26a2ee..9ab9327 100644 --- a/profiles/station/music.nix +++ b/profiles/station/music.nix @@ -1,21 +1,21 @@ { config, pkgs, lib, ... }: { - secrets.mopidy.owner = lib.ivi.username; - hm.home.packages = [pkgs.mpc-cli]; - hm.services.mopidy = { - enable = true; - extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd]; - settings = { - mpd = { - enabled = true; - hostname = "127.0.0.1"; - port = 6600; - max_connections = 20; - connection_timeout = 60; - };}; - extraConfigFiles = [ - config.secrets.mopidy.path - ]; - }; + # secrets.mopidy.owner = lib.ivi.username; + # hm.home.packages = [pkgs.mpc-cli]; + # hm.services.mopidy = { + # enable = true; + # extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd]; + # settings = { + # mpd = { + # enabled = true; + # hostname = "127.0.0.1"; + # port = 6600; + # max_connections = 20; + # connection_timeout = 60; + # };}; + # extraConfigFiles = [ + # config.secrets.mopidy.path + # ]; + # }; hm.programs.ncmpcpp = { enable = true; bindings = [ diff --git a/profiles/station/nonfree.nix b/profiles/station/nonfree.nix index cd6f5fc..8bee42a 100644 --- a/profiles/station/nonfree.nix +++ b/profiles/station/nonfree.nix @@ -1,16 +1,13 @@ -{config, pkgs, lib, ...}: { +{pkgs, lib, ...}: { hm.home.packages = with pkgs; [ - (discord.override { - withVencord = true; - }) + teams + discord slack - discord-ptb - discord-canary - citrix_workspace ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ # Add additional package names here + "teams-1.6.00.4464" "discord" "discord-ptb" "discord-canary" @@ -21,10 +18,10 @@ "steam-run" ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - }; - hardware.opengl.driSupport32Bit = true; + # programs.steam = { + # enable = true; + # remotePlay.openFirewall = true; + # dedicatedServer.openFirewall = true; + # }; + # hardware.opengl.driSupport32Bit = true; } diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix index 7f5b5ef..c9d1af8 100644 --- a/profiles/station/packages.nix +++ b/profiles/station/packages.nix @@ -1,53 +1,50 @@ { - flake, - config, pkgs, ... }: { hm = { home.packages = with pkgs; [ - krew - dasel - initool - python311Packages.editorconfig - gcc - pkgsi686Linux.glibc - gnumake - raylib - gdb - maim - calcurse - profanity - file - ueberzug - mypaint - lynx - pstree - pywal - bashInteractive k9s - powershell - azure-cli - inotify-tools - alejandra - statix - github-cli - lazygit - argocd - bc - sxiv - nushell - sent - (nerdfonts.override {fonts = ["FiraCode"];}) - noto-fonts - noto-fonts-emoji - docker - k9s - dmenu - librewolf - firefox-wayland - xclip - libreoffice + # krew + # dasel + # # initool + # python311Packages.editorconfig + # gcc + # # pkgsi686Linux.glibc + # gnumake + # raylib + # # gdb + # maim + # calcurse + # profanity + # file + # ueberzug + # mypaint + # lynx + # pstree + # pywal + # bashInteractive + # k9s + # powershell + # azure-cli + # inotify-tools + # alejandra + # statix + # github-cli + # lazygit + # argocd + # bc + # # sxiv + # nushell + # # sent + # (nerdfonts.override {fonts = ["FiraCode"];}) + # noto-fonts + # noto-fonts-emoji + # # dmenu + # # librewolf + # # firefox-wayland + # # libreoffice + # # xclip ]; }; } diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix index 8986e6d..f0742c4 100644 --- a/profiles/station/suckless.nix +++ b/profiles/station/suckless.nix @@ -8,7 +8,7 @@ nixpkgs.overlays = [(import (self + "/overlays/suckless.nix") {inherit pkgs; home = config.ivi.home;})]; hm = { xsession = { - enable = true; + enable = false; initExtra = '' ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R" ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R" @@ -18,7 +18,7 @@ ''; }; services.picom = { - enable = true; + enable = false; activeOpacity = 0.99; inactiveOpacity = 0.7; opacityRules = [ @@ -37,7 +37,7 @@ }; }; services.dunst = { - enable = true; + enable = false; settings = { global = { monitor = 0; @@ -70,9 +70,9 @@ }; }; home.packages = with pkgs; [ - st - dwm - dwmblocks + # st + # dwm + # dwmblocks libnotify ]; }; diff --git a/profiles/station/virtualisation.nix b/profiles/station/virtualisation.nix index 63dd746..4e9425e 100644 --- a/profiles/station/virtualisation.nix +++ b/profiles/station/virtualisation.nix @@ -1,14 +1,14 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - virt-viewer - ]; - virtualisation.libvirtd.enable = true; - programs.virt-manager.enable = true; - hm.dconf.settings = { - "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; - }; - }; - ivi.extraGroups = [ "libvirtd" ]; + # environment.systemPackages = with pkgs; [ + # virt-viewer + # ]; + # virtualisation.libvirtd.enable = true; + # programs.virt-manager.enable = true; + # hm.dconf.settings = { + # "org/virt-manager/virt-manager/connections" = { + # autoconnect = ["qemu:///system"]; + # uris = ["qemu:///system"]; + # }; + # }; + # ivi.extraGroups = [ "libvirtd" ]; } diff --git a/secrets/porkbun b/secrets/porkbun index 552523c..07fc4ec 100644 --- a/secrets/porkbun +++ b/secrets/porkbun @@ -25,4 +25,4 @@ "unencrypted_suffix": "_unencrypted", "version": "3.8.1" } -}
\ No newline at end of file +} |