Compare commits
6 commits
a96bcaf989
...
fd310dc33b
| Author | SHA1 | Date | |
|---|---|---|---|
| fd310dc33b | |||
| 8834987115 | |||
| 503df435a4 | |||
| 03de6c194d | |||
| d7d302a0b7 | |||
| 2e274bee2b |
9 changed files with 37 additions and 33 deletions
32
flake.lock
generated
32
flake.lock
generated
|
|
@ -89,11 +89,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702399955,
|
"lastModified": 1710176745,
|
||||||
"narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=",
|
"narHash": "sha256-3Av9cY2xw8Lbq56o23uKwYbbrjH4We0SqveKNejlHpU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923",
|
"rev": "30fdb303a64d5fcbbaf0609b75d3c9c783af7869",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -139,11 +139,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701680307,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -219,11 +219,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702538064,
|
"lastModified": 1710164657,
|
||||||
"narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
|
"narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
|
"rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -403,16 +403,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702221085,
|
"lastModified": 1710021367,
|
||||||
"narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=",
|
"narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af",
|
"rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.05",
|
"ref": "nixos-23.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -435,11 +435,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705316053,
|
"lastModified": 1709961763,
|
||||||
"narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
|
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
|
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
./cli.nix
|
./cli.nix
|
||||||
./programs/rofi
|
./programs/rofi
|
||||||
./programs/xmonad
|
./programs/xmonad
|
||||||
|
./programs/jitsi-meet
|
||||||
./services/polybar
|
./services/polybar
|
||||||
./services/dunst
|
./services/dunst
|
||||||
./services/udiskie
|
./services/udiskie
|
||||||
|
|
@ -26,15 +27,7 @@
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# social
|
# social
|
||||||
(jitsi-meet-electron.overrideAttrs (prev: rec {
|
jitsi-meet-electron
|
||||||
version = "2023.10.0";
|
|
||||||
src = fetchurl {
|
|
||||||
url =
|
|
||||||
"https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
|
||||||
sha256 = "sha256-zhOx/gdsiQMuOCCE5sn+JNu0WJrH36XfvqqNvE24St8=";
|
|
||||||
name = "jitsi-meet-electron-${version}.AppImage";
|
|
||||||
};
|
|
||||||
})) # jitsi as a stand-alone app
|
|
||||||
discord # talk to other people
|
discord # talk to other people
|
||||||
|
|
||||||
# system tools
|
# system tools
|
||||||
|
|
@ -90,6 +83,9 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSshSupport = true;
|
enableSshSupport = true;
|
||||||
sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
|
sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
|
||||||
|
extraConfig = ''
|
||||||
|
pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# services.autorandr = { enable = true; };
|
# services.autorandr = { enable = true; };
|
||||||
|
|
|
||||||
|
|
@ -69,5 +69,6 @@
|
||||||
(package! org-super-agenda)
|
(package! org-super-agenda)
|
||||||
(package! org-ql)
|
(package! org-ql)
|
||||||
(package! org-bookmark-heading)
|
(package! org-bookmark-heading)
|
||||||
(package! activities)
|
(package! activities
|
||||||
|
:recipe (:host github :repo "alphapapa/activities.el" :branch "master"))
|
||||||
(package! elfeed-web)
|
(package! elfeed-web)
|
||||||
|
|
|
||||||
5
home/alex/programs/jitsi-meet/default.nix
Normal file
5
home/alex/programs/jitsi-meet/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
config.home.packages = [ pkgs.jitsi-meet-electron ];
|
||||||
|
}
|
||||||
|
|
@ -116,7 +116,7 @@ myConfig =
|
||||||
, ("M-g", WS.prevWS)
|
, ("M-g", WS.prevWS)
|
||||||
, ("M-r", WS.nextWS)
|
, ("M-r", WS.nextWS)
|
||||||
, -- scratchpads
|
, -- scratchpads
|
||||||
("M-s n", namedScratchpadAction scratchpads "notes")
|
("M-s M-s", namedScratchpadAction scratchpads "notes")
|
||||||
, ("M-s s", namedScratchpadAction scratchpads "shell")
|
, ("M-s s", namedScratchpadAction scratchpads "shell")
|
||||||
, -- backlight control
|
, -- backlight control
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
inactiveInterval = 30;
|
inactiveInterval = 30;
|
||||||
lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim";
|
lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim";
|
||||||
xautolock.extraOptions = [ "Xautolock.killer: systemctl suspend" ];
|
xautolock.extraOptions = [ "-killer 'systemctl suspend'" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ in {
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
networking.firewall.allowedTCPPorts = [ 5223 ];
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# networking.firewall.enable = false;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
imports = [
|
imports = [
|
||||||
({ inputs, lib, ... }: {
|
({ inputs, lib, ... }: {
|
||||||
nixpkgs = { config.allowUnfree = true; };
|
nixpkgs = { config.allowUnfree = true; };
|
||||||
nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
nix.registry =
|
||||||
|
lib.mkForce (lib.mapAttrs (_: value: { flake = value; }) inputs);
|
||||||
})
|
})
|
||||||
../../modules/security.nix
|
../../modules/security.nix
|
||||||
../../modules/common-system.nix
|
../../modules/common-system.nix
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,10 @@
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
layout = "us";
|
xkb = {
|
||||||
|
options = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
|
||||||
xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
|
layout = "us";
|
||||||
|
};
|
||||||
|
|
||||||
videoDrivers = [ "nvidia" ]; # "modesetting" ];
|
videoDrivers = [ "nvidia" ]; # "modesetting" ];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue