diff --git a/flake.lock b/flake.lock index a0574db..12a7dcc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,56 @@ { "nodes": { + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1681270840, + "narHash": "sha256-xYULk0ApWGgG/K1b+eJoF4sVGoic5zHw4zBvp7HQQWo=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "1be00f42d07320f4fd0230172ceb27ec40330f53", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -8,11 +59,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673815682, - "narHash": "sha256-zG7Rroki+89poCTr1D8BM/wTCl+DZJvU4IUE+5hxG7U=", + "lastModified": 1681250798, + "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3e42035fc013ed4d8af6ee8dc0079c0c551c45a5", + "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", "type": "github" }, "original": { @@ -21,34 +72,160 @@ "type": "github" } }, + "mach-nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "mach-nixpkgs" + ], + "pypi-deps-db": "pypi-deps-db" + }, + "locked": { + "lastModified": 1661359648, + "narHash": "sha256-BRz30Xg/g535oRJA3xEcXf0KM6GTJPugt2lgaom3D6g=", + "owner": "davhau", + "repo": "mach-nix", + "rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1", + "type": "github" + }, + "original": { + "owner": "davhau", + "repo": "mach-nix", + "rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1", + "type": "github" + } + }, + "mach-nixpkgs": { + "locked": { + "lastModified": 1670452817, + "narHash": "sha256-u5GnneIreydXauFCces/boSaj5+0ZgtBIlkOcwGriXY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d", + "type": "github" + } + }, + "nekowinston-nur": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1680788407, + "narHash": "sha256-Fle4KYlgxzyM6WR+bD1EN9YsWG8ThtzcwMGuCRGD9iY=", + "owner": "nekowinston", + "repo": "nur", + "rev": "b99d815dc0ca96bfa6f30aa8a41ce716c96137dc", + "type": "github" + }, + "original": { + "owner": "nekowinston", + "repo": "nur", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1673315479, - "narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=", + "lastModified": 1679319606, + "narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1681215634, + "narHash": "sha256-dI0SsSWb7ksK3OtTCf61vdlBhok838aIpwQ2EUM+jhY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5a156c2e89c1eca09b40bcdcee86760e0e4d79a9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1681154110, + "narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd", + "rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "type": "indirect" } }, + "nur": { + "locked": { + "lastModified": 1681278261, + "narHash": "sha256-hXJGXX9WMI4iW5I3YH8aal8xQqtVt42AF3KI/wXEKqk=", + "owner": "nix-community", + "repo": "nur", + "rev": "4962f643d0656e3c65e03901baf0316598e6da2d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nur", + "type": "github" + } + }, + "pypi-deps-db": { + "flake": false, + "locked": { + "lastModified": 1670518748, + "narHash": "sha256-pfUce0zlRI+tzxPgvRSKkusjxDCBVjCpkcDKWboHa+U=", + "owner": "davhau", + "repo": "pypi-deps-db", + "rev": "e9571cac25d2f509e44fec9dc94a3703a40126ff", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "pypi-deps-db", + "type": "github" + } + }, "root": { "inputs": { + "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "mach-nix": "mach-nix", + "mach-nixpkgs": "mach-nixpkgs", + "nekowinston-nur": "nekowinston-nur", + "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", + "nur": "nur" } }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c82df56..1cb9b18 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,58 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-22.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = "github:nix-community/nur"; + #nyxkrage-nur.url = "github:nyxkrage/nur"; + nekowinston-nur.url = "github:nekowinston/nur"; + emacs-overlay.url = "github:nix-community/emacs-overlay"; + emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; + mach-nixpkgs.url = "github:nixos/nixpkgs/9fd0585f7dc9b85eb5d426396004cc649261e60d"; + mach-nix.url = "github:davhau/mach-nix/6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1"; + mach-nix.inputs.nixpkgs.follows = "mach-nixpkgs"; + mach-nix.inputs.pypi-deps-db.url = "github:davhau/pypi-deps-db/e9571cac25d2f509e44fec9dc94a3703a40126ff"; + mach-nix.inputs.pypi-deps-db.inputs.nixpkgs.follows = "mach-nixpkgs"; }; outputs = { self , nixpkgs + , nixpkgs-unstable + , nur + #, nyxkrage-nur + , nekowinston-nur + , emacs-overlay + , mach-nix + , mach-nixpkgs , home-manager , ... } @inputs: let overlays = [ - (import (builtins.fetchTarball { - url = https://github.com/nix-community/emacs-overlay/archive/0fe268a3b03ab9ef7a77363c64247030ee3902a7.tar.gz; - sha256 = "sha256:05cxwj5xnw9kci75pgzd3kff9k3548fsc0x8y0s08jzcidai139f"; - })) + (import emacs-overlay) + (final: prev: { + nur = import nur { + nurpkgs = prev; + pkgs = prev; + repoOverrides = { + nekowinston = import nekowinston-nur { pkgs = prev; }; + # nyxkrage = import nyxkrage-nur { pkgs = prev; }; + }; + }; + unstable = import nixpkgs-unstable { + system = prev.system; + config.allowUnfree = true; + }; + mach-nix = { + pkgs = import mach-nixpkgs { + system = prev.system; + config.allowUnfree = true; + }; + inherit mach-nix; + }; + }) ]; in { nixosConfigurations.falcon = nixpkgs.lib.nixosSystem { diff --git a/hosts/common.nix b/hosts/common.nix index 29b3803..9dc1d02 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -17,4 +17,109 @@ with pkgs; { initialHashedPassword = mkDefault "!"; }; }; -} \ No newline at end of file + + boot.loader = { + systemd-boot = { + enable = true; + }; + + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; + }; + }; + + # Enable non-free packages + nixpkgs.config.allowUnfree = true; + + # Configure nix itself + nix = { + # Enable nix flakes + package = pkgs.nixFlakes; + + settings = { + # Maximum number of concurrent tasks during one build + build-cores = 12; + + # Maximum number of jobs that Nix will try to build in parallel + max-jobs = "auto"; + + # Perform builds in a sandboxed environment + sandbox = true; + + # Enable flakes + experimental-features = [ "nix-command" "flakes" ]; + }; + }; + + # Set your time zone. + time.timeZone = "Europe/Copenhagen"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.utf8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure console keymap + console.keyMap = "us"; + + # Audio + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + security.pam.loginLimits = [ + # Unlimited amount of processes for root + { + domain = "root"; + item = "nproc"; + value = "unlimited"; + } + # Unlimited open file descriptors + { + domain = "*"; + item = "nofile"; + value = "unlimited"; + } + ]; + + virtualisation.virtualbox.host.enable = true; + virtualisation.virtualbox.host.enableExtensionPack = true; + virtualisation.docker.enable = true; + + networking = { + networkmanager.enable = true; + nameservers = [ "192.168.1.1" "87.62.97.64" ]; + firewall.allowedTCPPorts = [ 3389 ]; + }; + + services.xserver = { + enable = true; + + layout = "us"; + xkbVariant = ""; + + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; + + services.gnome.gnome-remote-desktop.enable = true; + + + programs.zsh.enable = true; +} diff --git a/hosts/eagle/default.nix b/hosts/eagle/default.nix index 52cf426..18f5dd6 100644 --- a/hosts/eagle/default.nix +++ b/hosts/eagle/default.nix @@ -12,104 +12,8 @@ ./pkgs.nix ]; - # Enable non-free packages - nixpkgs.config.allowUnfree = true; + networking.hostName = "eagle"; - boot.loader = { - systemd-boot = { - enable = true; - }; - - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - }; - - # Configure nix itself - nix = { - # Enable nix flakes - package = pkgs.nixFlakes; - - settings = { - # Maximum number of concurrent tasks during one build - build-cores = 12; - - # Maximum number of jobs that Nix will try to build in parallel - max-jobs = "auto"; - - # Perform builds in a sandboxed environment - sandbox = true; - - # Enable flakes - experimental-features = [ "nix-command" "flakes" ]; - }; - }; - - # Set your time zone. - time.timeZone = "Europe/Copenhagen"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.utf8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Configure console keymap - console.keyMap = "us"; - - # Audio - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - security.pam.loginLimits = [ - # Unlimited amount of processes for root - { - domain = "root"; - item = "nproc"; - value = "unlimited"; - } - # Unlimited open file descriptors - { - domain = "*"; - item = "nofile"; - value = "unlimited"; - } - ]; - - networking = { - networkmanager.enable = true; - hostName = "eagle"; - nameservers = [ "192.168.1.1" "87.62.97.64" ]; - firewall.allowedTCPPorts = [ 3389 ]; - }; - - services.xserver = { - enable = true; - - layout = "us"; - xkbVariant = ""; - - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; - - services.gnome.gnome-remote-desktop.enable = true; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/falcon/default.nix b/hosts/falcon/default.nix index 30fdb16..f91a9a8 100644 --- a/hosts/falcon/default.nix +++ b/hosts/falcon/default.nix @@ -12,104 +12,7 @@ ./pkgs.nix ]; - # Enable non-free packages - nixpkgs.config.allowUnfree = true; - - boot.loader = { - systemd-boot = { - enable = true; - }; - - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - }; - - # Configure nix itself - nix = { - # Enable nix flakes - package = pkgs.nixFlakes; - - settings = { - # Maximum number of concurrent tasks during one build - build-cores = 12; - - # Maximum number of jobs that Nix will try to build in parallel - max-jobs = "auto"; - - # Perform builds in a sandboxed environment - sandbox = true; - - # Enable flakes - experimental-features = [ "nix-command" "flakes" ]; - }; - }; - - # Set your time zone. - time.timeZone = "Europe/Copenhagen"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.utf8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Configure console keymap - console.keyMap = "us"; - - # Audio - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - security.pam.loginLimits = [ - # Unlimited amount of processes for root - { - domain = "root"; - item = "nproc"; - value = "unlimited"; - } - # Unlimited open file descriptors - { - domain = "*"; - item = "nofile"; - value = "unlimited"; - } - ]; - - networking = { - networkmanager.enable = true; - hostName = "falcon"; - nameservers = [ "192.168.1.1" "87.62.97.64" ]; - extraHosts = '' - 127.0.0.3 local.pid1.sh - ''; - }; - - services.xserver = { - enable = true; - - layout = "us"; - xkbVariant = ""; - - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; + networking.hostName = "falcon"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/users/carsten/conf/boxxy.nix b/users/carsten/conf/boxxy.nix deleted file mode 100644 index e4fc0bf..0000000 --- a/users/carsten/conf/boxxy.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - config.xdg.configFile = { - "boxxy/boxxy.yaml".text = builtins.toJSON { - rules = [ - { - name = "Test tmux"; - target = "~/.tmux.conf"; - rewrite = "~/.cache/tmux.conf"; - mode = "file"; - } - { - name = ".mozilla Directory"; - target = "~/.mozilla"; - rewrite = "~/.local/share/"; - mode = "directory"; - } - ]; - }; - }; -} diff --git a/users/carsten/conf/doom/config.el b/users/carsten/conf/doom/config.el index 67913dc..095bcfe 100644 --- a/users/carsten/conf/doom/config.el +++ b/users/carsten/conf/doom/config.el @@ -1,7 +1,7 @@ ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- ;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! +;; asdfsync' after modifying this file! ;; Some functionality uses this to identify you, e.g. GPG configuration, email @@ -77,8 +77,6 @@ ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. -(add-to-list 'load-path "~/source/org-mode") - (defun ctp/org-heading-colors () (face-remap-add-relative 'org-level-1 (list :foreground (catppuccin-get-color 'blue))) (face-remap-add-relative 'org-level-2 (list :foreground (catppuccin-get-color 'red))) diff --git a/users/carsten/conf/emacs.nix b/users/carsten/conf/emacs.nix index dcfbd8c..f486e07 100644 --- a/users/carsten/conf/emacs.nix +++ b/users/carsten/conf/emacs.nix @@ -27,8 +27,8 @@ "emacs" = { source = pkgs.fetchgit { url = "https://github.com/doomemacs/doomemacs"; - rev = "e96624926d724aff98e862221422cd7124a99c19"; - sha256 = "sha256-C+mQGq/HBDgRkqdwYE/LB3wQd3oIbTQfzldtuhmKVeU="; + rev = "4e105a95af9c4c7e86471e5566eb7a5ff776ec92"; + sha256 = "sha256-X6kCIc1PU0AZBSDhlyJ2Az3jgC6ZHiAfB2yuHDvIpQ4="; }; onChange = "${pkgs.writeShellScript "doom-change" '' export DOOMDIR="${config.home.sessionVariables.DOOMDIR}" diff --git a/users/carsten/default.nix b/users/carsten/default.nix index 99a7b2c..e906e75 100644 --- a/users/carsten/default.nix +++ b/users/carsten/default.nix @@ -11,6 +11,8 @@ extraGroups = [ "networkmanager" # Use networks "wheel" # Sudoer + "vboxusers" # VirtualBox + "docker" # Containers ]; shell = pkgs.zsh; packages = [ ]; diff --git a/users/carsten/pkgs/boxxy.nix b/users/carsten/pkgs/boxxy.nix deleted file mode 100644 index b47757a..0000000 --- a/users/carsten/pkgs/boxxy.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ rustPlatform, fetchFromGitHub, lib, ... }: -rustPlatform.buildRustPackage rec { - pname = "boxxy"; - version = "0.2.7"; - - src = fetchFromGitHub { - repo = pname; - owner = "nyxkrage"; - rev = "e660a79bcf2aba361e002cdf8845ca1444bb6ad5"; - sha256 = "sha256-LGLkGJGKDcda71TWjzn9Q8kLqTyxGvPaPBJtirV+xDc="; - }; - - cargoSha256 = "sha256-Psc9qErqi3aangNowXxhkEXphFCR7pp+DKTKtk6tMo0="; - - meta = with lib; { - description = "boxxy puts bad Linux applications in a box with only their files."; - homepage = "https://github.com/queer/boxxy"; - license = licenses.mit; - maintainers = [ maintainers.nyxkrage ]; - }; -} diff --git a/users/carsten/pkgs/default.nix b/users/carsten/pkgs/default.nix index 94923f8..c4c42a8 100644 --- a/users/carsten/pkgs/default.nix +++ b/users/carsten/pkgs/default.nix @@ -36,26 +36,146 @@ sshKeys = [ "64AB8617FA4EC63E93A4E1A94AE9B14AF64A86C6" "C54678A60A531F2144EC2391CF888696261ED167" ]; }; + programs.firefox = { + enable = true; + package = (pkgs.firefox-devedition-bin.override { wmClass = "firefox-aurora"; }); + profiles.default = { + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + add-custom-search-engine + clearurls + decentraleyes + multi-account-containers + header-editor + privacy-badger + privacy-redirect + amp2html + tab-stash + ublock-origin + vimium + ]; + settings = { + "app.normandy.api_url" = ""; + "app.normandy.enabled" = false; + "app.shield.optoutstudies.enabled" = false; + "app.update.auto" = false; + "beacon.enabled" = false; + "breakpad.reportURL" = ""; + "browser.aboutConfig.showWarning" = false; + "browser.cache.offline.enable" = false; + "browser.crashReports.unsubmittedCheck.autoSubmit" = false; + "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; + "browser.crashReports.unsubmittedCheck.enabled" = false; + "browser.disableResetPrompt" = true; + "browser.formfill.enable" = false; + "browser.newtab.preload" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.enabled" = false; + "browser.newtabpage.enhanced" = false; + "browser.newtabpage.introShown" = true; + "browser.safebrowsing.appRepURL" = ""; + "browser.safebrowsing.blockedURIs.enabled" = false; + "browser.safebrowsing.downloads.enabled" = false; + "browser.safebrowsing.downloads.remote.enabled" = false; + "browser.safebrowsing.downloads.remote.url" = ""; + "browser.safebrowsing.enabled" = false; + "browser.safebrowsing.malware.enabled" = false; + "browser.safebrowsing.phishing.enabled" = false; + "browser.selfsupport.url" = ""; + "browser.send_pings" = false; + "browser.sessionstore.privacy_level" = 0; + "browser.shell.checkDefaultBrowser" = false; + "browser.startup.homepage_override.mstone" = "ignore"; + "browser.tabs.crashReporting.sendReport" = false; + "browser.tabs.firefox-view" = false; + "browser.urlbar.groupLabels.enabled" = false; + "browser.urlbar.quicksuggest.enabled" = false; + "browser.urlbar.speculativeConnect.enabled" = false; + "browser.urlbar.trimURLs" = false; + "browser.warnOnQuitShortcut" = false; + "datareporting.healthreport.service.enabled" = false; + "datareporting.healthreport.uploadEnabled" = false; + "datareporting.policy.dataSubmissionEnabled" = false; + "device.sensors.ambientLight.enabled" = false; + "device.sensors.enabled" = false; + "device.sensors.motion.enabled" = false; + "device.sensors.orientation.enabled" = false; + "device.sensors.proximity.enabled" = false; + "dom.battery.enabled" = false; + "dom.security.https_only_mode" = true; + "dom.security.https_only_mode_ever_enabled" = true; + "dom.webaudio.enabled" = false; + "experiments.activeExperiment" = false; + "experiments.enabled" = false; + "experiments.manifest.uri" = ""; + "experiments.supported" = false; + "extensions.CanvasBlocker@kkapsner.de.whiteList" = ""; + "extensions.ClearURLs@kevinr.whiteList" = ""; + "extensions.Decentraleyes@ThomasRientjes.whiteList" = ""; + "extensions.FirefoxMulti-AccountContainers@mozilla.whiteList" = ""; + "extensions.autoDisableScopes" = 14; + "extensions.getAddons.cache.enabled" = false; + "extensions.getAddons.showPane" = false; + "extensions.pocket.enabled" = false; + "extensions.shield-recipe-client.api_url" = ""; + "extensions.shield-recipe-client.enabled" = false; + "extensions.webservice.discoverURL" = ""; + "media.autoplay.default" = 1; + "media.autoplay.enabled" = false; + "media.eme.enabled" = false; + "media.gmp-widevinecdm.enabled" = false; + "media.navigator.enabled" = false; + "media.peerconnection.enabled" = false; + "media.video_stats.enabled" = false; + "network.IDN_show_punycode" = true; + "network.allow-experiments" = false; + "network.captive-portal-service.enabled" = true; + "network.cookie.cookieBehavior" = 1; + "network.dns.disablePrefetch" = true; + "network.dns.disablePrefetchFromHTTPS" = true; + "network.http.referer.spoofSource" = true; + "network.http.speculative-parallel-limit" = 0; + "network.predictor.enable-prefetch" = false; + "network.predictor.enabled" = false; + "network.prefetch-next" = false; + "pdfjs.enableScripting" = false; + "privacy.donottrackheader.enabled" = true; + "privacy.donottrackheader.value" = 1; + "privacy.query_stripping" = true; + "privacy.trackingprotection.cryptomining.enabled" = true; + "privacy.trackingprotection.enabled" = true; + "privacy.trackingprotection.fingerprinting.enabled" = true; + "privacy.trackingprotection.pbmode.enabled" = true; + "privacy.usercontext.about_newtab_segregation.enabled" = true; + "security.ssl.disable_session_identifiers" = true; + "services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSite" = false; + "signon.autofillForms" = false; + "toolkit.telemetry.archive.enabled" = false; + "toolkit.telemetry.bhrPing.enabled" = false; + "toolkit.telemetry.cachedClientID" = ""; + "toolkit.telemetry.enabled" = false; + "toolkit.telemetry.firstShutdownPing.enabled" = false; + "toolkit.telemetry.hybridContent.enabled" = false; + "toolkit.telemetry.newProfilePing.enabled" = false; + "toolkit.telemetry.prompted" = 2; + "toolkit.telemetry.rejected" = true; + "toolkit.telemetry.reportingpolicy.firstRun" = false; + "toolkit.telemetry.server" = ""; + "toolkit.telemetry.shutdownPingSender.enabled" = false; + "toolkit.telemetry.unified" = false; + "toolkit.telemetry.unifiedIsOptIn" = false; + "toolkit.telemetry.updatePing.enabled" = false; + "webgl.renderer-string-override" = " "; + "webgl.vendor-string-override" = " "; + }; + }; + }; + services.lorri.enable = true; home.packages = with pkgs; [ - # (let - # boxedFirefox = writeShellScriptBin "firefox-devedition" '' - # exec boxxy ${firefox-devedition-bin}/bin/firefox-devedition $@ - # ''; - # in - # pkgs.symlinkJoin { - # name = "firefox-devedition-bin"; - # paths = [ - # boxedFirefox - # (firefox-devedition-bin.override { wmClass = "firefox-aurora"; }) - # ]; - # }) - (discord.override { withOpenASAR = true; }) - (firefox-devedition-bin.override { wmClass = "firefox-aurora"; }) + (ripgrep.override { withPCRE2 = true; }) - bat catppuccin-gtk dconf direnv @@ -81,7 +201,6 @@ # Local (callPackage ./areon-pro {}) - (callPackage ./boxxy.nix {}) (callPackage ./rec-mono-nyx.nix {}) # Rust diff --git a/users/carsten/pkgs/rec-mono-nyx.nix b/users/carsten/pkgs/rec-mono-nyx.nix index dafe997..6930d2d 100644 --- a/users/carsten/pkgs/rec-mono-nyx.nix +++ b/users/carsten/pkgs/rec-mono-nyx.nix @@ -3,8 +3,8 @@ , stdenv , fetchgit , fetchurl -, python39Packages -}: stdenv.mkDerivation rec { +}: stdenv.mkDerivation rec +{ pname = "rec-mono-nyx"; version = "1.0.0"; @@ -19,23 +19,13 @@ sha256 = "sha256-AuV49/Zik9O5KpzILk6hcmjCuff1bbogjrbz8qCydyE="; }; - nativeBuildInputs = [ - (let - mach-nix = import (fetchgit { - url = "https://github.com/DavHau/mach-nix"; - rev = "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1"; - sha256 = "sha256-BRz30Xg/g535oRJA3xEcXf0KM6GTJPugt2lgaom3D6g="; - }) { - inherit pkgs; - pypiDataRev = "e9571cac25d2f509e44fec9dc94a3703a40126ff"; - pypiDataSha256 = "sha256:1rbb0yx5kjn0j6lk0ml163227swji8abvq0krynqyi759ixirxd5"; - python = "python39"; - }; - in - mach-nix.mkPython { # replace with mkPythonShell if shell is wanted - requirements = builtins.readFile "${src}/requirements.txt"; - _.pyyaml.doInstallCheck = false; - }) + nativeBuildInputs = with pkgs.mach-nix.pkgs; [ + (pkgs.mach-nix.mach-nix.lib."${pkgs.system}".mkPython { + requirements = builtins.readFile "${src}/requirements.txt"; + _.pyyaml.doInstallCheck = false; + ignoreDataOutdated = true; + python = "python39"; + }) python39Packages.pip python39Packages.setuptools ];