diff options
Diffstat (limited to 'profiles/core')
| -rw-r--r-- | profiles/core/configuration.nix | 24 | ||||
| -rw-r--r-- | profiles/core/hm.nix | 6 | ||||
| -rw-r--r-- | profiles/core/home.nix | 39 |
3 files changed, 8 insertions, 61 deletions
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; |