1 Commits

Author SHA1 Message Date
8ab86428ec attempt to use pkgs for unfree predicate
still not working
2023-03-10 21:22:07 -05:00
29 changed files with 121 additions and 305 deletions

132
flake.lock generated
View File

@ -3,11 +3,11 @@
"Comment-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1678452935,
"narHash": "sha256-mVJJJ9fUJYgVyGZnW8e6P5QWB0K8nuhTwSWzlBvxv2M=",
"lastModified": 1674040818,
"narHash": "sha256-7UtZAE9tPlnpeHS2LLol/LGVOxptDXNKWXHNHvFBNk4=",
"owner": "numToStr",
"repo": "Comment.nvim",
"rev": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20",
"rev": "eab2c83a0207369900e92783f56990808082eac2",
"type": "github"
},
"original": {
@ -19,11 +19,11 @@
"bufferline-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1677796018,
"narHash": "sha256-tuGitJQ2eXB9/SIHAyPrEVgy2n++GOlBOPLvFv3Ds4E=",
"lastModified": 1676130961,
"narHash": "sha256-3LT45i0eSMfUV9EBrtdtzHxFKRATIhRy/faDd3lI3mA=",
"owner": "akinsho",
"repo": "bufferline.nvim",
"rev": "3677aceb9a72630b0613e56516c8f7151b86f95c",
"rev": "84b0822b2af478d0b4f7b0f9249ca218855331db",
"type": "github"
},
"original": {
@ -76,11 +76,11 @@
]
},
"locked": {
"lastModified": 1678912468,
"narHash": "sha256-oUo6ZrsuqymuMLLvGfgnQ464OMKnUONv+ryea07iGrE=",
"lastModified": 1677116397,
"narHash": "sha256-2OHwhv4k1SDEuNxhq+zluvrd5pbW8d4TP9NKW4B8iO8=",
"owner": "nix-community",
"repo": "disko",
"rev": "e8650fc36bf9d2acb411ba0047f863b8e481e3bb",
"rev": "8fddb2fd721365fa77ff68b709539639d4dc65d7",
"type": "github"
},
"original": {
@ -94,11 +94,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1679446046,
"narHash": "sha256-CBjVE3Sj7Ls1pffxGavqPXRkaLYy1+O88NzBwNdgNcY=",
"lastModified": 1676854489,
"narHash": "sha256-hWmx3JFLNPGMtflyjgEn5GZydbLW3msjXvarS1NsBDM=",
"owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin",
"rev": "1531f1477881e76c67b123a55f3d44ed7f83a4ba",
"rev": "6a5cca0ea8dfab4718e1e43e243c80ba110c2364",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -155,11 +155,11 @@
},
"flake-utils_3": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -176,11 +176,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1679067095,
"narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=",
"lastModified": 1678271387,
"narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370",
"rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1678728829,
"narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=",
"lastModified": 1676110678,
"narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=",
"owner": "oxalica",
"repo": "nil",
"rev": "e7045f1779fd202a3316f84b864c304f339cccea",
"rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28",
"type": "github"
},
"original": {
@ -233,11 +233,11 @@
},
"nixlib": {
"locked": {
"lastModified": 1677373009,
"narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=",
"lastModified": 1636849918,
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea",
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
"type": "github"
},
"original": {
@ -254,11 +254,11 @@
]
},
"locked": {
"lastModified": 1678351966,
"narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=",
"lastModified": 1674666581,
"narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "0c043999b16caba6fb571af2d228775729829943",
"rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
"type": "github"
},
"original": {
@ -285,11 +285,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678298120,
"narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=",
"lastModified": 1675309347,
"narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1e383aada51b416c6c27d4884d2e258df201bc11",
"rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5",
"type": "github"
},
"original": {
@ -301,11 +301,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1679262748,
"narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
"lastModified": 1676885936,
"narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
"rev": "b69883faca9542d135fa6bab7928ff1b233c167f",
"type": "github"
},
"original": {
@ -317,11 +317,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1677779205,
"narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=",
"lastModified": 1674868155,
"narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
"rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
"type": "github"
},
"original": {
@ -334,11 +334,11 @@
"null-ls-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1679325581,
"narHash": "sha256-ixhy8qgP2GEPqrMdI+GsHzeHxESwhRw6cjf5hcpwP1w=",
"lastModified": 1676246878,
"narHash": "sha256-hAUEa2zNsYXQ+TsHYHBzcW67lCxhiD7x+uPbdOZwY8o=",
"owner": "jose-elias-alvarez",
"repo": "null-ls.nvim",
"rev": "13dd1fc13063681ca7e039436c88f6eca7e3e937",
"rev": "d4594231a06cecce73a78a256b0d7c7ab51f7dd5",
"type": "github"
},
"original": {
@ -349,11 +349,11 @@
},
"nur": {
"locked": {
"lastModified": 1679482366,
"narHash": "sha256-88K2ABCsdsVwq6Go/uEn/fds1fUeeeoixOALjrrUI0Q=",
"lastModified": 1676251563,
"narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
"owner": "nix-community",
"repo": "nur",
"rev": "e9088dc6f9f289fbff984744ad04dccbd5c1f8ac",
"rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
"type": "github"
},
"original": {
@ -365,11 +365,11 @@
"nvim-lspconfig-src": {
"flake": false,
"locked": {
"lastModified": 1679319980,
"narHash": "sha256-UQ/Zng1/9rXRnQeAjemA21qfCltmZRq9QekQ0vGYlX8=",
"lastModified": 1676175675,
"narHash": "sha256-Wg3NatT4DRBMF6hCxK4C2DC+geFMpfFUFogPbqeMt6E=",
"owner": "neovim",
"repo": "nvim-lspconfig",
"rev": "0f94c5fded29c0024254259f3d8a0284bfb507ea",
"rev": "1712672e4da3003a0dd9f771d30389600b360f42",
"type": "github"
},
"original": {
@ -381,11 +381,11 @@
"nvim-tree-lua-src": {
"flake": false,
"locked": {
"lastModified": 1678748807,
"narHash": "sha256-u9ZLBL4FY/bkvl4+ofKifyEHM9+KhqeYovhr9VQYG7c=",
"lastModified": 1676244722,
"narHash": "sha256-xoSekdZhWr59qTOM0/ihYiuKiwHiKYb42Ep5JHn65UM=",
"owner": "kyazdani42",
"repo": "nvim-tree.lua",
"rev": "1d79a64a88af47ddbb55f4805ab537d11d5b908e",
"rev": "ba1778e061f25814bc5940be886a7f41d7d7736e",
"type": "github"
},
"original": {
@ -397,11 +397,11 @@
"nvim-treesitter-src": {
"flake": false,
"locked": {
"lastModified": 1679482116,
"narHash": "sha256-SofmIKv/zGsocOBEbmzOraTE0GuLDjrJB2gZhKCz8ok=",
"lastModified": 1676240774,
"narHash": "sha256-eRSU/9ysSvTyYxBrp9Whg0eXgAOsCdmIHMlYZK7bjRg=",
"owner": "nvim-treesitter",
"repo": "nvim-treesitter",
"rev": "dbdbd71b41a3627e0f2784eff746ad4366e2a21c",
"rev": "7eb5f1a2e3949496f26c4084b521b30f2d08137a",
"type": "github"
},
"original": {
@ -447,11 +447,11 @@
]
},
"locked": {
"lastModified": 1678415622,
"narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
"lastModified": 1675391458,
"narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
"rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
"type": "github"
},
"original": {
@ -463,11 +463,11 @@
"telescope-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1677414372,
"narHash": "sha256-QmyVJ/LZFtb/qqD5Q5fHsqAGgqaOT9XkVoLyOcqM14w=",
"lastModified": 1675149856,
"narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=",
"owner": "nvim-telescope",
"repo": "telescope.nvim",
"rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2",
"rev": "203bf5609137600d73e8ed82703d6b0e320a5f36",
"type": "github"
},
"original": {
@ -495,11 +495,11 @@
"toggleterm-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1678645191,
"narHash": "sha256-nK9eUHeFjZtUPC4cOCILg7J54rDHGI52AIXX5j7E4rE=",
"lastModified": 1675358836,
"narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=",
"owner": "akinsho",
"repo": "toggleterm.nvim",
"rev": "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0",
"rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e",
"type": "github"
},
"original": {
@ -546,11 +546,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1678648312,
"narHash": "sha256-aY3CBNyenTUkStQhwigm30+BjXQyA8rCChGD+Z98qqE=",
"lastModified": 1676126384,
"narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "c6f663e8583912059605b55c07583b6e96b5e690",
"rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
"type": "github"
},
"original": {

View File

@ -111,8 +111,6 @@
gitName = fullName;
gitEmail = "7386960+nmasur@users.noreply.github.com";
mail.server = "noahmasur.com";
mail.imapHost = "imap.purelymail.com";
mail.smtpHost = "smtp.purelymail.com";
dotfilesRepo = "git@github.com:nmasur/dotfiles";
};
@ -201,8 +199,6 @@
buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
};
test = pkgs.mkShell { buildInputs = with pkgs; [ age ]; };
# Used for cloud and systems development and administration
devops = pkgs.mkShell {
buildInputs = with pkgs; [

View File

@ -12,7 +12,7 @@ nixpkgs.lib.nixosSystem {
./hardware-configuration.nix
../../modules/common
../../modules/nixos
globals
(removeAttrs globals [ "mail.server" ])
wsl.nixosModules.wsl
home-manager.nixosModules.home-manager
disko.nixosModules.disko
@ -42,7 +42,6 @@ nixpkgs.lib.nixosSystem {
streamServer = "stream.masu.rs";
nextcloudServer = "cloud.masu.rs";
bookServer = "books.masu.rs";
arrServer = "download.masu.rs";
samba.enable = true;
backup.s3 = {

View File

@ -37,20 +37,4 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.fancontrol.enable = true;
hardware.fancontrol.config = ''
# Configuration file generated by pwmconfig, changes will be lost
INTERVAL=10
DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
DEVNAME=hwmon0=amdgpu
FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
FCFANS= hwmon0/pwm1=hwmon0/fan1_input
MINTEMP=hwmon0/pwm1=50
MAXTEMP=hwmon0/pwm1=70
MINSTART=hwmon0/pwm1=100
MINSTOP=hwmon0/pwm1=10
MINPWM=hwmon0/pwm1=10
MAXPWM=hwmon0/pwm1=240
'';
}

View File

@ -11,7 +11,7 @@
config = lib.mkIf
(config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
unfreePackages = [ "1password" "_1password-gui" ];
unfreePackages = with pkgs; [ _1password _1password-gui ];
home-manager.users.${config.user} = {
home.packages = with pkgs; [ _1password-gui ];
};

View File

@ -10,7 +10,7 @@
};
config = lib.mkIf (config.gui.enable && config.discord.enable) {
unfreePackages = [ "discord" ];
unfreePackages = [ pkgs.discord ];
home-manager.users.${config.user} = {
home.packages = with pkgs; [ discord ];
xdg.configFile."discord/settings.json".text = ''

View File

@ -13,9 +13,9 @@
config = lib.mkIf (config.gui.enable && config.firefox.enable) {
unfreePackages = [
(lib.mkIf config._1password.enable "onepassword-password-manager")
"okta-browser-plugin"
unfreePackages = with pkgs.nur.repos.rycee.firefox-addons; [
(lib.mkIf config._1password.enable onepassword-password-manager)
okta-browser-plugin
];
home-manager.users.${config.user} = {

View File

@ -10,24 +10,9 @@
};
config = lib.mkIf (config.gui.enable && config.kitty.enable) {
# Set the Rofi-Systemd terminal for viewing logs
# Using optionalAttrs because only available in NixOS
environment = { } // lib.attrsets.optionalAttrs
(builtins.hasAttr "sessionVariables" config.environment) {
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
};
home-manager.users.${config.user} = {
# Set the i3 terminal
xsession.windowManager.i3.config.terminal =
lib.mkIf pkgs.stdenv.isLinux "kitty";
# Set the Rofi terminal for running programs
programs.rofi.terminal =
lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
# xsession.windowManager.i3.config.terminal = "kitty";
# programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
programs.kitty = {
enable = true;
environment = { };

View File

@ -12,29 +12,22 @@
config = lib.mkIf (config.gui.enable && config.media.enable) {
home-manager.users.${config.user} = {
home.packages = with pkgs; [
nsxiv # Image viewer
mpv # Video viewer
sxiv # Image viewer
mupdf # PDF viewer
zathura # PDF viewer
];
# Video player
programs.mpv = {
enable = true;
bindings = { };
config = { image-display-duration = 2; };
scripts = [ pkgs.mpvScripts.autoload ];
};
# Set default for opening PDFs
xdg.mimeApps = {
associations.added = {
"application/pdf" = [ "pwmt.zathura-cb.desktop" ];
"image/*" = [ "nsxiv.desktop" ];
"image/*" = [ "sxiv.desktop" ];
};
associations.removed = { "application/pdf" = [ "mupdf.desktop" ]; };
defaultApplications = {
"application/pdf" = [ "pwmt.zathura-cb.desktop" ];
"image/*" = [ "nsxiv.desktop" ];
"image/*" = [ "sxiv.desktop" ];
};
};

View File

@ -10,7 +10,7 @@
};
config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
unfreePackages = [ "obsidian" ];
unfreePackages = [ pkgs.obsidian ];
home-manager.users.${config.user} = {
home.packages = with pkgs; [ obsidian ];
};

View File

@ -10,7 +10,7 @@
};
config = lib.mkIf (config.gui.enable && config.slack.enable) {
unfreePackages = [ "slack" ];
unfreePackages = [ pkgs.slack ];
home-manager.users.${config.user} = {
home.packages = with pkgs; [ slack ];
};

View File

@ -44,6 +44,11 @@
default = true;
};
};
# colorscheme = lib.mkOption {
# type = types.attrs;
# description = "Base16 color scheme";
# };
homePath = lib.mkOption {
type = lib.types.path;
description = "Path of user's home directory.";
@ -52,6 +57,7 @@
else
"/home/${config.user}");
};
dotfilesPath = lib.mkOption {
type = lib.types.path;
description = "Path of dotfiles repository.";
@ -62,7 +68,7 @@
description = "Link to dotfiles repository.";
};
unfreePackages = lib.mkOption {
type = lib.types.listOf lib.types.str;
type = lib.types.listOf lib.types.package;
description = "List of unfree packages to allow.";
default = [ ];
};
@ -89,8 +95,7 @@
];
# Scans and hard links identical files in the store
# Not working with macOS: https://github.com/NixOS/nix/issues/7273
auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
auto-optimise-store = true;
};
@ -108,8 +113,10 @@
# Allow specified unfree packages (identified elsewhere)
# Retrieves package object based on string name
# Idea: https://discourse.nixos.org/t/how-to-use-packages-directly-in-allowunfreepredicate/22455/6
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) config.unfreePackages;
builtins.elem (pkg.name or (builtins.parseDrvName pkg.pname).name)
(map lib.getName config.unfreePackages);
# Pin a state version to prevent warnings
home-manager.users.${config.user}.home.stateVersion = stateVersion;

View File

@ -170,8 +170,6 @@
"${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
"application/pdf" = "${pkgs.zathura}/bin/zathura -";
"audio/*" = "${pkgs.mpv}/bin/mpv -";
"image/*" = "${pkgs.feh}/bin/feh -";
};
};
};
@ -183,17 +181,6 @@
};
};
xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
name = "aerc";
exec = "kitty aerc %u";
};
xsession.windowManager.i3.config.keybindings =
lib.mkIf pkgs.stdenv.isLinux {
"${
config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
}+Shift+e" = "exec --no-startup-id kitty aerc";
};
programs.fish.shellAbbrs = { ae = "aerc"; };
};

View File

@ -10,17 +10,9 @@
default = config.user;
};
mail.server = lib.mkOption {
type = lib.types.nullOr lib.types.str;
type = lib.types.str;
description = "Server name for the email address.";
};
mail.imapHost = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Server host for IMAP (reading mail).";
};
mail.smtpHost = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Server host for SMTP (sending mail).";
};
};
config = lib.mkIf config.mail.enable {
@ -50,7 +42,7 @@
folders = { };
getmail = { };
imap = {
host = config.mail.imapHost;
host = "imap.purelymail.com";
port = 993;
tls.enable = true;
};
@ -63,9 +55,9 @@
maildir = { path = "main"; };
mbsync = {
enable = true;
create = "both";
expunge = "both";
remove = "both";
create = "maildir";
expunge = "none";
remove = "none";
patterns = [ "*" ];
extraConfig.channel = {
CopyArrivalDate = "yes"; # Sync time of original message
@ -78,7 +70,7 @@
builtins.toString ../../../private/mailpass.age
}";
smtp = {
host = config.mail.smtpHost;
host = "smtp.purelymail.com";
port = 465;
tls.enable = true;
};

View File

@ -1,20 +0,0 @@
{ config, pkgs, lib, ... }: {
config = {
home-manager.users.${config.user} = {
programs.bash = {
enable = true;
shellAliases =
config.home-manager.users.${config.user}.programs.fish.shellAliases;
initExtra = "";
profileExtra = "";
};
programs.starship.enableBashIntegration = false;
programs.zoxide.enableBashIntegration = true;
programs.fzf.enableBashIntegration = true;
};
};
}

View File

@ -1,6 +1,5 @@
{ ... }: {
imports = [
./bash
./charm.nix
./direnv.nix
./fish

View File

@ -76,6 +76,7 @@
set -g fish_cursor_replace_one underscore
'';
loginShellInit = "";
shellAliases = { };
shellAbbrs = {
# Directory aliases

View File

@ -18,22 +18,21 @@ in {
home-manager.users.${config.user} = {
home.packages = with pkgs; [
age # Encryption
bc # Calculator
dig # DNS lookup
fd # find
htop # Show system processes
inetutils # Includes telnet, whois
jq # JSON manipulation
lf # File viewer
qrencode # Generate qr codes
unzip # Extract zips
rsync # Copy folders
ripgrep # grep
fd # find
sd # sed
jq # JSON manipulation
tealdeer # Cheatsheets
tree # View directory hierarchy
htop # Show system processes
qrencode # Generate qr codes
vimv-rs # Batch rename files
unzip # Extract zips
dig # DNS lookup
lf # File viewer
inetutils # Includes telnet, whois
age # Encryption
];
programs.zoxide.enable = true; # Shortcut jump command

View File

@ -90,7 +90,6 @@ function obj:init()
self:switch("System Preferences.app")
end)
self.launcher:bind("", "R", function()
hs.console.clearConsole()
hs.reload()
end)
self.launcher:bind("", "S", function()

View File

@ -10,8 +10,8 @@ in {
config = lib.mkIf config.gaming.legendary.enable {
environment.systemPackages = with pkgs; [
legendary-gl
rare # GUI for Legendary (not working)
wineWowPackages.stable # 32-bit and 64-bit wineWowPackages, see https://nixos.wiki/wiki/Wine
heroic # GUI launcher
];
home-manager.users.${config.user} = {

View File

@ -14,7 +14,7 @@ in {
config = lib.mkIf config.gaming.minecraft-server.enable {
unfreePackages = [ "minecraft-server" ];
unfreePackages = [ pkgs.minecraft-server ];
services.minecraft-server = {
enable = true;

View File

@ -4,7 +4,7 @@
config = lib.mkIf (config.gaming.steam.enable && pkgs.stdenv.isLinux) {
hardware.steam-hardware.enable = true;
unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
unfreePackages = with pkgs; [ steam steamcmd steam-run ];
programs.steam = {
enable = true;

View File

@ -4,10 +4,6 @@
config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
# Set the Rofi-Systemd terminal for viewing logs
environment.sessionVariables.ROFI_SYSTEMD_TERM =
lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
home-manager.users.${config.user} = {
home.packages = with pkgs;
@ -148,13 +144,9 @@
};
launcherCommand = "${
config.home-manager.users.${config.user}.programs.rofi.finalPackage
}/bin/rofi -show run -modi run";
launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run";
systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
altTabCommand = "${
config.home-manager.users.${config.user}.programs.rofi.finalPackage
}/bin/rofi -show window -modi window";
altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window";
};

View File

@ -1,22 +1,15 @@
{ config, ... }: {
{ ... }: {
config = {
services.xserver = {
services.xserver = {
layout = "us";
layout = "us";
# Keyboard responsiveness
autoRepeatDelay = 250;
autoRepeatInterval = 40;
# Keyboard responsiveness
autoRepeatDelay = 250;
autoRepeatInterval = 40;
# Swap escape key with caps lock key
xkbOptions = "eurosign:e,caps:swapescape";
};
# Enable num lock on login
home-manager.users.${config.user}.xsession.numlock.enable = true;
# Swap escape key with caps lock key
xkbOptions = "eurosign:e,caps:swapescape";
};

View File

@ -1,74 +0,0 @@
{ config, lib, ... }: {
options = {
arrServer = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Hostname for arr services";
default = null;
};
};
config = lib.mkIf (config.arrServer != null) {
services.sonarr.enable = true;
services.radarr.enable = true;
services.bazarr.enable = true;
services.prowlarr.enable = true;
# Grant users access to destination directories
users.users.sonarr.extraGroups = [ "jellyfin" ];
users.users.radarr.extraGroups = [ "jellyfin" ];
users.users.bazarr.extraGroups = [ "jellyfin" ];
# Requires updating the base_url config value in each service
# If you try to rewrite the URL, the service won't redirect properly
caddy.routes = [
{
group = "download";
match = [{
host = [ config.arrServer ];
path = [ "/sonarr*" ];
}];
handle = [{
handler = "reverse_proxy";
upstreams = [{ dial = "localhost:8989"; }];
}];
}
{
group = "download";
match = [{
host = [ config.arrServer ];
path = [ "/radarr*" ];
}];
handle = [{
handler = "reverse_proxy";
upstreams = [{ dial = "localhost:7878"; }];
}];
}
{
group = "download";
match = [{
host = [ config.arrServer ];
path = [ "/prowlarr*" ];
}];
handle = [{
handler = "reverse_proxy";
upstreams = [{ dial = "localhost:9696"; }];
}];
}
{
group = "download";
match = [{
host = [ config.arrServer ];
path = [ "/bazarr*" ];
}];
handle = [{
handler = "reverse_proxy";
upstreams = [{ dial = "localhost:6767"; }];
}];
}
];
};
}

View File

@ -24,16 +24,6 @@
listen = [ ":443" ];
routes = config.caddy.routes;
errors.routes = config.caddy.blocks;
# logs = { }; # Uncomment to collect access logs
};
logging.logs.main = {
encoder = { format = "console"; };
writer = {
output = "file";
filename = "${config.services.caddy.logDir}/caddy.log";
roll = true;
};
level = "INFO";
};
});

View File

@ -41,9 +41,6 @@ in {
}];
}];
# Grant user access to Calibre directories
users.users.${config.user}.extraGroups = [ "calibre-web" ];
# Run a backup on a schedule
systemd.timers.calibre-backup = lib.mkIf config.backups.calibre {
timerConfig = {

View File

@ -1,7 +1,6 @@
{ ... }: {
imports = [
./arr.nix
./backups.nix
./caddy.nix
./calibre.nix

View File

@ -41,9 +41,7 @@
};
# Create reverse proxy for web UI
caddy.routes = lib.mkAfter [{
group =
lib.mkIf (config.arrServer == config.transmissionServer) "download";
caddy.routes = [{
match = [{ host = [ config.transmissionServer ]; }];
handle = [{
handler = "reverse_proxy";