From 152ac1afd0b269b657f1f45f886c6fd906c5ff31 Mon Sep 17 00:00:00 2001 From: mehbark Date: Mon, 20 Nov 2023 11:22:15 -0500 Subject: [PATCH] remove wine; use steam instead --- configuration.nix | 29 +++++++++++++++++++++++------ flake.lock | 6 +++--- home.nix | 13 +++++++++---- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/configuration.nix b/configuration.nix index e93d7ae..7a2d3e6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -15,9 +15,13 @@ in experimental-features = nix-command flakes ''; settings = { - substituters = ["https://nix-community.cachix.org"]; + substituters = [ + "https://nix-community.cachix.org" + "https://lean4.cachix.org" + ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "lean4.cachix.org-1:mawtxSxcaiWE24xCXXgh3qnvlTkyU7evRRnGeAhD4Wk=" ]; }; }; @@ -96,6 +100,8 @@ in }; }; + services.fstrim.enable = true; + hardware = { opengl = { enable = true; @@ -125,13 +131,21 @@ in alsa.support32Bit = true; pulse.enable = true; # If you want to use JACK applications, uncomment this - #jack.enable = true; + jack.enable = false; # use the example session manager (no others are packaged yet so this is enabled by default, # no need to redefine it in your config for now) #media-session.enable = true; }; + xdg.mime.defaultApplications = { + "text/html" = "org.mozilla.firefox.desktop"; + "x-scheme-handler/http" = "org.mozilla.firefox.desktop"; + "x-scheme-handler/https" = "org.mozilla.firefox.desktop"; + "x-scheme-handler/about" = "org.mozilla.firefox.desktop"; + "x-scheme-handler/unknown" = "org.mozilla.firefox.desktop"; + }; + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -168,6 +182,9 @@ in # Allow unfree packages (sorry) nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "electron-22.3.27" + ]; # List packages installed in system profile. To search, run: # $ nix search wget @@ -182,10 +199,10 @@ in # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; environment.variables.EDITOR = "nvim"; environment.variables.SHELL = "fish"; diff --git a/flake.lock b/flake.lock index b91d118..05a0fcc 100644 --- a/flake.lock +++ b/flake.lock @@ -238,11 +238,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693780807, - "narHash": "sha256-diV1X53HjSB3fIcDFieh9tGZkJ3vqJJQhTz89NbYw60=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "84ef5335abf541d8148433489e0cf79affae3f89", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 7312e03..111af82 100644 --- a/home.nix +++ b/home.nix @@ -29,7 +29,7 @@ in # foliate # thunderbird starship - exa + eza dmenu xsel manix @@ -57,6 +57,10 @@ in discord steam + rare + # drm more like pooprm + # might as well use a newer version + #(itch.override {electron_11 = electron_22;}) fzf kolourpaint @@ -82,8 +86,8 @@ in mpv yt-dlp - # i only need one font :[ - nerdfonts + (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + #monaspace # glow and gum are a good example of something that should really be in a flake.nix or whatever ] ++ more-packages; @@ -279,8 +283,9 @@ in }; # services.emacs.client.enable = true; + # not working right now programs.emacs = { - enable = true; + enable = false; package = pkgs.emacs29; extraPackages = epkgs: with epkgs; [ which-key