aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2022-07-15 09:47:17 +0200
committerAdrian Kummerlaender2022-07-15 09:47:17 +0200
commitcac3e31572718975c5472a58a52d279f2488e05c (patch)
treed5ace3a01f9c07de270e6547b4e4d966007dfa9e
parent66bdce6fbd19851cee3a106ede106d749a4c36df (diff)
downloadnixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar.gz
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar.bz2
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar.lz
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar.xz
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.tar.zst
nixos_home-cac3e31572718975c5472a58a52d279f2488e05c.zip
Update to 22.05
-rw-r--r--flake.lock40
-rw-r--r--flake.nix4
-rw-r--r--gui/apps/file.nix2
-rw-r--r--gui/emacs.nix2
-rw-r--r--gui/gtk.nix2
-rw-r--r--gui/kitty.nix1
6 files changed, 26 insertions, 25 deletions
diff --git a/flake.lock b/flake.lock
index 8df8718..2239836 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1653045399,
- "narHash": "sha256-olhvDOOmxoXhyrVHsPAifTuhHJCH0eyG4t1FzIBJgEs=",
+ "lastModified": 1657824755,
+ "narHash": "sha256-ktj7nl1jfBAcXnDC7yp4t3Riaek+VEB74/orXq9sdBI=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "f2b5fc6846d69051b7a7b174f7a96aa57b195f6e",
+ "rev": "5d793f134d5b3ff60e890a2e0cce2483e6e745b7",
"type": "github"
},
"original": {
@@ -22,11 +22,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1652776076,
- "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+ "lastModified": 1656928814,
+ "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+ "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@@ -57,16 +57,16 @@
]
},
"locked": {
- "lastModified": 1651519540,
- "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
+ "lastModified": 1656169755,
+ "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
+ "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-21.11",
+ "ref": "release-22.05",
"repo": "home-manager",
"type": "github"
}
@@ -93,11 +93,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1652840887,
- "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=",
+ "lastModified": 1657800465,
+ "narHash": "sha256-KfptECgyFFKouyYtmBjqOCh9N8pUt/noSW93ov0Xnv0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0",
+ "rev": "4bc1c1bd2f5b1101443fe775bb737a812fc8b925",
"type": "github"
},
"original": {
@@ -166,27 +166,27 @@
},
"stable": {
"locked": {
- "lastModified": 1652881001,
- "narHash": "sha256-k9JmPCojaJnqGz4aRXXT1HZqJKHCXijoMfBAb24abXk=",
+ "lastModified": 1657693803,
+ "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2d474d6a4a43a0348b78db68dc00c491032cf5cf",
+ "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-21.11",
+ "ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"unstable": {
"locked": {
- "lastModified": 1652840887,
- "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=",
+ "lastModified": 1657800465,
+ "narHash": "sha256-KfptECgyFFKouyYtmBjqOCh9N8pUt/noSW93ov0Xnv0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0",
+ "rev": "4bc1c1bd2f5b1101443fe775bb737a812fc8b925",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 5f519ef..443f086 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
description = "Computing environment of Adrian Kummerlaender";
inputs = {
- stable.url = github:NixOS/nixpkgs/nixos-21.11;
+ stable.url = github:NixOS/nixpkgs/nixos-22.05;
unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable;
personal.url = github:KnairdA/pkgs;
home-manager = {
- url = github:nix-community/home-manager/release-21.11;
+ url = github:nix-community/home-manager/release-22.05;
inputs = { nixpkgs.follows = "stable"; };
};
emacs.url = github:nix-community/emacs-overlay/master;
diff --git a/gui/apps/file.nix b/gui/apps/file.nix
index c6a341c..e72ee8f 100644
--- a/gui/apps/file.nix
+++ b/gui/apps/file.nix
@@ -7,7 +7,7 @@
in with pkgs; [
pcmanfm
# automounting
- gvfs lxmenu-data shared_mime_info
+ gvfs lxmenu-data shared-mime-info
xfce.gigolo
# viewers
bat
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 799a743..f1ee1e2 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -84,7 +84,7 @@
in with pkgs; [
emacs-all-the-icons-fonts
- symbola
+ pkgs-unstable.symbola
(iosevka-bin.override { variant = "aile"; })
(iosevka-bin.override { variant = "etoile"; })
mu
diff --git a/gui/gtk.nix b/gui/gtk.nix
index f4bac43..06e76c1 100644
--- a/gui/gtk.nix
+++ b/gui/gtk.nix
@@ -60,7 +60,7 @@ in {
home.packages = [
# enable persistent settings in e.g. file chooser dialogs
- pkgs.gnome3.dconf
+ pkgs.dconf
pkgs.gnome3.dconf-editor
];
diff --git a/gui/kitty.nix b/gui/kitty.nix
index c85df4e..a47bb6d 100644
--- a/gui/kitty.nix
+++ b/gui/kitty.nix
@@ -15,6 +15,7 @@
disable_ligatures always
enable_audio_bell no
+ confirm_os_window_close 0
background #161616
foreground #F2F2F2