Compare commits

..

No commits in common. "592f5dc0ef457b0e3861f14fed7ce45d448d6254" and "1e7db857a6d2143acf6ea16299feffe8c24d524a" have entirely different histories.

7 changed files with 21 additions and 91 deletions

View File

@ -104,22 +104,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -133,7 +117,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
@ -470,27 +454,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-matlab": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1737840943,
"narHash": "sha256-64j4mytkcPjd+k8KwDRzti/mc5cOJgY/LeOxbAykoag=",
"owner": "doronbehar",
"repo": "nix-matlab",
"rev": "4151ee1768ae1842f3505c0927eefbc977fcf046",
"type": "gitlab"
},
"original": {
"owner": "doronbehar",
"repo": "nix-matlab",
"type": "gitlab"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737469691, "lastModified": 1737469691,
@ -542,7 +505,7 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -613,7 +576,6 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-matlab": "nix-matlab",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
@ -627,7 +589,7 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",

View File

@ -13,10 +13,6 @@
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-matlab = {
url = "gitlab:doronbehar/nix-matlab";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -26,7 +22,6 @@
stylix, stylix,
nixvim, nixvim,
nur, nur,
nix-matlab,
... ...
}: }:
let let
@ -43,11 +38,6 @@
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
nur.modules.homeManager.default nur.modules.homeManager.default
{
nixpkgs.overlays = [
nix-matlab.overlay
];
}
]; ];
} }
]; ];

View File

@ -84,18 +84,6 @@ in
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
networking.useDHCP = true; networking.useDHCP = true;
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
networking.firewall.allowedTCPPortRanges = [
{
from = 10000;
to = 11000;
}
];
networking.firewall.allowedUDPPortRanges = [
{
from = 10000;
to = 11000;
}
];
# TODO: Move to USB module # TODO: Move to USB module
# services.gvfs.enable = true; # services.gvfs.enable = true;

View File

@ -19,6 +19,23 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
default.browser = mkIf cfg.default "org.qutebrowser.qutebrowser.desktop"; default.browser = mkIf cfg.default "org.qutebrowser.qutebrowser.desktop";
# TODO: Remove once nixpkgs updates
# nixpkgs.config.packageOverrides = pkgs: {
# python3 = pkgs.python3.override {
# packageOverrides = self: super: {
# pykeepass = super.pykeepass.overrideAttrs (attrs: {
# version = "4.1.0.post1";
# src = pkgs.fetchFromGitHub {
# owner = "libkeepass";
# repo = "pykeepass";
# rev = "refs/tags/v4.1.0.post1";
# hash = "sha256-64is/XoRF/kojqd4jQIAQi1od8TRhiv9uR+WNIGvP2A=";
# };
# });
# };
# };
# };
programs.qutebrowser = { programs.qutebrowser = {
enable = true; enable = true;

View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./ide/matlab.nix # Import systemwide configuration files.
./utilities/docker.nix ./utilities/docker.nix
]; ];
} }

View File

@ -1,26 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib;
let
cfg = config.modules.matlab;
in
{
options.modules.matlab = {
enable = mkEnableOption "matlab";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [
matlab
];
home.sessionVariables = {
_JAVA_AWT_WM_NONREPARENTING = "1";
};
};
}

View File

@ -88,7 +88,6 @@
neovim.enable = true; neovim.enable = true;
vscode.enable = true; vscode.enable = true;
docker.enable = true; docker.enable = true;
matlab.enable = true;
# Languages # Languages
haskell.enable = false; haskell.enable = false;