diff --git a/flake.lock b/flake.lock index e1befc3..5b5fa90 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1675400331, - "narHash": "sha256-ja0DhWBARzcimqMBhQ+DP7NQoJSlNasqvlj5GiHRYY0=", + "lastModified": 1675730932, + "narHash": "sha256-XcmirehPIcZGS7PzkS3WvAYQ9GBlBvCxYToIOIV2PVE=", "owner": "zhaofengli", "repo": "colmena", - "rev": "31d8240504e91c3ea5c758d92f02f94af3fae6c3", + "rev": "e034c15825c439131e4489de5a82cf8e5398fa61", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1675674706, - "narHash": "sha256-OkbmD3qf+Lv5P7n7sr6TEOO57whO7DxViGS/7UpdT+c=", + "lastModified": 1676543864, + "narHash": "sha256-ZdPhRGbUb0cFWd+iYtoIH0CIslnnTH2fJNEkpbtJzJE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cf267241b56b425d20faed46ab8e16dd0434a663", + "rev": "4bb9abd04a46a7b52ff07af252204ca3ce6d337f", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1674550793, - "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", + "lastModified": 1675933606, + "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", + "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1674305531, - "narHash": "sha256-0p7gNg56XlmZJrk5VIv4ZGnO6mkJ50eCNKoLaOvTH0w=", + "lastModified": 1676282852, + "narHash": "sha256-iEUGygxGB90E9t+lhVl8HD9FL2cz+1vUrgBDGKeIdWw=", "owner": "nix-community", "repo": "nixpkgs-fmt", - "rev": "d94168e9d7f8ffb24fe43726d3f9bd29c95b9ef3", + "rev": "f4c3f141c2821589198bffe07f2f45681540504f", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1675556398, - "narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=", + "lastModified": 1676162277, + "narHash": "sha256-GK3cnvKNo1l0skGYXXiLJ/TLqdKyIYXd7jOlo0gN+Qw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e32c33811815ca4a535a16faf1c83eeb4493145b", + "rev": "d863ca850a06d91365c01620dcac342574ecf46f", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1675545634, - "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1675600654, - "narHash": "sha256-ipsDTkzRq1CAl2g5tYd7ugjVMSKF6KLh9F+5Kso0lT0=", + "lastModified": 1676375384, + "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cff83d5032a21aad4f69bf284e95b5f564f4a54e", + "rev": "c43f676c938662072772339be6269226c77b51b8", "type": "github" }, "original": { @@ -653,11 +653,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1675523619, - "narHash": "sha256-jHvkAwkbAj1s0O5riHMghSDHh9iz8AwLTbXQuVQKQcg=", + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a211d5e8d18b20b5a2b22157266cc00f8c4f3b9", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", "type": "github" }, "original": { @@ -821,17 +821,17 @@ }, "retiolum": { "locked": { - "lastModified": 1675172931, - "narHash": "sha256-ZDnwiqDJHF3Bxf+JpzRtqNY9jsGO7+z8P854o9JQCs4=", - "ref": "refs/heads/master", - "rev": "a0078df20c98fd5bc199385985e652dad5ac4fe9", - "revCount": 279, - "type": "git", - "url": "file:///home/palo/dev/nixos/retiolum" + "lastModified": 1676473689, + "narHash": "sha256-TGQbsiIojBj4DvGhhkI3i2dq9NmU2Vkt+i7Rw2U/BEg=", + "owner": "Mic92", + "repo": "retiolum", + "rev": "30152917194d6e54ce68e45b499323356db3ae7c", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/palo/dev/nixos/retiolum" + "owner": "Mic92", + "repo": "retiolum", + "type": "github" } }, "revealjs": { @@ -944,11 +944,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1675566616, - "narHash": "sha256-Wki1ffvQUIB044M9ltjOxpXJGsqnQiVQPvMpQ0RiEBE=", + "lastModified": 1676171095, + "narHash": "sha256-2laeSjBAAJ9e/C3uTIPb287iX8qeVLtWiilw1uxqG+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4d16c18787ba8ff80c1ff8db25c5ca56f68ceed3", + "rev": "c5dab21d8706afc7ceb05c23d4244dcb48d6aade", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 46915dc..b43747b 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,8 @@ flake = false; }; retiolum = { - #url = "github:Mic92/retiolum"; - url = "git+file:///home/palo/dev/nixos/retiolum"; + url = "github:Mic92/retiolum"; + #url = "git+file:///home/palo/dev/nixos/retiolum"; }; landingpage = { #url = "git+file:///home/palo/dev/landingpage"; diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index f4c8f4e..e2fa8f0 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -51,6 +51,7 @@ programs.custom.urxvt.fontType = "vector"; programs.custom.xterm.fontSize = 16; # todo : add xterm fontType + # programs.custom.xterm.fontType = "vector"; virtualisation = { docker.enable = true; @@ -68,7 +69,8 @@ }; services.xserver.desktopManager.gnome.enable = true; - services.xserver.videoDrivers = [ "modesetting" ]; + #services.xserver.displayManager.lightdm.enable = false; + #services.xserver.displayManager.sddm.enable = true; custom.samba-share = { enable = false; @@ -81,7 +83,7 @@ # for congress and streaming hardware.opengl = { - enable = true; + enable = true; # todo I actually want opengl #driSupport = true; #driSupport32Bit = true; }; diff --git a/nixos/modules/system/x11.nix b/nixos/modules/system/x11.nix index 2fe9d38..20ff20f 100644 --- a/nixos/modules/system/x11.nix +++ b/nixos/modules/system/x11.nix @@ -21,18 +21,9 @@ in enable = true; - # Configure video Drivers - # ----------------------- - videoDrivers = [ "intel" ]; - deviceSection = '' - Option "DRI" "2" - Option "TearFree" "true" - ''; - # window-manager : Xmonad # ----------------------- displayManager = { - #defaultSession = lib.mkDefault "none+xmonad"; defaultSession = lib.mkDefault "none+i3"; autoLogin.enable = lib.mkDefault true; autoLogin.user = cfg.autoLoginUser;